From 45e1441072c9618ec9167114e2cef10e073cd17a Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 30 Jun 2019 23:10:05 -0700 Subject: [PATCH 1/9] HotColdTemperature: Fix warm-but-colder temperature bug Because the word "cold" is used both as a temperature ("The device is cold"), and in a temperature change ("but colder than last time."), HotColdTemperature tried to interpret COLDER temperature changes as a COLD temperature match. By matching only the section of the temperature string preceding the optional comma, this bug is avoided. --- .../plugins/cluescrolls/clues/hotcold/HotColdTemperature.java | 4 +++- .../cluescrolls/clues/hotcold/HotColdTemperatureTest.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java index 2dc5909000..21171eec8d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java @@ -32,6 +32,7 @@ import java.util.Set; import javax.annotation.Nullable; import lombok.AllArgsConstructor; import lombok.Getter; +import net.runelite.client.util.Text; @AllArgsConstructor @Getter @@ -93,11 +94,12 @@ public enum HotColdTemperature return null; } + final String messageStart = Text.fromCSV(message).get(0); final List possibleTemperatures = new ArrayList<>(); for (final HotColdTemperature temperature : temperatureSet) { - if (message.contains(temperature.getText())) + if (messageStart.contains(temperature.getText())) { possibleTemperatures.add(temperature); } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java index e9711dc433..cbc4c0e267 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java @@ -73,5 +73,7 @@ public class HotColdTemperatureTest assertEquals(HotColdTemperature.ICE_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is ice cold.")); assertEquals(HotColdTemperature.VERY_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very cold.")); assertEquals(HotColdTemperature.VERY_HOT, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very hot.")); + assertEquals(HotColdTemperature.COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, "The device is cold, and warmer than last time.")); + assertEquals(HotColdTemperature.WARM, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, "The device is warm, but colder than last time.")); } } From 29d786b948f52d5ec4ae3f31f90e23a3e81bdc9a Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 30 Jun 2019 22:26:09 -0700 Subject: [PATCH 2/9] HotColdClue: Improve behavior on visibly shaking location This change causes the locations list to be narrowed on all locator orb checks, having the consequence of narrowing the list to the visibly shaking location (for better display via `makeOverlayHint()'). The call to `reset()' must be removed as it would re-add all locations to the instance's solver when finding the dig location, which effectively reverses the apparent narrowing the overlay displayed until that point. --- .../client/plugins/cluescrolls/clues/HotColdClue.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java index 5fad4e4207..3ea30d27b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java @@ -296,11 +296,11 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat else { location = null; - - final HotColdTemperatureChange temperatureChange = HotColdTemperatureChange.of(message); - hotColdSolver.signal(localWorld, temperature, temperatureChange); } + final HotColdTemperatureChange temperatureChange = HotColdTemperatureChange.of(message); + hotColdSolver.signal(localWorld, temperature, temperatureChange); + return true; } @@ -339,7 +339,6 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat private void markFinalSpot(WorldPoint wp) { this.location = wp; - reset(); } public String[] getNpcs() From 2c13816ca9896ab89de3e5335b126f3fae89f9f6 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 30 Jun 2019 22:37:55 -0700 Subject: [PATCH 3/9] HotColdClue: Clear final location on clue reset If the clue is being reset, say from a new clue being read and initialized, we should not continue to use the old location. --- .../runelite/client/plugins/cluescrolls/clues/HotColdClue.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java index 3ea30d27b6..219916d240 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java @@ -307,6 +307,7 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat @Override public void reset() { + location = null; initializeSolver(); } From 80f0000f894e817ceb0cf2f7c427b75f75ccb6d8 Mon Sep 17 00:00:00 2001 From: Kusha Gharahi <3326002+kushagharahi@users.noreply.github.com> Date: Tue, 25 Jun 2019 04:19:55 +0000 Subject: [PATCH 4/9] wintertodt plugin: add round start notification Co-authored-by: Adam --- .../main/java/net/runelite/api/Varbits.java | 4 +- .../plugins/wintertodt/WintertodtConfig.java | 15 ++ .../plugins/wintertodt/WintertodtPlugin.java | 28 ++++ .../wintertodt/WintertodtPluginTest.java | 155 ++++++++++++++++++ 4 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java index b55956dd20..ee72d85f2b 100644 --- a/runelite-api/src/main/java/net/runelite/api/Varbits.java +++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java @@ -496,7 +496,9 @@ public enum Varbits EXPLORER_RING_ALCHTYPE(5398), EXPLORER_RING_TELEPORTS(4552), EXPLORER_RING_ALCHS(4554), - EXPLORER_RING_RUNENERGY(4553); + EXPLORER_RING_RUNENERGY(4553), + + WINTERTODT_TIMER(7980); /** * The raw varbit ID. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java index 8fd6e6e446..6b1adb7e9d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java @@ -29,6 +29,7 @@ import java.awt.Color; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; +import net.runelite.client.config.Range; import net.runelite.client.plugins.wintertodt.config.WintertodtNotifyMode; @ConfigGroup("wintertodt") @@ -55,4 +56,18 @@ public interface WintertodtConfig extends Config { return Color.CYAN; } + + @ConfigItem( + position = 3, + keyName = "roundNotification", + name = "Wintertodt round notification", + description = "Notifies you before the round starts (in seconds)" + ) + @Range( + max = 60 + ) + default int roundNotification() + { + return 5; + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index 2360a68604..1fb36bfd27 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java @@ -56,10 +56,12 @@ import static net.runelite.api.ItemID.BRUMA_KINDLING; import static net.runelite.api.ItemID.BRUMA_ROOT; import net.runelite.api.MessageNode; import net.runelite.api.Player; +import net.runelite.api.Varbits; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; +import net.runelite.api.events.VarbitChanged; import net.runelite.client.Notifier; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; @@ -117,6 +119,8 @@ public class WintertodtPlugin extends Plugin private Instant lastActionTime; + private int previousTimerValue; + @Provides WintertodtConfig getConfig(ConfigManager configManager) { @@ -182,6 +186,30 @@ public class WintertodtPlugin extends Plugin checkActionTimeout(); } + @Subscribe + public void onVarbitChanged(VarbitChanged varbitChanged) + { + int timerValue = client.getVar(Varbits.WINTERTODT_TIMER); + if (timerValue != previousTimerValue) + { + int timeToNotify = config.roundNotification(); + if (timeToNotify > 0) + { + int timeInSeconds = timerValue * 30 / 50; + int prevTimeInSeconds = previousTimerValue * 30 / 50; + + log.debug("Seconds left until round start: {}", timeInSeconds); + + if (prevTimeInSeconds > timeToNotify && timeInSeconds <= timeToNotify) + { + notifier.notify("Wintertodt round is about to start"); + } + } + + previousTimerValue = timerValue; + } + } + private void checkActionTimeout() { if (currentActivity == WintertodtActivity.IDLE) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java new file mode 100644 index 0000000000..7069d4f06a --- /dev/null +++ b/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2019, Kusha Gharahi + * Copyright (c) 2019, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client.plugins.wintertodt; + +import com.google.inject.Guice; +import com.google.inject.testing.fieldbinder.Bind; +import com.google.inject.testing.fieldbinder.BoundFieldModule; +import javax.inject.Inject; +import net.runelite.api.Client; +import net.runelite.api.Varbits; +import net.runelite.api.events.VarbitChanged; +import net.runelite.client.Notifier; +import net.runelite.client.chat.ChatMessageManager; +import net.runelite.client.ui.overlay.OverlayManager; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import org.mockito.runners.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class WintertodtPluginTest +{ + @Inject + WintertodtPlugin wintertodtPlugin; + + @Mock + @Bind + WintertodtConfig config; + + @Mock + @Bind + WintertodtOverlay wintertodtOverlay; + + @Mock + @Bind + OverlayManager overlayManager; + + @Mock + @Bind + ChatMessageManager chatMessageManager; + + @Mock + @Bind + Notifier notifier; + + @Mock + @Bind + Client client; + + @Before + public void before() + { + Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); + } + + @Test + public void matchStartingNotification_shouldNotify_when15SecondsOptionSelected() + { + when(config.roundNotification()).thenReturn(15); + + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(35); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + //(15 * 50) / 30 = ~25 + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(25); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + + verify(notifier, times(1)).notify("Wintertodt round is about to start"); + } + + @Test + public void matchStartingNotification_shouldNotify_when10SecondsOptionSelected() + { + when(config.roundNotification()).thenReturn(10); + + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(20); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + //(10 * 50) / 30 = ~16 + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(16); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + + verify(notifier, times(1)).notify("Wintertodt round is about to start"); + } + + @Test + public void matchStartingNotification_shouldNotify_when5SecondsOptionSelected() + { + when(config.roundNotification()).thenReturn(5); + + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(10); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + //(5 * 50) / 30 = ~8 + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(8); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + + verify(notifier, times(1)).notify("Wintertodt round is about to start"); + } + + @Test + public void matchStartingNotification_shouldNotifyOnce() + { + when(config.roundNotification()).thenReturn(5); + + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(0); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(10); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(8); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(6); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(5); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(4); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + + verify(notifier, times(1)).notify("Wintertodt round is about to start"); + } + + @Test + public void matchStartingNotification_shouldNotNotify_whenNoneOptionSelected() + { + when(config.roundNotification()).thenReturn(5); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(25); + + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + verify(notifier, times(0)).notify("Wintertodt round is about to start"); + } +} From 911893b71064db5a9e40984146286c08d1f2d3fa Mon Sep 17 00:00:00 2001 From: Max Weber Date: Wed, 3 Jul 2019 08:45:24 -0600 Subject: [PATCH 5/9] cache/FrameDumperTest: Don't get the wrong framemaps for a frame --- cache/src/test/java/net/runelite/cache/FrameDumper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache/src/test/java/net/runelite/cache/FrameDumper.java b/cache/src/test/java/net/runelite/cache/FrameDumper.java index 8e856cd2f8..f6cc20532d 100644 --- a/cache/src/test/java/net/runelite/cache/FrameDumper.java +++ b/cache/src/test/java/net/runelite/cache/FrameDumper.java @@ -88,7 +88,7 @@ public class FrameDumper int framemapArchiveId = (contents[0] & 0xff) << 8 | contents[1] & 0xff; - Archive framemapArchive = framemapIndex.getArchives().get(framemapArchiveId); + Archive framemapArchive = framemapIndex.getArchive(framemapArchiveId); archiveData = storage.loadArchive(framemapArchive); byte[] framemapContents = framemapArchive.decompress(archiveData); From 9d927c3d6f2d5755a333752fb12fccb2ad8add3f Mon Sep 17 00:00:00 2001 From: kristo naeris Date: Thu, 4 Jul 2019 01:25:29 +0300 Subject: [PATCH 6/9] world hopper: add option to disable Hop-to menu option --- .../plugins/worldhopper/WorldHopperConfig.java | 13 ++++++++++++- .../plugins/worldhopper/WorldHopperPlugin.java | 5 +++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java index f7a75781fd..8035af73fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java @@ -102,11 +102,22 @@ public interface WorldHopperConfig extends Config return true; } + @ConfigItem( + keyName = "menuOption", + name = "Show Hop-to menu option", + description = "Adds Hop-to menu option to the friends list and clan members list", + position = 6 + ) + default boolean menuOption() + { + return true; + } + @ConfigItem( keyName = "subscriptionFilter", name = "Show subscription types", description = "Only show free worlds, member worlds, or both types of worlds in sidebar", - position = 6 + position = 7 ) default SubscriptionFilterMode subscriptionFilter() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 0dce1c78b5..31bc11a925 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -327,6 +327,11 @@ public class WorldHopperPlugin extends Plugin @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) { + if (!config.menuOption()) + { + return; + } + int groupId = WidgetInfo.TO_GROUP(event.getActionParam1()); String option = event.getOption(); From 6193c08aadb03d7a44acb3ef37ab162e40354ae3 Mon Sep 17 00:00:00 2001 From: JavaBlah Date: Tue, 2 Jul 2019 21:27:00 -0500 Subject: [PATCH 7/9] cursors plugin: add dragon dagger (p) cursor --- .../client/plugins/customcursor/CustomCursor.java | 1 + .../customcursor/cursor-dragon-dagger-p.png | Bin 0 -> 973 bytes 2 files changed, 1 insertion(+) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java index 1116ab10c2..2e371632b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java @@ -33,6 +33,7 @@ public enum CustomCursor RS3_GOLD("RS3 Gold", "cursor-rs3-gold.png"), RS3_SILVER("RS3 Silver", "cursor-rs3-silver.png"), DRAGON_DAGGER("Dragon Dagger", "cursor-dragon-dagger.png"), + DRAGON_DAGGER_POISON("Dragon Dagger (p)", "cursor-dragon-dagger-p.png"), TROUT("Trout", "cursor-trout.png"), DRAGON_SCIMITAR("Dragon Scimitar", "cursor-dragon-scimitar.png"); diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png b/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png new file mode 100644 index 0000000000000000000000000000000000000000..86f1751afa4191c4fc9b735228094b1c14fa083c GIT binary patch literal 973 zcmV;;12X)HP)EX>4Tx04R}tkv&MmKpe$i(@IOJIM_kNAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;i>s5OiW2pGZ8%bi*RvAfDN@ zbk6(4QC5)@;&bA0gDyz?$aUG}H_l~;1)do-a+!JJD6v@XVY!D{#ZZZ-iDQbYQNECO zS>e3JS*eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00E^*L_t(o!|j&4N&`U@hQCQxjJnaN2pUkt*2>miL5X++ zu@DQv-cBq88?my~XAm3Tz)A!IwiZ4>KnP}|Yj!p}aV(5UyrQxfQBOB4%=z~_|2cC6 z00<3Q@P*J?<443m=)UY=RYdp^BjTtD=sD<(gu>4u0Fc`53Z25wA^?zF?+lef1lZWQE|!||=)qv7P^Ac8nx#=wjlv;ZAOOPC(eVl!tG2U0O;Hw;>VOfnIQ z7pfkpi|A;Aqyeo)XdZZW)H`XDJ0R~Vt`r;tfqB`9dKO54^Hk z$&q-ThgUA+xGt7uG0=R$$))70OUt)QurM=C!Lk@O&&ge@+Lyyq>3a#@`J=iI)-q;I zM2G@j5E)Ipq7YCUzB%>9W73FU!~T&Kl0$RMPEPnb4?ZbCi`~6_%ATU4@1xrXN~IFE veHU~aer(7mBEEHjUl;wJrSxCGpA+x^GMcfd{<`2>00000NkvXXu0mjfnP968 literal 0 HcmV?d00001 From 4fd0fcab0f0c4f74226329fbd96c71cee01b00b9 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 4 Jul 2019 13:01:12 +0000 Subject: [PATCH 8/9] [maven-release-plugin] prepare release runelite-parent-1.5.28 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-mixins/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- runescape-api/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 59b213541f..0a04e5fc3e 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 4eb3f28217..ebee5230d0 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 2069230ff9..eb7eba2fe5 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 0b08a5d6c9..edb35c731c 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index b47299f9b2..2c8ae8a40e 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 Web Service diff --git a/pom.xml b/pom.xml index b191cd34d0..2ee625a627 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 pom RuneLite @@ -59,7 +59,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.5.28 diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index cb85d612f9..cad5d414e5 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 1e03da9e36..496f3e6262 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index a4c60790a2..d5c0b9ed62 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 6f765e2d81..886a198fc0 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 client diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index db8285d1c9..5614b3ea4b 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 mixins diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 25f0b49f51..963480596b 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 script-assembler-plugin diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml index 710b68be9f..e678027e1e 100644 --- a/runescape-api/pom.xml +++ b/runescape-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 net.runelite.rs From d7a1e510413ce6625eb29ea831d7640519ca9b7c Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 4 Jul 2019 13:01:18 +0000 Subject: [PATCH 9/9] [maven-release-plugin] prepare for next development iteration --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-mixins/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- runescape-api/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 0a04e5fc3e..3073c9f439 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index ebee5230d0..b57857a714 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index eb7eba2fe5..e79fdf3c58 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index edb35c731c..9d6ef8d1b6 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 2c8ae8a40e..1c64147d7e 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 2ee625a627..52a30f3d35 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT pom RuneLite @@ -59,7 +59,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.5.28 + HEAD diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index cad5d414e5..ea06134acf 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 496f3e6262..8e504698b7 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index d5c0b9ed62..502f90706d 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 886a198fc0..53bfdf94f9 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT client diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index 5614b3ea4b..e29ca008fe 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT mixins diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 963480596b..6387f338e7 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT script-assembler-plugin diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml index e678027e1e..cfe8d98273 100644 --- a/runescape-api/pom.xml +++ b/runescape-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT net.runelite.rs