diff --git a/runelite-client/pmd-ruleset.xml b/runelite-client/pmd-ruleset.xml index ebab6e2dcf..cfbbdec60e 100644 --- a/runelite-client/pmd-ruleset.xml +++ b/runelite-client/pmd-ruleset.xml @@ -53,13 +53,14 @@ - + + @@ -84,18 +85,20 @@ - - - + + + + + diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 3228ee1b05..a415fbdd61 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -462,17 +462,17 @@ org.apache.maven.plugins maven-pmd-plugin - 3.13.0 + 3.16.0 net.sourceforge.pmd pmd-core - 6.29.0 + 6.44.0 net.sourceforge.pmd pmd-java - 6.29.0 + 6.44.0 diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageBuilder.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageBuilder.java index 1b8afd0924..e6b3722cd8 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageBuilder.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageBuilder.java @@ -34,7 +34,7 @@ public class ChatMessageBuilder public ChatMessageBuilder append(final ChatColorType type) { - builder.append(""); + builder.append("'); return this; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java index 3ae75019d2..42ca35240c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java @@ -447,7 +447,7 @@ class WidgetInspector extends DevToolsFrame picker = parent.createChild(-1, WidgetType.GRAPHIC); - log.info("Picker is {}.{} [{}]", WidgetInfo.TO_GROUP(picker.getId()), WidgetInfo.TO_CHILD(picker.getId()), picker.getIndex()); + log.info("Picker is {}.{} [{}]", TO_GROUP(picker.getId()), TO_CHILD(picker.getId()), picker.getIndex()); picker.setSpriteId(SpriteID.MOBILE_FINGER_ON_INTERFACE); picker.setOriginalWidth(15); @@ -521,7 +521,7 @@ class WidgetInspector extends DevToolsFrame { continue; } - String name = WidgetInfo.TO_GROUP(entry.getParam1()) + "." + WidgetInfo.TO_CHILD(entry.getParam1()); + String name = TO_GROUP(entry.getParam1()) + "." + TO_CHILD(entry.getParam1()); if (entry.getParam0() != -1) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java index 7582517cfe..63e134ce70 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java @@ -445,7 +445,7 @@ public class FishingPlugin extends Plugin if (seconds < 10) { - trawlerText.append("0"); + trawlerText.append('0'); } trawlerText.append(seconds); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/OpenCLManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/OpenCLManager.java index 634b4cb473..14e6945019 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/OpenCLManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/OpenCLManager.java @@ -41,7 +41,6 @@ import jogamp.opengl.x11.glx.X11GLXContext; import lombok.extern.slf4j.Slf4j; import net.runelite.client.plugins.gpu.template.Template; import net.runelite.client.util.OSType; -import org.jocl.CL; import static org.jocl.CL.*; import org.jocl.CLException; import org.jocl.Pointer; @@ -96,7 +95,7 @@ class OpenCLManager void init(GL4 gl) { - CL.setExceptionsEnabled(true); + setExceptionsEnabled(true); switch (OSType.getOSType()) { @@ -121,55 +120,55 @@ class OpenCLManager { if (programUnordered != null) { - CL.clReleaseProgram(programUnordered); + clReleaseProgram(programUnordered); programUnordered = null; } if (programSmall != null) { - CL.clReleaseProgram(programSmall); + clReleaseProgram(programSmall); programSmall = null; } if (programLarge != null) { - CL.clReleaseProgram(programLarge); + clReleaseProgram(programLarge); programLarge = null; } if (kernelUnordered != null) { - CL.clReleaseKernel(kernelUnordered); + clReleaseKernel(kernelUnordered); kernelUnordered = null; } if (kernelSmall != null) { - CL.clReleaseKernel(kernelSmall); + clReleaseKernel(kernelSmall); kernelSmall = null; } if (kernelLarge != null) { - CL.clReleaseKernel(kernelLarge); + clReleaseKernel(kernelLarge); kernelLarge = null; } if (commandQueue != null) { - CL.clReleaseCommandQueue(commandQueue); + clReleaseCommandQueue(commandQueue); commandQueue = null; } if (context != null) { - CL.clReleaseContext(context); + clReleaseContext(context); context = null; } if (device != null) { - CL.clReleaseDevice(device); + clReleaseDevice(device); device = null; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java index e5cb354169..3d97b3d5bc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java @@ -829,7 +829,7 @@ public class GrandExchangePlugin extends Plugin if (resetTime != null) { Duration remaining = Duration.between(Instant.now(), resetTime); - sb.append(" (").append(DurationFormatUtils.formatDuration(remaining.toMillis(), "H:mm")).append(")"); + sb.append(" (").append(DurationFormatUtils.formatDuration(remaining.toMillis(), "H:mm")).append(')'); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 221094b01f..b54cb58bd8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -246,7 +246,7 @@ public class GroundItemsOverlay extends Overlay { itemStringBuilder.append(" (") .append(QuantityFormatter.quantityToStackSize(item.getQuantity())) - .append(")"); + .append(')'); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java index f0dd02dd71..f200998f59 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java @@ -663,7 +663,7 @@ public class GroundItemsPlugin extends Plugin { notificationStringBuilder.append(" (") .append(QuantityFormatter.quantityToStackSize(item.getQuantity())) - .append(")"); + .append(')'); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java index bdc0f8d8c1..9be50e16ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java @@ -173,7 +173,7 @@ public class ItemStatOverlay extends Overlay Duration highestDuration = durationRange.getHighestDuration(); if (lowestDuration != highestDuration) { - sb.append("~"); + sb.append('~'); sb.append(DurationFormatUtils.formatDuration(highestDuration.toMillis(), "m:ss")); } } @@ -381,7 +381,7 @@ public class ItemStatOverlay extends Overlay { if (config.relative()) { - b.append("/"); + b.append('/'); } b.append(c.getFormattedTheoretical()); } @@ -397,9 +397,9 @@ public class ItemStatOverlay extends Overlay if (config.absolute() && (config.relative() || config.theoretical())) { - b.append(")"); + b.append(')'); } - b.append(" ").append(c.getStat().getName()); + b.append(' ').append(c.getStat().getName()); b.append("
"); return b.toString(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java index ee7d7d295d..d383037070 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java @@ -106,7 +106,7 @@ class Bookcase b.append("Center"); } - b.append(" "); + b.append(' '); switch (location.getPlane()) { @@ -123,7 +123,7 @@ class Bookcase if (KourendLibraryPlugin.debug) { - b.append(" ").append(index.stream().map(Object::toString).collect(Collectors.joining(", "))); + b.append(' ').append(index.stream().map(Object::toString).collect(Collectors.joining(", "))); } return b.toString(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java index a77473853b..282c02ab6a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java @@ -79,7 +79,7 @@ class Library Library() { populateBooks(); - step = byIndex.size() / Book.values().length; + step = byIndex.size() / values().length; reset(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java index 662aac5981..24b89a6b0f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java @@ -144,7 +144,7 @@ public class Raid } else { - builder.append(" "); + builder.append(' '); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java index 9ca4c40d6b..e897bd8698 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java @@ -83,7 +83,7 @@ class RunEnergyOverlay extends Overlay if (config.replaceOrbText()) { - sb.append("Run Energy: ").append(client.getEnergy()).append("%"); + sb.append("Run Energy: ").append(client.getEnergy()).append('%'); } else { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index 65aef7813b..bf78790b1f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -106,7 +106,7 @@ public class RunepouchOverlay extends WidgetItemOverlay tooltipBuilder .append(amount) - .append(" ") + .append(' ') .append(ColorUtil.wrapWithColorTag(rune.getName(), Color.YELLOW)) .append("
"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index 9e15b87626..f47c9b9483 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -855,7 +855,7 @@ public class SlayerPlugin extends Plugin sb.append(task.getTask()); if (!Strings.isNullOrEmpty(task.getLocation())) { - sb.append(" (").append(task.getLocation()).append(")"); + sb.append(" (").append(task.getLocation()).append(')'); } sb.append(": "); if (killed < 0) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TabContentPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TabContentPanel.java index b24f108182..101e589cd5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TabContentPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TabContentPanel.java @@ -82,7 +82,7 @@ public abstract class TabContentPanel extends JPanel LocalDateTime currentTime = LocalDateTime.now(); if (endTime.getDayOfWeek() != currentTime.getDayOfWeek()) { - sb.append(endTime.getDayOfWeek().getDisplayName(TextStyle.SHORT, Locale.getDefault())).append(" "); + sb.append(endTime.getDayOfWeek().getDisplayName(TextStyle.SHORT, Locale.getDefault())).append(' '); } sb.append("at "); sb.append(formatter.format(endTime)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java index 7eee98df8c..ca6df40a4d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java @@ -187,8 +187,8 @@ public class TimeTrackingPlugin extends Plugin { if (commandExecuted.getCommand().equals("resetfarmtick")) { - configManager.unsetRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.FARM_TICK_OFFSET_PRECISION); - configManager.unsetRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.FARM_TICK_OFFSET); + configManager.unsetRSProfileConfiguration(CONFIG_GROUP, TimeTrackingConfig.FARM_TICK_OFFSET_PRECISION); + configManager.unsetRSProfileConfiguration(CONFIG_GROUP, TimeTrackingConfig.FARM_TICK_OFFSET); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java index d3f2222b04..fe314c46fa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java @@ -550,7 +550,7 @@ public class FarmingTracker // Same RS account but different profile type if (profileType != RuneScapeProfileType.getCurrent(client)) { - stringBuilder.append("(") + stringBuilder.append('(') .append(Text.titleCase(profile.getType())) .append(") "); } @@ -564,13 +564,13 @@ public class FarmingTracker //Don't print profile type when logged out if is STANDARD if (client.getGameState() == GameState.LOGIN_SCREEN && profileType == RuneScapeProfileType.STANDARD) { - stringBuilder.append("(") + stringBuilder.append('(') .append(profile.getDisplayName()) .append(") "); } else { - stringBuilder.append("(") + stringBuilder.append('(') .append(profile.getDisplayName()) .append(" - ") .append(Text.titleCase(profile.getType())) @@ -580,7 +580,7 @@ public class FarmingTracker // Different RS account but same profile type else { - stringBuilder.append("(") + stringBuilder.append('(') .append(profile.getDisplayName()) .append(") "); } @@ -616,7 +616,7 @@ public class FarmingTracker stringBuilder.append(patch.getRegion().isDefinite() ? "the " : "") .append(patch.getRegion().getName()) - .append("."); + .append('.'); notifier.notify(stringBuilder.toString()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java index 53f8d461e4..022c05f8d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java @@ -100,7 +100,7 @@ public class TwitchIRCClient extends Thread implements AutoCloseable return; } - try + try // NOPMD: UseTryWithResources { register(username, password); join(channel); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java index 324b94259a..89d9e3c803 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java @@ -105,7 +105,7 @@ public class OverlayUtil public static void renderImageLocation(Client client, Graphics2D graphics, LocalPoint localPoint, BufferedImage image, int zOffset) { - net.runelite.api.Point imageLocation = Perspective.getCanvasImageLocation(client, localPoint, image, zOffset); + Point imageLocation = Perspective.getCanvasImageLocation(client, localPoint, image, zOffset); if (imageLocation != null) { renderImageLocation(graphics, imageLocation, image); @@ -182,7 +182,7 @@ public class OverlayUtil renderImageLocation(client, graphics, localLocation, image, 0); } - public static void renderHoverableArea(Graphics2D graphics, Shape area, net.runelite.api.Point mousePosition, Color fillColor, Color borderColor, Color borderHoverColor) + public static void renderHoverableArea(Graphics2D graphics, Shape area, Point mousePosition, Color fillColor, Color borderColor, Color borderHoverColor) { if (area != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java index 83c67c09e0..02ff566f4e 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java @@ -182,12 +182,12 @@ public class LineComponent implements LayoutableRenderableEntity if (wordLen + spaceWidth > spaceLeft) { - wrapped.append("\n").append(word); + wrapped.append('\n').append(word); spaceLeft = maxWidth - wordLen; } else { - wrapped.append(" ").append(word); + wrapped.append(' ').append(word); spaceLeft -= spaceWidth + wordLen; } } diff --git a/runelite-client/src/main/java/net/runelite/client/util/WorldUtil.java b/runelite-client/src/main/java/net/runelite/client/util/WorldUtil.java index 9f508676a5..39e5ce8f99 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/WorldUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/WorldUtil.java @@ -40,11 +40,11 @@ public class WorldUtil */ public static EnumSet toWorldTypes(final EnumSet apiTypes) { - final EnumSet types = EnumSet.noneOf(net.runelite.api.WorldType.class); + final EnumSet types = EnumSet.noneOf(WorldType.class); for (net.runelite.http.api.worlds.WorldType apiType : apiTypes) { - types.add(net.runelite.api.WorldType.valueOf(apiType.name())); + types.add(WorldType.valueOf(apiType.name())); } return types;