From 4b543d9dc2836cd9d7c5e3bbb608860e01b46414 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Wed, 31 Jul 2019 14:58:15 +0100 Subject: [PATCH 01/13] item prices: show alch price while selecting item to alch --- .../client/plugins/itemprices/ItemPricesConfig.java | 10 ++++++++++ .../client/plugins/itemprices/ItemPricesOverlay.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java index a7b62e52b3..2880d1b8f0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java @@ -86,4 +86,14 @@ public interface ItemPricesConfig extends Config return false; } + @ConfigItem( + keyName = "showWhileAlching", + name = "Show prices while alching", + description = "Show the price overlay while using High Alchemy", + position = 6 + ) + default boolean showWhileAlching() + { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index b7de787305..a84a077e87 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -95,7 +95,7 @@ class ItemPricesOverlay extends Overlay switch (action) { case ITEM_USE_ON_WIDGET: - if (!menuEntry.getTarget().contains("High Level Alchemy") || !config.showAlchProfit()) + if (!config.showWhileAlching() || !menuEntry.getOption().equals("Cast") || !menuEntry.getTarget().contains("High Level Alchemy")) { break; } From effad44e17f1e0538da8472d24740f4a30eab8d7 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Wed, 31 Jul 2019 14:58:24 +0100 Subject: [PATCH 02/13] item prices: show alch price when alching with Explorer's Ring interface --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 6 ++++++ .../main/java/net/runelite/api/widgets/WidgetInfo.java | 2 ++ .../client/plugins/itemprices/ItemPricesOverlay.java | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 8f008fe485..349d29721b 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -142,6 +142,7 @@ public class WidgetID public static final int SEED_BOX_GROUP_ID = 128; public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4; public static final int SEED_VAULT_GROUP_ID = 631; + public static final int EXPLORERS_RING_ALCH_GROUP_ID = 483; static class WorldMap { @@ -828,4 +829,9 @@ public class WidgetID static final int ITEM_CONTAINER = 15; static final int ITEM_TEXT = 16; } + + static class ExplorersRing + { + static final int INVENTORY = 7; + } } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index a506001421..cb79dc5af9 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -118,6 +118,8 @@ public enum WidgetInfo IGNORE_TITLE(WidgetID.IGNORE_LIST_GROUP_ID, WidgetID.IgnoreList.TITLE), + EXPLORERS_RING_ALCH_INVENTORY(WidgetID.EXPLORERS_RING_ALCH_GROUP_ID, WidgetID.ExplorersRing.INVENTORY), + CLAN_CHAT_TITLE(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.TITLE), CLAN_CHAT_NAME(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.NAME), CLAN_CHAT_OWNER(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.OWNER), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index a84a077e87..d98828d3b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -52,6 +52,7 @@ class ItemPricesOverlay extends Overlay private static final int INVENTORY_ITEM_WIDGETID = WidgetInfo.INVENTORY.getPackedId(); private static final int BANK_INVENTORY_ITEM_WIDGETID = WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getPackedId(); private static final int BANK_ITEM_WIDGETID = WidgetInfo.BANK_ITEM_CONTAINER.getPackedId(); + private static final int EXPLORERS_RING_ITEM_WIDGETID = WidgetInfo.EXPLORERS_RING_ALCH_INVENTORY.getPackedId(); private final Client client; private final ItemPricesConfig config; @@ -109,6 +110,11 @@ class ItemPricesOverlay extends Overlay // Item tooltip values switch (groupId) { + case WidgetID.EXPLORERS_RING_ALCH_GROUP_ID: + if (!config.showWhileAlching()) + { + return null; + } case WidgetID.INVENTORY_GROUP_ID: if (config.hideInventory()) { @@ -142,7 +148,7 @@ class ItemPricesOverlay extends Overlay ItemContainer container = null; // Inventory item - if (widgetId == INVENTORY_ITEM_WIDGETID || widgetId == BANK_INVENTORY_ITEM_WIDGETID) + if (widgetId == INVENTORY_ITEM_WIDGETID || widgetId == BANK_INVENTORY_ITEM_WIDGETID || widgetId == EXPLORERS_RING_ITEM_WIDGETID) { container = client.getItemContainer(InventoryID.INVENTORY); } From ac5b2ff82a8509da825e7e5341a17d562c93b7a7 Mon Sep 17 00:00:00 2001 From: Ron Young Date: Mon, 5 Aug 2019 23:57:32 -0500 Subject: [PATCH 03/13] colorpicker: force hex color to update on window close --- .../client/ui/components/colorpicker/RuneliteColorPicker.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RuneliteColorPicker.java b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RuneliteColorPicker.java index 653d31ecf8..aff803450e 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RuneliteColorPicker.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RuneliteColorPicker.java @@ -298,6 +298,9 @@ public class RuneliteColorPicker extends JDialog @Override public void windowClosing(WindowEvent e) { + // force update hex color because focus lost events fire after window closing + updateHex(); + if (onClose != null) { onClose.accept(selectedColor); From eb118c24dee7694535bca8ee0dd3d557738b2ca7 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 13 Aug 2019 17:30:57 -0400 Subject: [PATCH 04/13] overlay renderer: reduce graphics properties copying --- .../client/ui/overlay/OverlayRenderer.java | 65 +++++++++---------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index dc794066d1..af92163b79 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -203,6 +203,15 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener final net.runelite.api.Point mouseCanvasPosition = client.getMouseCanvasPosition(); final Point mouse = new Point(mouseCanvasPosition.getX(), mouseCanvasPosition.getY()); + // Save graphics2d properties so we can restore them later + final AffineTransform transform = graphics.getTransform(); + final Stroke stroke = graphics.getStroke(); + final Composite composite = graphics.getComposite(); + final Paint paint = graphics.getPaint(); + final Color color = graphics.getColor(); + final RenderingHints renderingHints = graphics.getRenderingHints(); + final Color background = graphics.getBackground(); + for (Overlay overlay : overlays) { OverlayPosition overlayPosition = overlay.getPosition(); @@ -267,26 +276,34 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener } safeRender(client, overlay, layer, graphics, location); + final Rectangle bounds = overlay.getBounds(); - if (bounds.isEmpty()) + if (!bounds.isEmpty()) { - continue; - } + if (inOverlayDraggingMode) + { + final Color previous = graphics.getColor(); + graphics.setColor(movedOverlay == overlay ? MOVING_OVERLAY_ACTIVE_COLOR : MOVING_OVERLAY_COLOR); + graphics.draw(bounds); + graphics.setColor(previous); + } - if (inOverlayDraggingMode) - { - final Color previous = graphics.getColor(); - graphics.setColor(movedOverlay == overlay ? MOVING_OVERLAY_ACTIVE_COLOR : MOVING_OVERLAY_COLOR); - graphics.draw(bounds); - graphics.setColor(previous); - } - - if (menuEntries == null && !client.isMenuOpen() && bounds.contains(mouse)) - { - menuEntries = createRightClickMenuEntries(overlay); + if (menuEntries == null && !client.isMenuOpen() && bounds.contains(mouse)) + { + menuEntries = createRightClickMenuEntries(overlay); + } } } + + // Restore graphics2d properties + graphics.setTransform(transform); + graphics.setStroke(stroke); + graphics.setComposite(composite); + graphics.setPaint(paint); + graphics.setColor(color); + graphics.setRenderingHints(renderingHints); + graphics.setBackground(background); } } @@ -466,15 +483,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener graphics.setFont(runeLiteConfig.interfaceFontType().getFont()); } - // Save graphics2d properties so we can restore them later - final AffineTransform transform = graphics.getTransform(); - final Stroke stroke = graphics.getStroke(); - final Composite composite = graphics.getComposite(); - final Paint paint = graphics.getPaint(); - final Color color = graphics.getColor(); - final RenderingHints renderingHints = graphics.getRenderingHints(); - final Color background = graphics.getBackground(); - graphics.translate(point.x, point.y); final Dimension overlayDimension; @@ -487,17 +495,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener log.warn("Error during overlay rendering", ex); return; } - finally - { - // Restore graphics2d properties - graphics.setTransform(transform); - graphics.setStroke(stroke); - graphics.setComposite(composite); - graphics.setPaint(paint); - graphics.setColor(color); - graphics.setRenderingHints(renderingHints); - graphics.setBackground(background); - } final Dimension dimension = MoreObjects.firstNonNull(overlayDimension, new Dimension()); overlay.setBounds(new Rectangle(point, dimension)); From fbb82a3b0a263efc6be27479617af47884079f6c Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 13 Aug 2019 17:52:38 -0400 Subject: [PATCH 05/13] overlay renderer: remove unnecessary color resetting Resetting paint covers color too --- .../java/net/runelite/client/ui/overlay/OverlayRenderer.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index af92163b79..f2fcd059ac 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -208,7 +208,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener final Stroke stroke = graphics.getStroke(); final Composite composite = graphics.getComposite(); final Paint paint = graphics.getPaint(); - final Color color = graphics.getColor(); final RenderingHints renderingHints = graphics.getRenderingHints(); final Color background = graphics.getBackground(); @@ -301,7 +300,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener graphics.setStroke(stroke); graphics.setComposite(composite); graphics.setPaint(paint); - graphics.setColor(color); graphics.setRenderingHints(renderingHints); graphics.setBackground(background); } From 034aa9214e5af1d0cf0a6ea3d4004dfabae971cc Mon Sep 17 00:00:00 2001 From: Max Weber Date: Fri, 9 Aug 2019 15:10:09 -0600 Subject: [PATCH 06/13] runelite-client: Bypass Jagex load balancer if we can't connect --- .../client/rs/ClientConfigLoader.java | 11 +- .../net/runelite/client/rs/ClientLoader.java | 143 ++++++++++++------ .../net/runelite/client/rs/HostSupplier.java | 77 ++++++++++ .../client/rs/ClientConfigLoaderTest.java | 2 +- 4 files changed, 180 insertions(+), 53 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/rs/HostSupplier.java diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java index 41e7915eff..29459d9e7f 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java @@ -29,6 +29,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import net.runelite.http.api.RuneLiteAPI; +import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; @@ -40,10 +41,16 @@ class ClientConfigLoader private static final String CONFIG_URL = "http://oldschool.runescape.com/jav_config.ws"; - static RSConfig fetch() throws IOException + static RSConfig fetch(String host) throws IOException { + HttpUrl url = HttpUrl.parse(CONFIG_URL); + if (host != null) + { + url = url.newBuilder().host(host).build(); + } + final Request request = new Request.Builder() - .url(CONFIG_URL) + .url(url) .build(); final RSConfig config = new RSConfig(); diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 43721b6f06..f6c77916c4 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -38,7 +38,6 @@ import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URL; import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; @@ -58,6 +57,7 @@ import static net.runelite.client.rs.ClientUpdateCheckMode.VANILLA; import net.runelite.client.ui.FatalErrorDialog; import net.runelite.client.ui.SplashScreen; import net.runelite.http.api.RuneLiteAPI; +import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; import org.apache.commons.compress.compressors.CompressorException; @@ -65,6 +65,8 @@ import org.apache.commons.compress.compressors.CompressorException; @Slf4j public class ClientLoader implements Supplier { + private static final int NUM_ATTEMPTS = 6; + private ClientUpdateCheckMode updateCheckMode; private Object client = null; @@ -98,77 +100,118 @@ public class ClientLoader implements Supplier try { SplashScreen.stage(0, null, "Fetching applet viewer config"); - RSConfig config = ClientConfigLoader.fetch(); + + HostSupplier hostSupplier = new HostSupplier(); + + String host = null; + RSConfig config; + for (int attempt = 0; ; attempt++) + { + try + { + config = ClientConfigLoader.fetch(host); + break; + } + catch (IOException e) + { + log.info("Failed to get jav_config from host \"{}\" ({})", host, e.getMessage()); + + if (attempt >= NUM_ATTEMPTS) + { + throw e; + } + + host = hostSupplier.get(); + } + } Map zipFile = new HashMap<>(); { Certificate[] jagexCertificateChain = getJagexCertificateChain(); String codebase = config.getCodeBase(); String initialJar = config.getInitialJar(); - URL url = new URL(codebase + initialJar); - Request request = new Request.Builder() - .url(url) - .build(); + HttpUrl url = HttpUrl.parse(codebase + initialJar); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + for (int attempt = 0; ; attempt++) { - int length = (int) response.body().contentLength(); - if (length < 0) - { - length = 3 * 1024 * 1024; - } - final int flength = length; - InputStream istream = new FilterInputStream(response.body().byteStream()) - { - private int read = 0; + zipFile.clear(); - @Override - public int read(byte[] b, int off, int len) throws IOException + Request request = new Request.Builder() + .url(url) + .build(); + + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + { + int length = (int) response.body().contentLength(); + if (length < 0) { - int thisRead = super.read(b, off, len); - this.read += thisRead; - SplashScreen.stage(.05, .35, null, "Downloading Old School RuneScape", this.read, flength, true); - return thisRead; + length = 3 * 1024 * 1024; } - }; - JarInputStream jis = new JarInputStream(istream); - - byte[] tmp = new byte[4096]; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024); - for (; ; ) - { - JarEntry metadata = jis.getNextJarEntry(); - if (metadata == null) + final int flength = length; + InputStream istream = new FilterInputStream(response.body().byteStream()) { - break; - } + private int read = 0; - buffer.reset(); + @Override + public int read(byte[] b, int off, int len) throws IOException + { + int thisRead = super.read(b, off, len); + this.read += thisRead; + SplashScreen.stage(.05, .35, null, "Downloading Old School RuneScape", this.read, flength, true); + return thisRead; + } + }; + JarInputStream jis = new JarInputStream(istream); + + byte[] tmp = new byte[4096]; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024); for (; ; ) { - int n = jis.read(tmp); - if (n <= -1) + JarEntry metadata = jis.getNextJarEntry(); + if (metadata == null) { break; } - buffer.write(tmp, 0, n); - } - if (!Arrays.equals(metadata.getCertificates(), jagexCertificateChain)) + buffer.reset(); + for (; ; ) + { + int n = jis.read(tmp); + if (n <= -1) + { + break; + } + buffer.write(tmp, 0, n); + } + + if (!Arrays.equals(metadata.getCertificates(), jagexCertificateChain)) + { + if (metadata.getName().startsWith("META-INF/")) + { + // META-INF/JAGEXLTD.SF and META-INF/JAGEXLTD.RSA are not signed, but we don't need + // anything in META-INF anyway. + continue; + } + else + { + throw new VerificationException("Unable to verify jar entry: " + metadata.getName()); + } + } + + zipFile.put(metadata.getName(), buffer.toByteArray()); + } + break; + } + catch (IOException e) + { + log.info("Failed to download gamepack from \"{}\" ({})", url, e.getMessage()); + + if (attempt >= NUM_ATTEMPTS) { - if (metadata.getName().startsWith("META-INF/")) - { - // META-INF/JAGEXLTD.SF and META-INF/JAGEXLTD.RSA are not signed, but we don't need - // anything in META-INF anyway. - continue; - } - else - { - throw new VerificationException("Unable to verify jar entry: " + metadata.getName()); - } + throw e; } - zipFile.put(metadata.getName(), buffer.toByteArray()); + url = url.newBuilder().host(hostSupplier.get()).build(); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/rs/HostSupplier.java b/runelite-client/src/main/java/net/runelite/client/rs/HostSupplier.java new file mode 100644 index 0000000000..b92f9bb074 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/rs/HostSupplier.java @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2019 Abex + * 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.rs; + +import java.io.IOException; +import java.util.ArrayDeque; +import java.util.Collections; +import java.util.List; +import java.util.Queue; +import java.util.Random; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; +import net.runelite.http.api.worlds.WorldClient; + +@Slf4j +class HostSupplier implements Supplier +{ + private final Random random = new Random(System.nanoTime()); + private Queue hosts = new ArrayDeque<>(); + + @Override + public String get() + { + if (!hosts.isEmpty()) + { + return hosts.poll(); + } + + try + { + List newHosts = new WorldClient() + .lookupWorlds() + .getWorlds() + .stream() + .map(i -> i.getAddress()) + .collect(Collectors.toList()); + + Collections.shuffle(newHosts, random); + + hosts.addAll(newHosts.subList(0, 16)); + } + catch (IOException e) + { + log.warn("Unable to retrieve world list", e); + } + + while (hosts.size() < 2) + { + hosts.add("oldschool" + (random.nextInt(50) + 1) + ".runescape.COM"); + } + + return hosts.poll(); + } +} diff --git a/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java index beb3400927..436c2c2bea 100644 --- a/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java +++ b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java @@ -37,7 +37,7 @@ public class ClientConfigLoaderTest @Test public void test() throws IOException { - final RSConfig config = ClientConfigLoader.fetch(); + final RSConfig config = ClientConfigLoader.fetch(null); for (String key : config.getClassLoaderProperties().keySet()) { From 14e6ea29724b8a8a870bb907dc330323c62d7256 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 15 Aug 2019 08:41:17 +0000 Subject: [PATCH 07/13] Update Item IDs to 2019-08-15-rev181 --- runelite-api/src/main/java/net/runelite/api/ItemID.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index b628f78261..72cbfeef7a 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -11178,5 +11178,6 @@ public final class ItemID public static final int CRYSTAL_SHIELD_24127 = 24127; public static final int COMBAT_PATH_STARTER_KIT = 24130; public static final int COMBAT_PATH_VOUCHER = 24131; + public static final int MARBLE_LECTERN = 24132; /* This file is automatically generated. Do not edit. */ } From 0c6aa5d8c8822891a8c5408ea3065bb6efa2c220 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 15 Aug 2019 08:41:18 +0000 Subject: [PATCH 08/13] Update Object IDs to 2019-08-15-rev181 --- .../java/net/runelite/api/NullObjectID.java | 30 +++++++++++++++++++ .../main/java/net/runelite/api/ObjectID.java | 27 +++++++++-------- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 5a1ded28d0..b0d675ef33 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -1172,6 +1172,7 @@ public final class NullObjectID public static final int NULL_2462 = 2462; public static final int NULL_2463 = 2463; public static final int NULL_2464 = 2464; + public static final int NULL_2485 = 2485; public static final int NULL_2488 = 2488; public static final int NULL_2489 = 2489; public static final int NULL_2490 = 2490; @@ -1838,6 +1839,7 @@ public final class NullObjectID public static final int NULL_4110 = 4110; public static final int NULL_4136 = 4136; public static final int NULL_4137 = 4137; + public static final int NULL_4140 = 4140; public static final int NULL_4145 = 4145; public static final int NULL_4146 = 4146; public static final int NULL_4190 = 4190; @@ -2188,6 +2190,7 @@ public final class NullObjectID public static final int NULL_4946 = 4946; public static final int NULL_4947 = 4947; public static final int NULL_4948 = 4948; + public static final int NULL_4976 = 4976; public static final int NULL_4985 = 4985; public static final int NULL_4986 = 4986; public static final int NULL_4987 = 4987; @@ -17985,5 +17988,32 @@ public final class NullObjectID public static final int NULL_37342 = 37342; public static final int NULL_37343 = 37343; public static final int NULL_37348 = 37348; + public static final int NULL_37353 = 37353; + public static final int NULL_37354 = 37354; + public static final int NULL_37355 = 37355; + public static final int NULL_37356 = 37356; + public static final int NULL_37357 = 37357; + public static final int NULL_37358 = 37358; + public static final int NULL_37359 = 37359; + public static final int NULL_37360 = 37360; + public static final int NULL_37361 = 37361; + public static final int NULL_37362 = 37362; + public static final int NULL_37363 = 37363; + public static final int NULL_37364 = 37364; + public static final int NULL_37365 = 37365; + public static final int NULL_37366 = 37366; + public static final int NULL_37367 = 37367; + public static final int NULL_37368 = 37368; + public static final int NULL_37369 = 37369; + public static final int NULL_37370 = 37370; + public static final int NULL_37371 = 37371; + public static final int NULL_37372 = 37372; + public static final int NULL_37373 = 37373; + public static final int NULL_37374 = 37374; + public static final int NULL_37375 = 37375; + public static final int NULL_37376 = 37376; + public static final int NULL_37377 = 37377; + public static final int NULL_37378 = 37378; + public static final int NULL_37379 = 37379; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index bb75a0e17f..c0da125193 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -1318,8 +1318,7 @@ public final class ObjectID public static final int TRAWLER_NET_2481 = 2481; public static final int TRAWLER_NET_2482 = 2482; public static final int TRAWLER_NET_2483 = 2483; - public static final int LEAK = 2484; - public static final int REPAIRED_LEAK = 2485; + public static final int HOPPER_CONTROLS = 2484; public static final int SPRAY = 2486; public static final int SPRAY_2487 = 2487; public static final int LAMP_2491 = 2491; @@ -1411,7 +1410,7 @@ public final class ObjectID public static final int CHEST_2604 = 2604; public static final int LADDER_2605 = 2605; public static final int WALL_2606 = 2606; - public static final int HOPPER_CONTROLS = 2607; + public static final int HOPPER_CONTROLS_2607 = 2607; public static final int STAIRCASE_2608 = 2608; public static final int STAIRCASE_2609 = 2609; public static final int STAIRCASE_2610 = 2610; @@ -2308,7 +2307,6 @@ public final class ObjectID public static final int HILLSIDE_ENTRANCE_4135 = 4135; public static final int COUNTER_4138 = 4138; public static final int SHIPS_LADDER_4139 = 4139; - public static final int HOLE_4140 = 4140; public static final int STRANGE_ALTAR = 4141; public static final int SWAYING_TREE = 4142; public static final int DANGER_SIGN_4143 = 4143; @@ -2794,7 +2792,6 @@ public final class ObjectID public static final int STAIRS_4973 = 4973; public static final int MINE_CART_4974 = 4974; public static final int CRATE_4975 = 4975; - public static final int HULL = 4976; public static final int GANGPLANK_4977 = 4977; public static final int GANGPLANK_4978 = 4978; public static final int HERBS_4979 = 4979; @@ -13355,7 +13352,7 @@ public final class ObjectID public static final int DRAGONS_HEAD_25033 = 25033; public static final int LAW_RIFT = 25034; public static final int DEATH_RIFT = 25035; - public static final int HULL_25037 = 25037; + public static final int HULL = 25037; public static final int LADDER_25038 = 25038; public static final int WALL_25039 = 25039; public static final int WARDROBE_25040 = 25040; @@ -17102,7 +17099,7 @@ public final class ObjectID public static final int SWAMP_PASTE = 32295; public static final int POTIONS = 32296; public static final int FIRE_32297 = 32297; - public static final int LEAK_32298 = 32298; + public static final int LEAK = 32298; public static final int FREMENNIK_WARRIOR = 32299; public static final int FREMENNIK_WARRIOR_32300 = 32300; public static final int FREMENNIK_WARRIOR_32301 = 32301; @@ -18591,7 +18588,7 @@ public final class ObjectID public static final int RUBBLE_34804 = 34804; public static final int RUBBLE_34805 = 34805; public static final int JADFEST_PORTAL = 34826; - public static final int HUB_PORTAL = 34827; + public static final int HANDY_PORTAL = 34827; public static final int LARRANS_SMALL_CHEST_34828 = 34828; public static final int LARRANS_BIG_CHEST = 34829; public static final int LARRANS_BIG_CHEST_34830 = 34830; @@ -18906,9 +18903,9 @@ public final class ObjectID public static final int PILLAR_OF_LIGHT_35323 = 35323; public static final int PILLAR_OF_LIGHT_35330 = 35330; public static final int PILLAR_OF_LIGHT_35331 = 35331; - public static final int TELEPORT_PLATFORM = 35387; - public static final int TELEPORT_PLATFORM_35388 = 35388; - public static final int TELEPORT_PLATFORM_35389 = 35389; + public static final int STAIRS_35387 = 35387; + public static final int STAIRS_35388 = 35388; + public static final int STAIRS_35389 = 35389; public static final int BOOKS_35434 = 35434; public static final int BOOKS_35435 = 35435; public static final int BOOKS_35436 = 35436; @@ -19094,7 +19091,7 @@ public final class ObjectID public static final int OPEN_CHEST_35962 = 35962; public static final int DESK_35963 = 35963; public static final int CORRUPTED_SCEPTRE = 35964; - public static final int TELEPORT_PLATFORM_35965 = 35965; + public static final int TELEPORT_PLATFORM = 35965; public static final int SINGING_BOWL_35966 = 35966; public static final int CORRUPT_DEPOSIT = 35967; public static final int CORRUPT_DEPOSIT_DEPLETED = 35968; @@ -19351,5 +19348,11 @@ public final class ObjectID public static final int ARCHERY_TARGET_37345 = 37345; public static final int BANNER_37346 = 37346; public static final int BARREL_37347 = 37347; + public static final int LECTERN_37349 = 37349; + public static final int HULL_37350 = 37350; + public static final int LEAK_37351 = 37351; + public static final int REPAIRED_LEAK = 37352; + public static final int BOOKS_37380 = 37380; + public static final int NOTICEBOARD_37381 = 37381; /* This file is automatically generated. Do not edit. */ } From 0b1c09baae09e0a7d3edbe105a67928e56103820 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 15 Aug 2019 08:41:18 +0000 Subject: [PATCH 09/13] Update NPC IDs to 2019-08-15-rev181 --- runelite-api/src/main/java/net/runelite/api/NpcID.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 202029dcde..766e4d892c 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -8273,5 +8273,9 @@ public final class NpcID public static final int CRAB_9201 = 9201; public static final int TIDE = 9202; public static final int ADVENTURER_JON = 9244; + public static final int ARIANWYN_HARD = 9246; + public static final int ESSYLLT_HARD = 9247; + public static final int ARIANWYN_9248 = 9248; + public static final int ESSYLLT_9249 = 9249; /* This file is automatically generated. Do not edit. */ } From dd9659b185f3cb401ba55f4e7f69a57ebca07ec6 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 15 Aug 2019 08:41:23 +0000 Subject: [PATCH 10/13] Update Widget IDs to 2019-08-15-rev181 --- .../src/main/java/net/runelite/api/widgets/WidgetInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index cb79dc5af9..db1b7a57f6 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -409,7 +409,7 @@ public enum WidgetInfo EXPERIENCE_TRACKER_WIDGET(WidgetID.EXPERIENCE_TRACKER_GROUP_ID, WidgetID.ExperienceTracker.WIDGET), EXPERIENCE_TRACKER_BOTTOM_BAR(WidgetID.EXPERIENCE_TRACKER_GROUP_ID, WidgetID.ExperienceTracker.BOTTOM_BAR), - FISHING_TRAWLER_TIMER(WidgetID.FISHING_TRAWLER_GROUP_ID, 37), + FISHING_TRAWLER_TIMER(WidgetID.FISHING_TRAWLER_GROUP_ID, 14), TITHE_FARM(WidgetID.TITHE_FARM_GROUP_ID, 1), From d709623985c440b9716d84fb95d74329884693bf Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 15 Aug 2019 11:11:42 +0000 Subject: [PATCH 11/13] [maven-release-plugin] prepare release runelite-parent-1.5.31 --- 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-script-assembler-plugin/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 730bc837f3..b23384497f 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31-SNAPSHOT + 1.5.31 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 16ba566e5d..b5d98ecf37 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.31-SNAPSHOT + 1.5.31 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 7893dca832..63789bf012 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31-SNAPSHOT + 1.5.31 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index e492f5e37c..93e5b7ed35 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.31-SNAPSHOT + 1.5.31 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 6b650c3205..bba5b2f149 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.31-SNAPSHOT + 1.5.31 Web Service diff --git a/pom.xml b/pom.xml index 2263547233..a36677374d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.31-SNAPSHOT + 1.5.31 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.31 diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index b7366b19ad..26ff4d01a5 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31-SNAPSHOT + 1.5.31 protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 61116a2f27..0185ed83d7 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31-SNAPSHOT + 1.5.31 protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 62ec470842..4f5a5cc607 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31-SNAPSHOT + 1.5.31 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 79db35617e..6a08248b43 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31-SNAPSHOT + 1.5.31 client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 1e93a864c0..599813cc50 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.31-SNAPSHOT + 1.5.31 script-assembler-plugin From 0ef08459af3f4c0706aefc50881aa7177c045b57 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 15 Aug 2019 11:11:49 +0000 Subject: [PATCH 12/13] [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-script-assembler-plugin/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index b23384497f..34c68a91ec 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31 + 1.5.32-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index b5d98ecf37..c90dedc037 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.31 + 1.5.32-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 63789bf012..ec3139c6c1 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31 + 1.5.32-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 93e5b7ed35..b5d734d71e 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.31 + 1.5.32-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index bba5b2f149..cb962d7c95 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.31 + 1.5.32-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index a36677374d..69b684da1a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.31 + 1.5.32-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.31 + HEAD diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index 26ff4d01a5..6a84dd0f49 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31 + 1.5.32-SNAPSHOT protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 0185ed83d7..3381ac7e80 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31 + 1.5.32-SNAPSHOT protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 4f5a5cc607..298f4cc0e7 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31 + 1.5.32-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 6a08248b43..158aeb577e 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.31 + 1.5.32-SNAPSHOT client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 599813cc50..ca1d84056c 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.31 + 1.5.32-SNAPSHOT script-assembler-plugin From 3a31996ad83473c9d181085b9ffe36f30a3df750 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 12 Aug 2019 20:31:24 -0400 Subject: [PATCH 13/13] Revert "Merge pull request #9354 from Toocanzs/centroid-fix" This reverts commit f8c09e0577d738da271a9f2ddab32b91a2bf492f. --- .../main/resources/net/runelite/client/plugins/gpu/frag.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl index 646d5dfd7d..03d8464642 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl @@ -31,7 +31,7 @@ uniform float smoothBanding; uniform vec4 fogColor; in vec4 Color; -centroid in float fHsl; +in float fHsl; in vec4 fUv; in float fogAmount;