From 05513a6bede6a2d851f032044570f32ffdb3ab2e Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Wed, 8 Apr 2020 15:16:38 +0200 Subject: [PATCH] project: Add modernizer --- build.gradle.kts | 5 +++++ .../net/runelite/client/chat/ChatMessageManager.java | 5 ++--- .../net/runelite/client/config/ConfigManager.java | 5 ++--- .../java/net/runelite/client/game/ItemManager.java | 2 +- .../client/game/chatbox/ChatboxTextInput.java | 4 ++-- .../java/net/runelite/client/menus/MenuManager.java | 7 ++++--- .../client/plugins/ExternalPluginManager.java | 7 +++---- .../client/plugins/config/PluginListPanel.java | 3 +-- .../client/ui/overlay/infobox/InfoBoxManager.java | 4 ++-- .../net/runelite/client/util/WildcardMatcher.java | 12 ++++++------ .../runelite/client/plugins/PluginManagerTest.java | 3 ++- .../runelite/client/rs/ClientConfigLoaderTest.java | 4 ++-- .../java/net/runelite/client/util/ItemUtilTest.java | 7 +++---- settings.gradle.kts | 2 +- 14 files changed, 36 insertions(+), 34 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 494c7e28e6..31cd11f655 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,6 +29,7 @@ import org.ajoberstar.grgit.Grgit buildscript { repositories { gradlePluginPortal() + mavenLocal() maven(url = "https://raw.githubusercontent.com/open-osrs/hosting/master") } dependencies { @@ -43,6 +44,7 @@ plugins { id(Plugins.versions.first) version Plugins.versions.second id(Plugins.latestVersion.first) version Plugins.latestVersion.second id(Plugins.grgit.first) version Plugins.grgit.second + id("com.simonharrer.modernizer") version "1.8.0-1" apply false application } @@ -112,6 +114,9 @@ subprojects { isIgnoreFailures = false } } + if (this.name == "runelite-client" || this.name == "runelite-api") { + apply(plugin = "com.simonharrer.modernizer") + } configure { repositories { diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java index 8b7d744379..d9920e6497 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java @@ -27,7 +27,6 @@ package net.runelite.client.chat; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.HashMultimap; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import java.awt.Color; import java.util.Arrays; @@ -59,7 +58,7 @@ import net.runelite.client.util.ColorUtil; @Singleton public class ChatMessageManager { - private static final Set TUTORIAL_ISLAND_REGIONS = ImmutableSet.of(12336, 12335, 12592, 12080, 12079, 12436); + private static final Set TUTORIAL_ISLAND_REGIONS = Set.of(12336, 12335, 12592, 12080, 12079, 12436); private final Multimap colorCache = HashMultimap.create(); private final Client client; @@ -593,7 +592,7 @@ public class ChatMessageManager // Update the message with RuneLite additions line.setRuneLiteFormatMessage(message.getRuneLiteFormattedMessage()); - + if (message.getTimestamp() != 0) { line.setTimestamp(message.getTimestamp()); diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java index 0e441b547f..bd4471c544 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java @@ -26,7 +26,6 @@ package net.runelite.client.config; import com.google.common.base.Strings; import com.google.common.collect.ComparisonChain; -import com.google.common.collect.ImmutableMap; import java.awt.Color; import java.awt.Dimension; import java.awt.Point; @@ -384,7 +383,7 @@ public class ConfigManager return; } - @SuppressWarnings("unchecked") final Map copy = (Map) ImmutableMap.copyOf(this.properties); + @SuppressWarnings("unchecked") final Map copy = (Map) Map.copyOf(this.properties); copy.forEach((groupAndKey, value) -> { if (!properties.containsKey(groupAndKey)) @@ -443,7 +442,7 @@ public class ConfigManager try { - @SuppressWarnings("unchecked") Map copy = (Map) ImmutableMap.copyOf(properties); + @SuppressWarnings("unchecked") Map copy = (Map) Map.copyOf(properties); copy.forEach((groupAndKey, value) -> { final String[] split = groupAndKey.split("\\.", 2); 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 adcb21ffb9..c97562c258 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 @@ -137,7 +137,7 @@ public class ItemManager private final LoadingCache itemDefinitions; private final LoadingCache itemOutlines; private Map itemPrices = Collections.emptyMap(); - private ImmutableMap itemStats = ImmutableMap.of(); + private Map itemStats = Map.of(); @Inject public ItemManager( diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java index f8641f374d..5b792dc465 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java @@ -88,7 +88,7 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse @Getter private int lines; - private StringBuffer value = new StringBuffer(); + private StringBuilder value = new StringBuilder(); @Getter private int cursorStart = 0; @@ -157,7 +157,7 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse public ChatboxTextInput value(String value) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (char c : value.toCharArray()) { if (charValidator.test(c)) diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index beeb2d66fe..5dc099b461 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -25,7 +25,6 @@ */ package net.runelite.client.menus; -import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -39,6 +38,7 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Nonnull; @@ -327,7 +327,7 @@ public class MenuManager public void addPlayerMenuItem(String menuText) { - Preconditions.checkNotNull(menuText); + Objects.requireNonNull(menuText); int playerMenuIndex = findEmptyPlayerMenuIndex(); if (playerMenuIndex == IDX_UPPER) @@ -340,7 +340,8 @@ public class MenuManager public void removePlayerMenuItem(String menuText) { - Preconditions.checkNotNull(menuText); + Objects.requireNonNull(menuText); + for (Map.Entry entry : playerMenuIndexMap.entrySet()) { if (entry.getValue().equalsIgnoreCase(menuText)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java index 89c177f4e6..57afa3e5b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins; -import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.CreationException; import com.google.inject.Injector; @@ -913,7 +912,7 @@ public class ExternalPluginManager private Path stopPlugin(String pluginId) { - List startedPlugins = ImmutableList.copyOf(getStartedPlugins()); + List startedPlugins = List.copyOf(getStartedPlugins()); for (PluginWrapper pluginWrapper : startedPlugins) { @@ -1138,7 +1137,7 @@ public class ExternalPluginManager externalPluginManager.loadPlugins(); externalPluginManager.startPlugin(pluginId); - List startedPlugins = ImmutableList.copyOf(getStartedPlugins()); + List startedPlugins = List.copyOf(getStartedPlugins()); List scannedPlugins = new ArrayList<>(); for (PluginWrapper pluginWrapper : startedPlugins) @@ -1181,7 +1180,7 @@ public class ExternalPluginManager externalPluginManager.loadPlugins(); externalPluginManager.startPlugin(pluginId); - List startedPlugins = ImmutableList.copyOf(getStartedPlugins()); + List startedPlugins = List.copyOf(getStartedPlugins()); List scannedPlugins = new ArrayList<>(); for (PluginWrapper pluginWrapper : startedPlugins) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java index f06f9efeb8..3c802cbab4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.config; -import com.google.common.collect.ImmutableList; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; @@ -105,7 +104,7 @@ public class PluginListPanel extends PluginPanel private static final String PINNED_PLUGINS_CONFIG_KEY = "pinnedPlugins"; private static final List colorOptions = Arrays.asList("enabledColors", "pvmColor", "pvpColor", "skillingColor", "utilityColor", "minigameColor", "miscellaneousColor", "gamemodeColor"); - private static final ImmutableList definedOrder = ImmutableList.of(PluginType.IMPORTANT, PluginType.PVM, PluginType.SKILLING, PluginType.PVP, PluginType.UTILITY, PluginType.MINIGAME, PluginType.MISCELLANEOUS, PluginType.GAMEMODE, PluginType.EXTERNAL, PluginType.UNCATEGORIZED); + private static final List definedOrder = List.of(PluginType.IMPORTANT, PluginType.PVM, PluginType.SKILLING, PluginType.PVP, PluginType.UTILITY, PluginType.MINIGAME, PluginType.MISCELLANEOUS, PluginType.GAMEMODE, PluginType.EXTERNAL, PluginType.UNCATEGORIZED); private static final Comparator categoryComparator = Comparator.comparing(plugin -> definedOrder.indexOf(plugin.getPluginType())); private final ConfigManager configManager; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java index 7b73093358..47141ed69e 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java @@ -24,7 +24,6 @@ */ package net.runelite.client.ui.overlay.infobox; -import com.google.common.base.Preconditions; import com.google.common.collect.ComparisonChain; import java.awt.Graphics; import java.awt.image.BufferedImage; @@ -32,6 +31,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Objects; import java.util.function.Predicate; import javax.inject.Inject; import javax.inject.Singleton; @@ -67,7 +67,7 @@ public class InfoBoxManager public void addInfoBox(InfoBox infoBox) { - Preconditions.checkNotNull(infoBox); + Objects.requireNonNull(infoBox); log.debug("Adding InfoBox {}", infoBox); updateInfoBoxImage(infoBox); diff --git a/runelite-client/src/main/java/net/runelite/client/util/WildcardMatcher.java b/runelite-client/src/main/java/net/runelite/client/util/WildcardMatcher.java index 354005a048..090e76a46d 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/WildcardMatcher.java +++ b/runelite-client/src/main/java/net/runelite/client/util/WildcardMatcher.java @@ -34,23 +34,23 @@ public class WildcardMatcher public static boolean matches(String pattern, String text) { final Matcher matcher = WILDCARD_PATTERN.matcher(pattern); - final StringBuffer buffer = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); - buffer.append("(?i)"); + sb.append("(?i)"); while (matcher.find()) { if (matcher.group(1) != null) { - matcher.appendReplacement(buffer, ".*"); + matcher.appendReplacement(sb, ".*"); } else { - matcher.appendReplacement(buffer, "\\\\Q" + matcher.group(0) + "\\\\E"); + matcher.appendReplacement(sb, "\\\\Q" + matcher.group(0) + "\\\\E"); } } - matcher.appendTail(buffer); - final String replaced = buffer.toString(); + matcher.appendTail(sb); + final String replaced = sb.toString(); return text.matches(replaced); } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java index bd33ce2953..d2a7ae6636 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java @@ -40,6 +40,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -150,7 +151,7 @@ public class PluginManagerTest modules.addAll(pluginManager.getPlugins()); File file = folder.newFile(); - try (PrintWriter out = new PrintWriter(file, "UTF-8")) + try (PrintWriter out = new PrintWriter(file, StandardCharsets.UTF_8)) { Injector injector = Guice.createInjector(modules); GraphvizGrapher grapher = injector.getInstance(GraphvizGrapher.class); 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 bfacb59016..677d72ced2 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 @@ -24,11 +24,11 @@ */ package net.runelite.client.rs; -import com.google.common.base.Charsets; import com.google.common.io.CharStreams; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.After; @@ -47,7 +47,7 @@ public class ClientConfigLoaderTest try (InputStream in = getClass().getResourceAsStream("jav_config.ws")) { response = CharStreams.toString(new InputStreamReader( - in, Charsets.UTF_8)); + in, StandardCharsets.UTF_8)); } server.enqueue(new MockResponse().setBody(response)); diff --git a/runelite-client/src/test/java/net/runelite/client/util/ItemUtilTest.java b/runelite-client/src/test/java/net/runelite/client/util/ItemUtilTest.java index f69238896d..38f316e4af 100644 --- a/runelite-client/src/test/java/net/runelite/client/util/ItemUtilTest.java +++ b/runelite-client/src/test/java/net/runelite/client/util/ItemUtilTest.java @@ -24,7 +24,6 @@ */ package net.runelite.client.util; -import com.google.common.collect.ImmutableSet; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -43,9 +42,9 @@ import static org.mockito.Mockito.when; public class ItemUtilTest { - private static final Set SOME_IDS = ImmutableSet.of(ItemID.MITHRIL_BAR, ItemID.DRAGON_BONES); - private static final Set WRONG_IDS = ImmutableSet.of(ItemID.SCYTHE_OF_VITUR, ItemID.TWISTED_BOW); - private static final Set MIX_IDS = ImmutableSet.of( + private static final Set SOME_IDS = Set.of(ItemID.MITHRIL_BAR, ItemID.DRAGON_BONES); + private static final Set WRONG_IDS = Set.of(ItemID.SCYTHE_OF_VITUR, ItemID.TWISTED_BOW); + private static final Set MIX_IDS = Set.of( ItemID.MITHRIL_BAR, ItemID.DRAGON_BONES, ItemID.SCYTHE_OF_VITUR, ItemID.TWISTED_BOW ); diff --git a/settings.gradle.kts b/settings.gradle.kts index 518074823a..9c120be343 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -39,7 +39,7 @@ include(":runelite-script-assembler-plugin") include(":runelite-client") include(":runelite-mixins") include(":injected-client") -include("injection-annotations") +include(":injection-annotations") include(":runelite-plugin-archetype") include(":wiki-scraper")