diff --git a/cache/pom.xml b/cache/pom.xml
index b1f0d575215..a29adaafb37 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.10.33-SNAPSHOT
+ 1.10.34-SNAPSHOT
cache
diff --git a/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java
index ccf9e680bec..d92f4e43f1c 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java
@@ -75,4 +75,6 @@ public class NpcDefinition
public boolean lowPriorityFollowerOps;
public Map params;
public int category;
+ public int height = -1;
+ public int[] stats = {1, 1, 1, 1, 1, 1};
}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java
index 8bf513b4e40..276b4e65e8d 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java
@@ -158,7 +158,30 @@ else if (opcode == 60)
{
def.chatheadModels[index] = stream.readUnsignedShort();
}
-
+ }
+ else if (opcode == 74)
+ {
+ def.stats[0] = stream.readUnsignedShort();
+ }
+ else if (opcode == 75)
+ {
+ def.stats[1] = stream.readUnsignedShort();
+ }
+ else if (opcode == 76)
+ {
+ def.stats[2] = stream.readUnsignedShort();
+ }
+ else if (opcode == 77)
+ {
+ def.stats[3] = stream.readUnsignedShort();
+ }
+ else if (opcode == 78)
+ {
+ def.stats[4] = stream.readUnsignedShort();
+ }
+ else if (opcode == 79)
+ {
+ def.stats[5] = stream.readUnsignedShort();
}
else if (opcode == 93)
{
@@ -333,6 +356,10 @@ else if (opcode == 123)
{
def.lowPriorityFollowerOps = true;
}
+ else if (opcode == 124)
+ {
+ def.height = stream.readUnsignedShort();
+ }
else if (opcode == 249)
{
length = stream.readUnsignedByte();
diff --git a/pom.xml b/pom.xml
index 422db8a3f26..45d62ea6da9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
net.runelite
runelite-parent
- 1.10.33-SNAPSHOT
+ 1.10.34-SNAPSHOT
pom
RuneLite
@@ -47,7 +47,7 @@
true
- 222
+ 223
@@ -309,6 +309,23 @@
maven-plugin-plugin
3.6.0
+
+ org.apache.maven.plugins
+ maven-pmd-plugin
+ 3.22.0
+
+
+ net.sourceforge.pmd
+ pmd-core
+ 7.2.0
+
+
+ net.sourceforge.pmd
+ pmd-java
+ 7.2.0
+
+
+
diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index 5aae3583f48..cea51f70621 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.10.33-SNAPSHOT
+ 1.10.34-SNAPSHOT
runelite-api
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 0b4970acab3..00e36bfc64c 100644
--- a/runelite-api/src/main/java/net/runelite/api/ItemID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java
@@ -3715,10 +3715,10 @@ public final class ItemID
public static final int LEDERHOSEN_SHORTS = 6181;
public static final int LEDERHOSEN_HAT = 6182;
public static final int FROG_TOKEN = 6183;
- public static final int PRINCE_TUNIC = 6184;
- public static final int PRINCE_LEGGINGS = 6185;
- public static final int PRINCESS_BLOUSE = 6186;
- public static final int PRINCESS_SKIRT = 6187;
+ public static final int ROYAL_FROG_TUNIC = 6184;
+ public static final int ROYAL_FROG_LEGGINGS = 6185;
+ public static final int ROYAL_FROG_BLOUSE = 6186;
+ public static final int ROYAL_FROG_SKIRT = 6187;
public static final int FROG_MASK = 6188;
public static final int MYSTERY_BOX = 6199;
public static final int RAW_FISHLIKE_THING = 6200;
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 bdd68298ad6..e0dbd92a9a6 100644
--- a/runelite-api/src/main/java/net/runelite/api/NpcID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java
@@ -382,6 +382,7 @@ public final class NpcID
public static final int REACHER_389 = 389;
public static final int EVIL_BOB = 390;
public static final int EVIL_BOB_391 = 391;
+ public static final int TROTTERS = 392;
public static final int SERVANT = 393;
public static final int ROD_FISHING_SPOT = 394;
public static final int CAT = 395;
@@ -749,8 +750,8 @@ public final class NpcID
public static final int SKRAELING_774 = 774;
public static final int FISHMONGER = 775;
public static final int GREENGROCER = 776;
- public static final int ETHEREAL_MAN = 777;
- public static final int ETHEREAL_LADY = 778;
+ public static final int ETHEREAL_BEING = 777;
+ public static final int ETHEREAL_BEING_778 = 778;
public static final int ETHEREAL_NUMERATOR = 779;
public static final int ETHEREAL_EXPERT = 780;
public static final int ETHEREAL_PERCEPTIVE = 781;
@@ -5038,8 +5039,6 @@ public final class NpcID
public static final int FROG_5431 = 5431;
public static final int FROG_5432 = 5432;
public static final int CALEB_5433 = 5433;
- public static final int FROG_PRINCE = 5434;
- public static final int FROG_PRINCESS = 5435;
public static final int NILES = 5436;
public static final int MILES = 5437;
public static final int GILES = 5438;
@@ -11294,6 +11293,10 @@ public final class NpcID
public static final int KIT_BREAKER_13436 = 13436;
public static final int SIR_KIT_BREAKER = 13437;
public static final int SIR_KIT_BREAKER_13438 = 13438;
+ public static final int FROG_PRIN = 13443;
+ public static final int FROG_PRIN_13444 = 13444;
+ public static final int FROG_PRINCE = 13445;
+ public static final int FROG_PRINCESS = 13446;
public static final int ENRAGED_BLOOD_MOON = 13485;
public static final int ENRAGED_BLUE_MOON = 13486;
public static final int ENRAGED_ECLIPSE_MOON = 13487;
diff --git a/runelite-client/pmd-ruleset.xml b/runelite-client/pmd-ruleset.xml
index cfbbdec60e3..ee2e61d7974 100644
--- a/runelite-client/pmd-ruleset.xml
+++ b/runelite-client/pmd-ruleset.xml
@@ -44,7 +44,7 @@
+ value="net.runelite.client.eventbus.Subscribe,com.google.inject.Provides"/>
@@ -53,13 +53,20 @@
+
+
-
+
+
+
+
+
+
@@ -68,12 +75,7 @@
-
-
-
-
-
+
@@ -81,10 +83,6 @@
-
-
-
-
@@ -100,5 +98,4 @@
-
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index c9293233cdc..0f6a564cb28 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.10.33-SNAPSHOT
+ 1.10.34-SNAPSHOT
client
@@ -448,19 +448,6 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.16.0
-
-
- net.sourceforge.pmd
- pmd-core
- 6.44.0
-
-
- net.sourceforge.pmd
- pmd-java
- 6.44.0
-
-
true
true
diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
index b41dfbceb25..8a892ec4a5a 100644
--- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java
+++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
@@ -189,7 +189,7 @@ public static void main(String[] args) throws Exception
.withRequiredArg()
.ofType(ClientUpdateCheckMode.class)
.defaultsTo(ClientUpdateCheckMode.AUTO)
- .withValuesConvertedBy(new EnumConverter(ClientUpdateCheckMode.class)
+ .withValuesConvertedBy(new EnumConverter<>(ClientUpdateCheckMode.class)
{
@Override
public ClientUpdateCheckMode convert(String v)
diff --git a/runelite-client/src/main/java/net/runelite/client/RuntimeConfigLoader.java b/runelite-client/src/main/java/net/runelite/client/RuntimeConfigLoader.java
index 30e64a3e6a3..7be20afc805 100644
--- a/runelite-client/src/main/java/net/runelite/client/RuntimeConfigLoader.java
+++ b/runelite-client/src/main/java/net/runelite/client/RuntimeConfigLoader.java
@@ -118,7 +118,7 @@ public void onFailure(Call call, IOException e)
@Override
public void onResponse(Call call, Response response)
{
- try // NOPMD: UseTryWithResources
+ try (response)
{
RuntimeConfig config = RuneLiteAPI.GSON.fromJson(response.body().charStream(), RuntimeConfig.class);
future.complete(config);
@@ -127,10 +127,6 @@ public void onResponse(Call call, Response response)
{
future.completeExceptionally(ex);
}
- finally
- {
- response.close();
- }
}
});
return future;
diff --git a/runelite-client/src/main/java/net/runelite/client/Updater.java b/runelite-client/src/main/java/net/runelite/client/Updater.java
index 1440a075657..c952a865645 100644
--- a/runelite-client/src/main/java/net/runelite/client/Updater.java
+++ b/runelite-client/src/main/java/net/runelite/client/Updater.java
@@ -314,7 +314,7 @@ private static double installRollout()
}
}
HashCode hash = hasher.hash();
- return (double) (hash.asInt() & 0x7fffffff) / (double) Integer.MAX_VALUE;
+ return (hash.asInt() & 0x7fffffff) / (double) Integer.MAX_VALUE;
}
catch (Exception ex)
{
diff --git a/runelite-client/src/main/java/net/runelite/client/account/AccountClient.java b/runelite-client/src/main/java/net/runelite/client/account/AccountClient.java
index 11bf90716f2..14b03a9874c 100644
--- a/runelite-client/src/main/java/net/runelite/client/account/AccountClient.java
+++ b/runelite-client/src/main/java/net/runelite/client/account/AccountClient.java
@@ -99,7 +99,7 @@ public void logout() throws IOException
.url(url)
.build();
- try (Response response = client.newCall(request).execute())
+ try (Response ignored = client.newCall(request).execute())
{
log.debug("Sent logout request");
}
diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigClient.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigClient.java
index e1d43830076..162da2e7558 100644
--- a/runelite-client/src/main/java/net/runelite/client/config/ConfigClient.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigClient.java
@@ -160,7 +160,7 @@ public void onFailure(Call call, IOException e)
@Override
public void onResponse(Call call, Response response)
{
- try // NOPMD: UseTryWithResources
+ try (response)
{
if (response.code() != 200)
{
@@ -188,10 +188,6 @@ public void onResponse(Call call, Response response)
{
future.completeExceptionally(ex);
}
- finally
- {
- response.close();
- }
}
});
diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
index 5fd32b9d130..8c39c5f229f 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
@@ -87,10 +87,12 @@ private static class OutlineKey
@Inject(optional = true)
@Named("activePriceThreshold")
+ @SuppressWarnings("PMD.ImmutableField")
private double activePriceThreshold = 5;
@Inject(optional = true)
@Named("lowPriceThreshold")
+ @SuppressWarnings("PMD.ImmutableField")
private int lowPriceThreshold = 1000;
private Map itemPrices = Collections.emptyMap();
@@ -194,7 +196,7 @@ public ItemManager(Client client, ScheduledExecutorService scheduledExecutorServ
itemImages = CacheBuilder.newBuilder()
.maximumSize(128L)
.expireAfterAccess(1, TimeUnit.HOURS)
- .build(new CacheLoader()
+ .build(new CacheLoader<>()
{
@Override
public AsyncBufferedImage load(ImageKey key) throws Exception
@@ -206,7 +208,7 @@ public AsyncBufferedImage load(ImageKey key) throws Exception
itemOutlines = CacheBuilder.newBuilder()
.maximumSize(128L)
.expireAfterAccess(1, TimeUnit.HOURS)
- .build(new CacheLoader()
+ .build(new CacheLoader<>()
{
@Override
public BufferedImage load(OutlineKey key) throws Exception
diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemVariationMapping.java b/runelite-client/src/main/java/net/runelite/client/game/ItemVariationMapping.java
index 2161bedba2a..30933209ed5 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/ItemVariationMapping.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/ItemVariationMapping.java
@@ -51,7 +51,7 @@ public class ItemVariationMapping
{
final Gson gson = new Gson();
// CHECKSTYLE:OFF
- final TypeToken