From ef3622c05ae497d264d72330c9d5b5fc20906801 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 3 Sep 2021 13:21:32 -0400 Subject: [PATCH 1/7] api: flatten model uvs This drastically reduces the number of allocated float arrays on the heap just by flattening the uvs into a single array per model --- .../src/main/java/net/runelite/api/Model.java | 3 +-- .../client/plugins/gpu/SceneUploader.java | 21 ++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Model.java b/runelite-api/src/main/java/net/runelite/api/Model.java index 4e5332e2f2..441577caea 100644 --- a/runelite-api/src/main/java/net/runelite/api/Model.java +++ b/runelite-api/src/main/java/net/runelite/api/Model.java @@ -72,8 +72,7 @@ public interface Model extends Renderable short[] getFaceTextures(); - float[][] getFaceTextureUCoordinates(); - float[][] getFaceTextureVCoordinates(); + float[] getFaceTextureUVCoordinates(); void calculateExtreme(int orientation); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java index 548eca7589..675381053d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java @@ -389,8 +389,7 @@ class SceneUploader final short[] faceTextures = model.getFaceTextures(); final byte[] facePriorities = model.getFaceRenderPriorities(); - float[][] u = model.getFaceTextureUCoordinates(); - float[][] v = model.getFaceTextureVCoordinates(); + float[] uv = model.getFaceTextureUVCoordinates(); int len = 0; for (int face = 0; face < triangleCount; ++face) @@ -432,7 +431,7 @@ class SceneUploader if (faceTextures != null) { - pushUvForFace(faceTextures, u, v, face, uvBuffer); + pushUvForFace(faceTextures, uv, face, uvBuffer); } len += 3; @@ -559,11 +558,9 @@ class SceneUploader vertexBuffer.put(a, b, c, packedAlphaPriority | color3); - float[][] u = model.getFaceTextureUCoordinates(); - float[][] v = model.getFaceTextureVCoordinates(); if (padUvs || faceTextures != null) { - pushUvForFace(faceTextures, u, v, face, uvBuffer); + pushUvForFace(faceTextures, model.getFaceTextureUVCoordinates(), face, uvBuffer); } return 3; @@ -584,15 +581,15 @@ class SceneUploader return alpha | priority; } - private static void pushUvForFace(short[] faceTextures, float[][] u, float[][] v, int face, GpuFloatBuffer uvBuffer) + private static void pushUvForFace(short[] faceTextures, float[] uv, int face, GpuFloatBuffer uvBuffer) { - float[] uf, vf; - if (faceTextures != null && u != null && v != null && (uf = u[face]) != null && (vf = v[face]) != null) + if (faceTextures != null && faceTextures[face] != -1 && uv != null) { + int idx = face * 6; float texture = faceTextures[face] + 1f; - uvBuffer.put(texture, uf[0], vf[0], 0f); - uvBuffer.put(texture, uf[1], vf[1], 0f); - uvBuffer.put(texture, uf[2], vf[2], 0f); + uvBuffer.put(texture, uv[idx], uv[idx + 1], 0f); + uvBuffer.put(texture, uv[idx + 2], uv[idx + 3], 0f); + uvBuffer.put(texture, uv[idx + 4], uv[idx + 5], 0f); } else { From adf0d75be8636d44c4fd8d42994738b98d17ac41 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 4 Sep 2021 12:32:21 -0400 Subject: [PATCH 2/7] wiki: move icon to match vanilla position --- .../java/net/runelite/api/widgets/WidgetID.java | 1 + .../net/runelite/api/widgets/WidgetInfo.java | 1 + .../client/plugins/wiki/WikiPlugin.java | 17 ++++++++--------- 3 files changed, 10 insertions(+), 9 deletions(-) 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 097c456d14..0e657a6e79 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 @@ -358,6 +358,7 @@ public class WidgetID static final int RUN_ORB_TEXT = 24; static final int SPEC_ORB = 29; static final int WORLDMAP_ORB = 43; + static final int WIKI_BANNER_PARENT = 44; static final int WIKI_BANNER = 45; static final int WORLDMAP_OPTIONS = 48; } 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 52e5961559..1e20e0fdc6 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 @@ -181,6 +181,7 @@ public enum WidgetInfo MINIMAP_HEALTH_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.HEALTH_ORB), MINIMAP_SPEC_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.SPEC_ORB), MINIMAP_WORLDMAP_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB), + MINIMAP_WIKI_BANNER_PARENT(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WIKI_BANNER_PARENT), MINIMAP_WIKI_BANNER(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WIKI_BANNER), MINIMAP_WORLDMAP_OPTIONS(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_OPTIONS), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java index 0e57fb47f7..5e9af5396a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java @@ -118,13 +118,12 @@ public class WikiPlugin extends Plugin private void removeWidgets() { - - Widget minimapOrbs = client.getWidget(WidgetInfo.MINIMAP_ORBS); - if (minimapOrbs == null) + Widget wikiBannerParent = client.getWidget(WidgetInfo.MINIMAP_WIKI_BANNER_PARENT); + if (wikiBannerParent == null) { return; } - Widget[] children = minimapOrbs.getChildren(); + Widget[] children = wikiBannerParent.getChildren(); if (children == null || children.length < 1) { return; @@ -152,8 +151,8 @@ public class WikiPlugin extends Plugin private void addWidgets() { - Widget minimapOrbs = client.getWidget(WidgetInfo.MINIMAP_ORBS); - if (minimapOrbs == null) + Widget wikiBannerParent = client.getWidget(WidgetInfo.MINIMAP_WIKI_BANNER_PARENT); + if (wikiBannerParent == null) { return; } @@ -164,12 +163,12 @@ public class WikiPlugin extends Plugin vanilla.setHidden(true); } - icon = minimapOrbs.createChild(0, WidgetType.GRAPHIC); + icon = wikiBannerParent.createChild(0, WidgetType.GRAPHIC); icon.setSpriteId(SpriteID.WIKI_DESELECTED); icon.setOriginalX(0); icon.setOriginalY(0); - icon.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT); - icon.setYPositionMode(WidgetPositionMode.ABSOLUTE_BOTTOM); + icon.setXPositionMode(WidgetPositionMode.ABSOLUTE_CENTER); + icon.setYPositionMode(WidgetPositionMode.ABSOLUTE_CENTER); icon.setOriginalWidth(40); icon.setOriginalHeight(14); icon.setTargetVerb("Lookup"); From cdbb0a3aa7b8f69bc5dee9fea953ac0f57d037d6 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 4 Sep 2021 16:29:46 -0400 Subject: [PATCH 3/7] api: make getCanvasTilePoly work on multi-tile npcs --- runelite-api/src/main/java/net/runelite/api/Actor.java | 2 +- .../runelite/client/plugins/agility/AgilityOverlay.java | 8 +------- .../client/plugins/npchighlight/NpcSceneOverlay.java | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Actor.java b/runelite-api/src/main/java/net/runelite/api/Actor.java index 857fdc3720..3e53351626 100644 --- a/runelite-api/src/main/java/net/runelite/api/Actor.java +++ b/runelite-api/src/main/java/net/runelite/api/Actor.java @@ -283,7 +283,7 @@ public interface Actor extends Renderable void setSpotAnimFrame(int spotAnimFrame); /** - * Gets the canvas area of the current tile the actor is standing on. + * Gets the canvas area of the current tiles the actor is standing on. * * @return the current tile canvas area */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java index 7612c5b662..e1102c3b89 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java @@ -35,8 +35,6 @@ import java.util.Set; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.NPC; -import net.runelite.api.NPCComposition; -import net.runelite.api.Perspective; import net.runelite.api.Point; import net.runelite.api.Tile; import net.runelite.api.coords.LocalPoint; @@ -157,11 +155,7 @@ class AgilityOverlay extends Overlay Color color = config.sepulchreHighlightColor(); for (NPC npc : npcs) { - NPCComposition npcComposition = npc.getComposition(); - int size = npcComposition.getSize(); - LocalPoint lp = npc.getLocalLocation(); - - Polygon tilePoly = Perspective.getCanvasTileAreaPoly(client, lp, size); + Polygon tilePoly = npc.getCanvasTilePoly(); if (tilePoly != null) { OverlayUtil.renderPolygon(graphics, tilePoly, color); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java index 84e428918c..a13ef58ade 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java @@ -162,10 +162,7 @@ public class NpcSceneOverlay extends Overlay if (highlightedNpc.isTile()) { - int size = npcComposition.getSize(); - LocalPoint lp = actor.getLocalLocation(); - Polygon tilePoly = Perspective.getCanvasTileAreaPoly(client, lp, size); - + Polygon tilePoly = actor.getCanvasTilePoly(); renderPoly(graphics, borderColor, fillColor, tilePoly); } From 2cdd1be7d801ff83322d85512d54f1072db2186f Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 5 Sep 2021 15:38:31 -0400 Subject: [PATCH 4/7] pom: remove source/target configuration on maven-compiler-plugin On Java 11, which we require for building, the compiler accepts --release 8 and no longer requires -source or -target, so these are unnecessary --- http-service/pom.xml | 2 ++ pom.xml | 3 --- runelite-jshell/pom.xml | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/http-service/pom.xml b/http-service/pom.xml index 44cce1d7d5..f1bfb35dbd 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -167,6 +167,8 @@ org.apache.maven.plugins maven-compiler-plugin + 1.8 + 1.8 org.mapstruct diff --git a/pom.xml b/pom.xml index d487454096..768a7e582d 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,6 @@ UTF-8 1 - 1.8 8 1.18.20 @@ -183,8 +182,6 @@ org.apache.maven.plugins maven-compiler-plugin - ${java.version} - ${java.version} ${java.release} diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index fef62246a0..8f1bac35c7 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -73,8 +73,6 @@ org.apache.maven.plugins maven-compiler-plugin - 11 - 11 11 From 97095b41f8dc48d5cfa0064fc1d2b6847ad911aa Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 5 Sep 2021 15:39:13 -0400 Subject: [PATCH 5/7] ui: force heavyweight tooltips on macos Lightweight components do not render correctly over AWT canvases on MacOS. The popup factory API to override this is not available on 8, so add an 11-specific popup factory to override it by using a multi-release jar. --- pom.xml | 6 ++- runelite-client/pom.xml | 41 ++++++++++++++++++ .../client/util/MacOSPopupFactory.java | 34 +++++++++++++++ .../net/runelite/client/util/SwingUtil.java | 9 ++++ .../client/util/MacOSPopupFactory.java | 42 +++++++++++++++++++ 5 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/util/MacOSPopupFactory.java create mode 100644 runelite-client/src/main/java11/net/runelite/client/util/MacOSPopupFactory.java diff --git a/pom.xml b/pom.xml index 768a7e582d..c3118cd0c2 100644 --- a/pom.xml +++ b/pom.xml @@ -273,8 +273,10 @@ checkstyle.xml - - ${project.build.sourceDirectory} + + + ${project.build.sourceDirectory} + true diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index debecf5638..95aaedc980 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -302,6 +302,36 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + compile-java11 + + compile + + + 11 + + ${project.basedir}/src/main/java11 + + ${project.build.outputDirectory}/META-INF/versions/11 + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + + + + org.apache.maven.plugins maven-resources-plugin @@ -385,6 +415,17 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + ${project.build.sourceDirectory} + ${project.basedir}/src/main/java11 + + + org.apache.maven.plugins maven-pmd-plugin diff --git a/runelite-client/src/main/java/net/runelite/client/util/MacOSPopupFactory.java b/runelite-client/src/main/java/net/runelite/client/util/MacOSPopupFactory.java new file mode 100644 index 0000000000..8e9f14551a --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/util/MacOSPopupFactory.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2021, 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.util; + +import javax.swing.PopupFactory; + +/** + * Dummy popup factory for Java 8 + */ +class MacOSPopupFactory extends PopupFactory +{ +} diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java index 90723d9ade..828adfdadf 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java @@ -50,6 +50,7 @@ import javax.swing.JButton; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.LookAndFeel; +import javax.swing.PopupFactory; import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; import javax.swing.UIManager; @@ -109,6 +110,14 @@ public class SwingUtil try { UIManager.setLookAndFeel(laf); + + if (OSType.getOSType() == OSType.MacOS) + { + // On MacOS Substance doesn't install its own popup factory, and the default one uses lightweight + // components unless the Aqua LAF is used. Lightweight components do not render correctly over AWT + // canvases on MacOS - so replace the popup factory one with that forces heavy components. + PopupFactory.setSharedInstance(new MacOSPopupFactory()); + } } catch (UnsupportedLookAndFeelException ex) { diff --git a/runelite-client/src/main/java11/net/runelite/client/util/MacOSPopupFactory.java b/runelite-client/src/main/java11/net/runelite/client/util/MacOSPopupFactory.java new file mode 100644 index 0000000000..62a91abed8 --- /dev/null +++ b/runelite-client/src/main/java11/net/runelite/client/util/MacOSPopupFactory.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021, 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.util; + +import java.awt.Component; +import javax.swing.Popup; +import javax.swing.PopupFactory; + +/** + * Popup factory for Java 11 which forces heavyweight popups. Lightweight popups do not render correctly + * over AWT canvases on OSX. + */ +class MacOSPopupFactory extends PopupFactory +{ + @Override + protected Popup getPopup(Component owner, Component contents, int x, int y, boolean isHeavyWeightPopup) throws IllegalArgumentException + { + return super.getPopup(owner, contents, x, y, true); + } +} \ No newline at end of file From 56d0aae57df25e8f8dd5c80e9bf69295996935cc Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Mon, 6 Sep 2021 17:53:37 +0000 Subject: [PATCH 6/7] Release 1.7.22 --- 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 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 6aca9ff8b5..e185f6e5e7 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.22-SNAPSHOT + 1.7.22 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index a109246dff..20e91982b1 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.22-SNAPSHOT + 1.7.22 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 1d100fd808..dbe732d473 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.22-SNAPSHOT + 1.7.22 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 7082c0f968..b6a2596559 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.22-SNAPSHOT + 1.7.22 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index f1bfb35dbd..1540bbf987 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.22-SNAPSHOT + 1.7.22 Web Service diff --git a/pom.xml b/pom.xml index c3118cd0c2..5a12755322 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.22-SNAPSHOT + 1.7.22 pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.7.22 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 1b59559d98..e7b3e51f75 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.22-SNAPSHOT + 1.7.22 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 95aaedc980..75d616851c 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.22-SNAPSHOT + 1.7.22 client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 8f1bac35c7..6ddc589375 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.7.22-SNAPSHOT + 1.7.22 jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 393e17c640..9b100011bb 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.22-SNAPSHOT + 1.7.22 script-assembler-plugin From cc3b6550a9cd934fd42439920416084f2da71f08 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Mon, 6 Sep 2021 17:53:41 +0000 Subject: [PATCH 7/7] Bump for 1.7.23-SNAPSHOT --- 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 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index e185f6e5e7..89b1a08ee2 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.22 + 1.7.23-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 20e91982b1..214cd1d80d 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.22 + 1.7.23-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index dbe732d473..8f956d5b00 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.22 + 1.7.23-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index b6a2596559..aefdbbd4fd 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.22 + 1.7.23-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 1540bbf987..c1dcce0d8d 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.22 + 1.7.23-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 5a12755322..88a9a30635 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.22 + 1.7.23-SNAPSHOT pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.7.22 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index e7b3e51f75..7481dd4542 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.22 + 1.7.23-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 75d616851c..c0920e1b48 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.22 + 1.7.23-SNAPSHOT client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 6ddc589375..496ddfcb65 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.7.22 + 1.7.23-SNAPSHOT jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 9b100011bb..8d7af90cb3 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.22 + 1.7.23-SNAPSHOT script-assembler-plugin