From 13146e5dbd36c6e097211ba2311eec9dab19839c Mon Sep 17 00:00:00 2001 From: Zeruth Date: Wed, 24 Jul 2019 00:41:08 -0400 Subject: [PATCH] runeliteplus: various checkstyle fixes --- build.gradle | 2 +- .../net/runelite/http/api/RuneLiteAPI.java | 1 - .../runelite/http/api/xtea/XteaClient.java | 4 +- .../api/events/GrandExchangeOfferChanged.java | 7 +- .../java/net/runelite/api/kit/KitType.java | 10 +- .../java/net/runelite/api/vars/InputType.java | 3 +- .../java/net/runelite/api/widgets/Widget.java | 5 +- .../java/net/runelite/client/Notifier.java | 1 - .../java/net/runelite/client/RuneLite.java | 1 - .../runelite/client/RuneLiteProperties.java | 3 - .../runelite/client/game/SpriteOverride.java | 4 - .../client/plugins/itemstats/stats/Stat.java | 4 - .../plugins/pvptools/PvpToolsPanel.java | 2 - .../client/plugins/skybox/Skybox.java | 3 - .../plugins/spellbook/SpellbookPlugin.java | 153 +++++++++--------- .../client/util/bootstrap/Bootstrapper.java | 6 +- .../net/runelite/script/AssembleMojo.java | 1 - suppressions.xml | 3 +- 18 files changed, 95 insertions(+), 118 deletions(-) diff --git a/build.gradle b/build.gradle index 4ee3e575a7..75acf95849 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,6 @@ subprojects { sourceSets = [sourceSets.main] configFile = rootProject.file("./checkstyle/checkstyle.xml"); showViolations = true - ignoreFailures = true + ignoreFailures = false } } diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index 9ef9c1fb39..d31c235abf 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -26,7 +26,6 @@ package net.runelite.http.api; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import jdk.nashorn.internal.runtime.linker.Bootstrap; import okhttp3.HttpUrl; import okhttp3.Interceptor; import okhttp3.OkHttpClient; diff --git a/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java b/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java index 151fbfd81f..d2bf09218c 100644 --- a/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java +++ b/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java @@ -102,7 +102,9 @@ public class XteaClient { InputStream in = response.body().byteStream(); // CHECKSTYLE:OFF - return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken>() {}.getType()); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken>() + { + }.getType()); // CHECKSTYLE:ON } catch (JsonParseException ex) diff --git a/runelite-api/src/main/java/net/runelite/api/events/GrandExchangeOfferChanged.java b/runelite-api/src/main/java/net/runelite/api/events/GrandExchangeOfferChanged.java index 7260063760..88e4aa1fac 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/GrandExchangeOfferChanged.java +++ b/runelite-api/src/main/java/net/runelite/api/events/GrandExchangeOfferChanged.java @@ -25,20 +25,19 @@ package net.runelite.api.events; import net.runelite.api.GrandExchangeOffer; -import net.runelite.api.GrandExchangeOfferState; import lombok.Data; /** - * An event where a {@link GrandExchangeOffer} has been updated with + * An event where a {GrandExchangeOffer} has been updated with * new information. *

* When the client initially logs in, this event is called for all grand - * exchange slots with the {@link GrandExchangeOfferState#EMPTY} state, + * exchange slots with the {GrandExchangeOfferState#EMPTY} state, * regardless of whether any slots have offers. Once the exchange is * initialized, the client then updates any offers with items as it * receives information from the server. *

- * See {@link GrandExchangeOfferState} for potential states an offer + * See {GrandExchangeOfferState} for potential states an offer * can change into. */ @Data diff --git a/runelite-api/src/main/java/net/runelite/api/kit/KitType.java b/runelite-api/src/main/java/net/runelite/api/kit/KitType.java index 57d09251b0..2ecfa411e0 100644 --- a/runelite-api/src/main/java/net/runelite/api/kit/KitType.java +++ b/runelite-api/src/main/java/net/runelite/api/kit/KitType.java @@ -24,15 +24,13 @@ */ package net.runelite.api.kit; -import net.runelite.api.PlayerAppearance; - /** * Represents an equipment slot in a players composition. *

- * These values are intended for use with {@link PlayerAppearance} equipment + * These values are intended for use with {PlayerAppearance} equipment * slots. For obtaining information about equipment in the local players - * equipment {@link net.runelite.api.ItemContainer}, use - * {@link net.runelite.api.EquipmentInventorySlot}. + * equipment {net.runelite.api.ItemContainer}, use + * {net.runelite.api.EquipmentInventorySlot}. */ public enum KitType { @@ -61,7 +59,7 @@ public enum KitType } /** - * Gets the raw equipment index for use in {@link PlayerAppearance#getEquipmentIds()}. + * Gets the raw equipment index for use in {PlayerAppearance#getEquipmentIds()}. * * @return raw equipment index */ diff --git a/runelite-api/src/main/java/net/runelite/api/vars/InputType.java b/runelite-api/src/main/java/net/runelite/api/vars/InputType.java index 020063a12c..1721fcb8db 100644 --- a/runelite-api/src/main/java/net/runelite/api/vars/InputType.java +++ b/runelite-api/src/main/java/net/runelite/api/vars/InputType.java @@ -24,12 +24,11 @@ */ package net.runelite.api.vars; -import net.runelite.api.VarClientInt; import lombok.Getter; import lombok.RequiredArgsConstructor; /** - * An enumeration of input types for {@link VarClientInt#INPUT_TYPE}. + * An enumeration of input types for {VarClientInt#INPUT_TYPE}. */ @Getter @RequiredArgsConstructor diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java b/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java index 8a4633d38c..07f7c4c52d 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java @@ -29,7 +29,6 @@ import java.util.Collection; import net.runelite.api.FontTypeFace; import net.runelite.api.Point; -import net.runelite.api.SpriteID; /** * Represents an on-screen UI element that is drawn on the canvas. @@ -254,7 +253,7 @@ public interface Widget * Gets the sprite ID displayed in the widget. * * @return the sprite ID - * @see SpriteID + * SpriteID */ int getSpriteId(); @@ -262,7 +261,7 @@ public interface Widget * Sets the sprite ID displayed in the widget. * * @param spriteId the sprite ID - * @see SpriteID + * SpriteID */ void setSpriteId(int spriteId); diff --git a/runelite-client/src/main/java/net/runelite/client/Notifier.java b/runelite-client/src/main/java/net/runelite/client/Notifier.java index 02d085dc1b..d0c09a485d 100644 --- a/runelite-client/src/main/java/net/runelite/client/Notifier.java +++ b/runelite-client/src/main/java/net/runelite/client/Notifier.java @@ -24,7 +24,6 @@ */ package net.runelite.client; -import com.google.common.base.Strings; import com.google.common.escape.Escaper; import com.google.common.escape.Escapers; import com.google.inject.Inject; 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 e0ec48a68f..f4fc1e2ddf 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -76,7 +76,6 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxOverlay; import net.runelite.client.ui.overlay.tooltip.TooltipOverlay; import net.runelite.client.ui.overlay.worldmap.WorldMapOverlay; import net.runelite.client.ws.PartyService; -import net.runelite.http.api.RuneLiteAPI; import org.slf4j.LoggerFactory; @Singleton diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java index 4f69e2844d..69450219af 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java @@ -24,10 +24,7 @@ */ package net.runelite.client; -import java.io.IOException; -import java.io.InputStream; import java.util.Properties; -import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteOverride.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteOverride.java index a4f894d5c0..56da04b0cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SpriteOverride.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteOverride.java @@ -24,14 +24,10 @@ */ package net.runelite.client.game; -import net.runelite.api.SpriteID; - public interface SpriteOverride { /** * An ID for a sprite. Negative numbers are used by RuneLite specific sprites - * - * @see SpriteID */ int getSpriteId(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/stats/Stat.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/stats/Stat.java index 6a481163e0..1f2a3bad8e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/stats/Stat.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/stats/Stat.java @@ -25,13 +25,9 @@ package net.runelite.client.plugins.itemstats.stats; import net.runelite.api.Client; -import net.runelite.api.Skill; /** * Abstract stat of a player. - * This includes {@link Skill}s and other player variables, such as RUN_ENERGY. - * - * @see Stats */ public abstract class Stat { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java index d201a8224f..bcf779909b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java @@ -9,7 +9,6 @@ package net.runelite.client.plugins.pvptools; -import com.google.common.base.MoreObjects; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Font; @@ -21,7 +20,6 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; import lombok.extern.slf4j.Slf4j; -import net.runelite.client.RuneLiteProperties; import net.runelite.client.plugins.info.JRichTextPane; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java index aa770f37f8..f4be604917 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java @@ -34,7 +34,6 @@ import java.io.Reader; import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.runelite.api.Client; class Skybox { @@ -43,8 +42,6 @@ class Skybox { /** * Gets the instance template chunk data for the specified point - * - * @see Client#getInstanceTemplateChunks */ int getTemplateChunk(int cx, int cy, int plane); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java index 3694512f1e..9fca35f0c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java @@ -57,11 +57,11 @@ import net.runelite.client.eventbus.EventBus; import net.runelite.client.input.MouseManager; import net.runelite.client.menus.MenuManager; import net.runelite.client.menus.WidgetMenuOption; -import static net.runelite.client.util.MiscUtils.clamp; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; +import static net.runelite.client.util.MiscUtils.clamp; import net.runelite.client.util.Text; @PluginDescriptor( @@ -87,15 +87,7 @@ public class SpellbookPlugin extends Plugin private static final WidgetMenuOption RESIZABLE_MAGIC_TAB_UNLOCK = new WidgetMenuOption(UNLOCK, MENU_TARGET, WidgetInfo.RESIZABLE_VIEWPORT_MAGIC_TAB); private static final WidgetMenuOption RESIZABLE_BOTTOM_LINE_MAGIC_TAB_LOCK = new WidgetMenuOption(LOCK, MENU_TARGET, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_MAGIC_TAB); private static final WidgetMenuOption RESIZABLE_BOTTOM_LINE_MAGIC_TAB_UNLOCK = new WidgetMenuOption(UNLOCK, MENU_TARGET, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_MAGIC_TAB); - - private enum WordFilterMode - { - CONTAINS, - EQUALS, - STARTSWITH, - ENDSWITH - } - + private final Map spells = new HashMap<>(); @Inject private Client client; @@ -131,19 +123,79 @@ public class SpellbookPlugin extends Plugin @Getter private Point draggingLocation; - - private final Map spells = new HashMap<>(); private Map tmp = null; private ImmutableSet notFilteredSpells; private Spellbook spellbook; private SpellbookMouseListener mouseListener; - private boolean enableMobile; private boolean dragSpells; private boolean scroll; private int size; private String filter; + private static boolean isUnfiltered(String spell, Set unfiltereds) + { + for (String str : unfiltereds) + { + WordFilterMode mode = getFilterMode(str); + str = removeFlyingComma(str).toLowerCase(); + spell = spell.toLowerCase(); + + switch (mode) + { + case CONTAINS: + if (spell.contains(str)) + { + return true; + } + break; + case STARTSWITH: + if (spell.startsWith(str)) + { + return true; + } + break; + case ENDSWITH: + if (spell.endsWith(str)) + { + return true; + } + break; + case EQUALS: + if (spell.equals(str)) + { + return true; + } + break; + } + } + + return false; + } + + private static WordFilterMode getFilterMode(String s) + { + if (!s.contains("\"")) + { + return WordFilterMode.CONTAINS; + } + if (s.startsWith("\"")) + { + return s.endsWith("\"") ? WordFilterMode.EQUALS : WordFilterMode.STARTSWITH; + } + else if (s.endsWith("\"")) + { + return WordFilterMode.ENDSWITH; + } + + return WordFilterMode.CONTAINS; // but probably null soz + } + + private static String removeFlyingComma(String s) + { + return s.replaceAll("\"", ""); + } + @Provides SpellbookConfig getConfig(ConfigManager configManager) { @@ -223,46 +275,6 @@ public class SpellbookPlugin extends Plugin } } - private static boolean isUnfiltered(String spell, Set unfiltereds) - { - for (String str : unfiltereds) - { - WordFilterMode mode = getFilterMode(str); - str = removeFlyingComma(str).toLowerCase(); - spell = spell.toLowerCase(); - - switch (mode) - { - case CONTAINS: - if (spell.contains(str)) - { - return true; - } - break; - case STARTSWITH: - if (spell.startsWith(str)) - { - return true; - } - break; - case ENDSWITH: - if (spell.endsWith(str)) - { - return true; - } - break; - case EQUALS: - if (spell.equals(str)) - { - return true; - } - break; - } - } - - return false; - } - private void onWidgetMenuOptionClicked(WidgetMenuOptionClicked event) { if (event.getWidget() != WidgetInfo.FIXED_VIEWPORT_MAGIC_TAB @@ -466,7 +478,9 @@ public class SpellbookPlugin extends Plugin } // CHECKSTYLE:OFF - Collection gson = GSON.fromJson(cfg, new TypeToken>() {}.getType()); + Collection gson = GSON.fromJson(cfg, new TypeToken>() + { + }.getType()); // CHECKSTYLE:ON gson.stream().filter(Objects::nonNull).forEach(s -> spells.put(s.getWidget(), s)); @@ -509,24 +523,6 @@ public class SpellbookPlugin extends Plugin ); } - private static WordFilterMode getFilterMode(String s) - { - if (!s.contains("\"")) - { - return WordFilterMode.CONTAINS; - } - if (s.startsWith("\"")) - { - return s.endsWith("\"") ? WordFilterMode.EQUALS : WordFilterMode.STARTSWITH; - } - else if (s.endsWith("\"")) - { - return WordFilterMode.ENDSWITH; - } - - return WordFilterMode.CONTAINS; // but probably null soz - } - boolean isNotOnSpellWidget(java.awt.Point point) { Widget boundsWidget = client.getWidget(WidgetInfo.SPELLBOOK_FILTERED_BOUNDS); @@ -712,11 +708,6 @@ public class SpellbookPlugin extends Plugin runRebuild(); } - private static String removeFlyingComma(String s) - { - return s.replaceAll("\"", ""); - } - private int trueSize(Spell s) { return s.getSize() * 2 + this.size; @@ -730,4 +721,12 @@ public class SpellbookPlugin extends Plugin this.size = config.size(); this.filter = config.filter(); } + + private enum WordFilterMode + { + CONTAINS, + EQUALS, + STARTSWITH, + ENDSWITH + } } diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java index 1c436f5ab4..0911f44260 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java @@ -2,7 +2,6 @@ package net.runelite.client.util.bootstrap; import com.google.gson.Gson; import com.google.gson.GsonBuilder; - import java.io.File; import java.io.FileWriter; @@ -15,7 +14,7 @@ public class Bootstrapper public static void main(String[] args) { - if (args.length>0) + if (args.length > 0) { remoteLocation = "/staging/"; localLocation = "./staging/"; @@ -30,7 +29,8 @@ public class Bootstrapper { e.printStackTrace(); } - } else + } + else { remoteLocation = "/live/"; localLocation = "./live/"; diff --git a/runelite-script-assembler-plugin/src/main/java/net/runelite/script/AssembleMojo.java b/runelite-script-assembler-plugin/src/main/java/net/runelite/script/AssembleMojo.java index d846d83ad3..8b699c3b14 100644 --- a/runelite-script-assembler-plugin/src/main/java/net/runelite/script/AssembleMojo.java +++ b/runelite-script-assembler-plugin/src/main/java/net/runelite/script/AssembleMojo.java @@ -39,7 +39,6 @@ import org.apache.maven.plugin.logging.Log; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import org.slf4j.Logger; @Mojo( name = "assemble", diff --git a/suppressions.xml b/suppressions.xml index 5bbe0d4234..670a3bd52f 100644 --- a/suppressions.xml +++ b/suppressions.xml @@ -29,5 +29,6 @@ - + +