diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapTypeBase.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapTypeBase.java index d24d6d63f3..3e5229f8f9 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/WorldMapTypeBase.java +++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapTypeBase.java @@ -24,7 +24,4 @@ */ package net.runelite.cache.definitions; -public interface WorldMapTypeBase -{ - -} +public interface WorldMapTypeBase {} diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java index 6cb6c9bd41..806fa3eff8 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java @@ -25,13 +25,12 @@ package net.runelite.cache.definitions.loaders; +import java.util.HashMap; import net.runelite.cache.definitions.ItemDefinition; import net.runelite.cache.io.InputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashMap; - public class ItemLoader { private static final Logger logger = LoggerFactory.getLogger(ItemLoader.class); @@ -40,7 +39,7 @@ public class ItemLoader { ItemDefinition def = new ItemDefinition(id); InputStream is = new InputStream(b); - + while (true) { int opcode = is.readUnsignedByte(); diff --git a/cache/src/test/java/net/runelite/cache/ModelDumperTest.java b/cache/src/test/java/net/runelite/cache/ModelDumperTest.java index 32f5879ac1..bfd4bd9dba 100644 --- a/cache/src/test/java/net/runelite/cache/ModelDumperTest.java +++ b/cache/src/test/java/net/runelite/cache/ModelDumperTest.java @@ -25,7 +25,6 @@ package net.runelite.cache; - import com.google.common.io.Files; import java.io.File; import java.io.IOException; diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 6f6c6e65da..35ebf4519b 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -32,6 +32,8 @@ + + @@ -42,12 +44,12 @@ - - - - + + + + + - @@ -57,6 +59,11 @@ + + + + + diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotations.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotations.java index 7c1a6ba535..6e184a89ec 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotations.java +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotations.java @@ -28,7 +28,6 @@ package net.runelite.asm.attributes; import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import net.runelite.asm.Type; import net.runelite.asm.attributes.annotation.Annotation; import net.runelite.asm.attributes.annotation.Element; diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayStoreInstruction.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayStoreInstruction.java index de019ce9e0..cf00821d10 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayStoreInstruction.java +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayStoreInstruction.java @@ -25,7 +25,4 @@ package net.runelite.asm.attributes.code.instruction.types; -public interface ArrayStoreInstruction extends MappableInstruction -{ - -} +public interface ArrayStoreInstruction extends MappableInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ComparisonInstruction.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ComparisonInstruction.java index 25e0cdf1da..2076baeadc 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ComparisonInstruction.java +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ComparisonInstruction.java @@ -25,7 +25,4 @@ package net.runelite.asm.attributes.code.instruction.types; -public interface ComparisonInstruction -{ - -} +public interface ComparisonInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ConversionInstruction.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ConversionInstruction.java index 099b281725..22b4977b71 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ConversionInstruction.java +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ConversionInstruction.java @@ -25,7 +25,4 @@ package net.runelite.asm.attributes.code.instruction.types; -public interface ConversionInstruction -{ - -} +public interface ConversionInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/GetFieldInstruction.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/GetFieldInstruction.java index f5a5af480a..a9b7ab3cf3 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/GetFieldInstruction.java +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/GetFieldInstruction.java @@ -25,6 +25,4 @@ package net.runelite.asm.attributes.code.instruction.types; -public interface GetFieldInstruction extends FieldInstruction -{ -} +public interface GetFieldInstruction extends FieldInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ReturnInstruction.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ReturnInstruction.java index c23a0bdfb5..ce9a7e7d37 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ReturnInstruction.java +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/ReturnInstruction.java @@ -25,7 +25,4 @@ package net.runelite.asm.attributes.code.instruction.types; -public interface ReturnInstruction -{ - -} +public interface ReturnInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/SetFieldInstruction.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/SetFieldInstruction.java index 7147d93047..0e645b01ee 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/SetFieldInstruction.java +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/SetFieldInstruction.java @@ -25,6 +25,4 @@ package net.runelite.asm.attributes.code.instruction.types; -public interface SetFieldInstruction extends FieldInstruction, MappableInstruction -{ -} +public interface SetFieldInstruction extends FieldInstruction, MappableInstruction {} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java index 7d01d0d38c..bf85f47c95 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java @@ -40,7 +40,6 @@ import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.Stack; import net.runelite.asm.execution.StackContext; import static net.runelite.asm.execution.StaticStep.stepInto; - import net.runelite.asm.execution.Value; import net.runelite.asm.pool.Method; import net.runelite.asm.signature.Signature; diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/Stack.java b/deobfuscator/src/main/java/net/runelite/asm/execution/Stack.java index 2d0fa58ba9..fb01c7463a 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/Stack.java +++ b/deobfuscator/src/main/java/net/runelite/asm/execution/Stack.java @@ -25,11 +25,10 @@ package net.runelite.asm.execution; -import net.runelite.asm.Type; - import java.util.Arrays; import java.util.List; import net.runelite.asm.Method; +import net.runelite.asm.Type; public class Stack { @@ -40,13 +39,13 @@ public class Stack { stack = new StackContext[sz * 2]; // XXX FIXME } - + public Stack(Stack other) { this.size = other.size; this.stack = other.stack.clone(); } - + private void printStack(StackContext ctx, int level) { for (int i = 0; i < level; ++i) @@ -66,7 +65,7 @@ public class Stack printStack(stack[c], 0); throw new RuntimeException("Stack overflow"); } - + assert !i.getType().equals(Type.VOID); stack[size] = i; @@ -80,12 +79,12 @@ public class Stack return stack[--size]; } - + public int getSize() { return size; } - + public List getStack() { return Arrays.asList(stack); diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/VariableContext.java b/deobfuscator/src/main/java/net/runelite/asm/execution/VariableContext.java index d1456737e5..56eabd3979 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/VariableContext.java +++ b/deobfuscator/src/main/java/net/runelite/asm/execution/VariableContext.java @@ -25,10 +25,9 @@ package net.runelite.asm.execution; -import net.runelite.asm.Type; - import java.util.ArrayList; import java.util.List; +import net.runelite.asm.Type; public class VariableContext { @@ -46,13 +45,13 @@ public class VariableContext type = ctx.getType(); value = ctx.getValue(); } - + public VariableContext(Type type) // for entrypoints { this.type = type; value = Value.UNKNOWN; } - + public VariableContext(InstructionContext i, VariableContext other) { ic = i; @@ -60,24 +59,24 @@ public class VariableContext type = other.type; value = other.value; } - + public VariableContext(InstructionContext i, Type type, Value value) { ic = i; this.type = type; this.value = value; } - + public StackContext getStackContext() { return ctx; } - + public InstructionContext getInstructionWhichStored() { return ic; } - + public Type getType() { return type; @@ -87,7 +86,7 @@ public class VariableContext { return value; } - + public void addRead(InstructionContext ctx) { if (!read.contains(ctx)) @@ -103,7 +102,7 @@ public class VariableContext { return isParameter; } - + public VariableContext markParameter() { isParameter = true; diff --git a/deobfuscator/src/main/java/net/runelite/asm/pool/Field.java b/deobfuscator/src/main/java/net/runelite/asm/pool/Field.java index ca24bb33af..5eb4a5c663 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/pool/Field.java +++ b/deobfuscator/src/main/java/net/runelite/asm/pool/Field.java @@ -25,9 +25,8 @@ package net.runelite.asm.pool; -import net.runelite.asm.Type; - import java.util.Objects; +import net.runelite.asm.Type; public class Field { diff --git a/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java b/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java index f3cd779eda..58b56deb2f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java +++ b/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java @@ -24,8 +24,6 @@ */ package net.runelite.asm.signature; -import net.runelite.asm.Type; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -33,6 +31,7 @@ import java.util.List; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.runelite.asm.Type; public class Signature { diff --git a/deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java b/deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java index 6294574e74..d5e83313da 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java +++ b/deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java @@ -24,6 +24,7 @@ */ package net.runelite.deob; +import java.util.List; import net.runelite.asm.ClassFile; import net.runelite.asm.Field; import net.runelite.asm.Method; @@ -33,8 +34,6 @@ import net.runelite.asm.attributes.annotation.Annotation; import net.runelite.asm.attributes.annotation.Element; import net.runelite.asm.signature.Signature; -import java.util.List; - public class DeobAnnotations { public static final Type OBFUSCATED_NAME = new Type("Lnet/runelite/mapping/ObfuscatedName;"); diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java index 1f1789afb5..06c6e905ea 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java @@ -25,6 +25,7 @@ package net.runelite.deob.deobfuscators; +import java.util.List; import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; import net.runelite.asm.Field; @@ -35,31 +36,29 @@ import net.runelite.deob.DeobAnnotations; import net.runelite.deob.Deobfuscator; import net.runelite.deob.util.NameMappings; -import java.util.List; - public class RenameUnique implements Deobfuscator { private Renamer renamer; - + private void generateClassNames(NameMappings map, ClassGroup group) { int i = 0; - + for (ClassFile cf : group.getClasses()) { if (cf.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN) { continue; } - + map.map(cf.getPoolClass(), "class" + i++); } } - + private void generateFieldNames(NameMappings map, ClassGroup group) { int i = 0; - + for (ClassFile cf : group.getClasses()) for (Field field : cf.getFields()) { @@ -67,7 +66,7 @@ public class RenameUnique implements Deobfuscator { continue; } - + map.map(field.getPoolField(), "field" + i++); } } @@ -75,7 +74,7 @@ public class RenameUnique implements Deobfuscator private void generateMethodNames(NameMappings map, ClassGroup group) { int i = 0; - + for (ClassFile cf : group.getClasses()) for (Method method : cf.getMethods()) { @@ -83,16 +82,16 @@ public class RenameUnique implements Deobfuscator { continue; } - + List virtualMethods = VirtualMethods.getVirtualMethods(method); assert !virtualMethods.isEmpty(); - + String name; if (virtualMethods.size() == 1) name = "method" + i++; else name = "vmethod" + i++; - + for (Method m : virtualMethods) map.map(m.getPoolMethod(), name); } @@ -103,13 +102,13 @@ public class RenameUnique implements Deobfuscator { group.buildClassGraph(); group.lookup(); - + NameMappings mappings = new NameMappings(); - + this.generateClassNames(mappings, group); this.generateFieldNames(mappings, group); this.generateMethodNames(mappings, group); - + renamer = new Renamer(mappings); renamer.run(group); } diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketRead.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketRead.java index 18da7bc11d..8faf63dc0a 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketRead.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketRead.java @@ -25,7 +25,6 @@ package net.runelite.deob.deobfuscators.packethandler; import java.util.Objects; - import net.runelite.asm.Type; import net.runelite.asm.attributes.code.Instruction; import net.runelite.asm.execution.InstructionContext; diff --git a/deobfuscator/src/main/java/net/runelite/gamepack/Downloader.java b/deobfuscator/src/main/java/net/runelite/gamepack/Downloader.java index 350454ac8b..221ba4b4c6 100644 --- a/deobfuscator/src/main/java/net/runelite/gamepack/Downloader.java +++ b/deobfuscator/src/main/java/net/runelite/gamepack/Downloader.java @@ -1,6 +1,5 @@ package net.runelite.gamepack; - import java.io.File; import java.io.IOException; import java.net.URL; diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyClass.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyClass.java index 371b55daf9..1d3ba8614b 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyClass.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyClass.java @@ -24,7 +24,4 @@ */ package net.runelite.deob.deobfuscators.unusedclass; -public class EmptyClass -{ - -} +public class EmptyClass {} diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyInterface.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyInterface.java index ffcb0a3188..4f7214f5b0 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyInterface.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyInterface.java @@ -24,7 +24,4 @@ */ package net.runelite.deob.deobfuscators.unusedclass; -public interface EmptyInterface -{ - -} +public interface EmptyInterface {} diff --git a/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java b/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java index dbb17bfe55..ac178bfa7b 100644 --- a/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java @@ -70,9 +70,7 @@ public class HookImporter Assert.assertNotNull(is); Gson gson = new Gson(); - java.lang.reflect.Type type = new TypeToken>() - { - }.getType(); + java.lang.reflect.Type type = new TypeToken>() {}.getType(); hooks = gson.fromJson(new InputStreamReader(is), type); group = JarUtil.loadJar(IN); diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java index 5c78be64f1..d72e2ea46c 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java @@ -81,9 +81,7 @@ public class HookImporter InputStream is = getClass().getResourceAsStream("hooks.json"); Gson gson = new Gson(); - java.lang.reflect.Type type = new TypeToken>() - { - }.getType(); + java.lang.reflect.Type type = new TypeToken>() {}.getType(); hooks = gson.fromJson(new InputStreamReader(is), type); } diff --git a/http-api/src/main/java/net/runelite/http/api/animation/AnimationClient.java b/http-api/src/main/java/net/runelite/http/api/animation/AnimationClient.java index 3ccea47be1..3dcf87781d 100644 --- a/http-api/src/main/java/net/runelite/http/api/animation/AnimationClient.java +++ b/http-api/src/main/java/net/runelite/http/api/animation/AnimationClient.java @@ -115,9 +115,7 @@ public class AnimationClient { 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/http-api/src/main/java/net/runelite/http/api/loottracker/LootTrackerClient.java b/http-api/src/main/java/net/runelite/http/api/loottracker/LootTrackerClient.java index 51b9329018..716798c3b1 100644 --- a/http-api/src/main/java/net/runelite/http/api/loottracker/LootTrackerClient.java +++ b/http-api/src/main/java/net/runelite/http/api/loottracker/LootTrackerClient.java @@ -102,9 +102,7 @@ public class LootTrackerClient } InputStream in = response.body().byteStream(); - return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken>() - { - }.getType()); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken>() {}.getType()); } catch (JsonParseException ex) { diff --git a/http-api/src/main/java/net/runelite/http/api/ws/RuntimeTypeAdapterFactory.java b/http-api/src/main/java/net/runelite/http/api/ws/RuntimeTypeAdapterFactory.java index 2819c92ceb..e99fe5cd0b 100644 --- a/http-api/src/main/java/net/runelite/http/api/ws/RuntimeTypeAdapterFactory.java +++ b/http-api/src/main/java/net/runelite/http/api/ws/RuntimeTypeAdapterFactory.java @@ -16,10 +16,6 @@ package net.runelite.http.api.ws; -import java.io.IOException; -import java.util.LinkedHashMap; -import java.util.Map; - import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -31,6 +27,9 @@ import com.google.gson.internal.Streams; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.util.LinkedHashMap; +import java.util.Map; /** * Adapts values whose runtime type may differ from their declaration type. This diff --git a/http-api/src/main/java/net/runelite/http/api/ws/messages/party/Part.java b/http-api/src/main/java/net/runelite/http/api/ws/messages/party/Part.java index 0d487a3be6..b03e3dc576 100644 --- a/http-api/src/main/java/net/runelite/http/api/ws/messages/party/Part.java +++ b/http-api/src/main/java/net/runelite/http/api/ws/messages/party/Part.java @@ -27,6 +27,4 @@ package net.runelite.http.api.ws.messages.party; import net.runelite.api.events.Event; import net.runelite.http.api.ws.WebsocketMessage; -public class Part extends WebsocketMessage implements Event -{ -} +public class Part extends WebsocketMessage implements Event {} diff --git a/http-api/src/main/java/net/runelite/http/api/ws/messages/party/UserSync.java b/http-api/src/main/java/net/runelite/http/api/ws/messages/party/UserSync.java index bcb6ca0ee7..e4d08d199f 100644 --- a/http-api/src/main/java/net/runelite/http/api/ws/messages/party/UserSync.java +++ b/http-api/src/main/java/net/runelite/http/api/ws/messages/party/UserSync.java @@ -30,6 +30,4 @@ import net.runelite.api.events.Event; @Value @EqualsAndHashCode(callSuper = true) -public class UserSync extends PartyMemberMessage implements Event -{ -} +public class UserSync extends PartyMemberMessage implements Event {} 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 5c6789ee4b..a0c38c99b2 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 @@ -101,9 +101,7 @@ 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/http-service/src/main/java/net/runelite/http/service/feed/twitter/TwitterService.java b/http-service/src/main/java/net/runelite/http/service/feed/twitter/TwitterService.java index 9bb9dc8595..12b01c127c 100644 --- a/http-service/src/main/java/net/runelite/http/service/feed/twitter/TwitterService.java +++ b/http-service/src/main/java/net/runelite/http/service/feed/twitter/TwitterService.java @@ -110,9 +110,7 @@ public class TwitterService } InputStream in = response.body().byteStream(); - Type listType = new TypeToken>() - { - }.getType(); + Type listType = new TypeToken>() {}.getType(); List statusesResponse = RuneLiteAPI.GSON .fromJson(new InputStreamReader(in), listType); diff --git a/http-service/src/main/java/net/runelite/http/service/osbuddy/OsbuddyClient.java b/http-service/src/main/java/net/runelite/http/service/osbuddy/OsbuddyClient.java index 585577511a..e522301948 100644 --- a/http-service/src/main/java/net/runelite/http/service/osbuddy/OsbuddyClient.java +++ b/http-service/src/main/java/net/runelite/http/service/osbuddy/OsbuddyClient.java @@ -58,9 +58,7 @@ public class OsbuddyClient throw new IOException("Error retrieving summary from OSBuddy: " + responseOk.message()); } - Type type = new TypeToken>() - { - }.getType(); + Type type = new TypeToken>() {}.getType(); return RuneLiteAPI.GSON.fromJson(responseOk.body().string(), type); } diff --git a/http-service/src/main/java/net/runelite/http/service/util/HiscoreEndpointEditor.java b/http-service/src/main/java/net/runelite/http/service/util/HiscoreEndpointEditor.java index 816981f99a..bbc84f573a 100644 --- a/http-service/src/main/java/net/runelite/http/service/util/HiscoreEndpointEditor.java +++ b/http-service/src/main/java/net/runelite/http/service/util/HiscoreEndpointEditor.java @@ -26,9 +26,8 @@ package net.runelite.http.service.util; -import net.runelite.http.api.hiscore.HiscoreEndpoint; - import java.beans.PropertyEditorSupport; +import net.runelite.http.api.hiscore.HiscoreEndpoint; public class HiscoreEndpointEditor extends PropertyEditorSupport { diff --git a/http-service/src/main/java/net/runelite/http/service/util/exception/NotFoundException.java b/http-service/src/main/java/net/runelite/http/service/util/exception/NotFoundException.java index 83e04ceca6..c7d01175ef 100644 --- a/http-service/src/main/java/net/runelite/http/service/util/exception/NotFoundException.java +++ b/http-service/src/main/java/net/runelite/http/service/util/exception/NotFoundException.java @@ -29,7 +29,4 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; @ResponseStatus(code = HttpStatus.NOT_FOUND, reason = "Not found") -public class NotFoundException extends RuntimeException -{ - -} +public class NotFoundException extends RuntimeException {} diff --git a/protocol-api/src/main/java/net/runelite/protocol/api/handshake/HandshakePacket.java b/protocol-api/src/main/java/net/runelite/protocol/api/handshake/HandshakePacket.java index a81812813b..16794ac5e9 100644 --- a/protocol-api/src/main/java/net/runelite/protocol/api/handshake/HandshakePacket.java +++ b/protocol-api/src/main/java/net/runelite/protocol/api/handshake/HandshakePacket.java @@ -24,7 +24,4 @@ */ package net.runelite.protocol.api.handshake; -public abstract class HandshakePacket -{ - -} +public abstract class HandshakePacket {} diff --git a/protocol-api/src/main/java/net/runelite/protocol/api/handshake/LoginHandshakePacket.java b/protocol-api/src/main/java/net/runelite/protocol/api/handshake/LoginHandshakePacket.java index 16ccb85694..e19f72d725 100644 --- a/protocol-api/src/main/java/net/runelite/protocol/api/handshake/LoginHandshakePacket.java +++ b/protocol-api/src/main/java/net/runelite/protocol/api/handshake/LoginHandshakePacket.java @@ -29,7 +29,4 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -public class LoginHandshakePacket extends HandshakePacket -{ - -} +public class LoginHandshakePacket extends HandshakePacket {} diff --git a/runelite-api/src/main/java/net/runelite/api/FriendManager.java b/runelite-api/src/main/java/net/runelite/api/FriendManager.java index 4bdd5a496f..2047959f2c 100644 --- a/runelite-api/src/main/java/net/runelite/api/FriendManager.java +++ b/runelite-api/src/main/java/net/runelite/api/FriendManager.java @@ -27,6 +27,4 @@ package net.runelite.api; /** * Represents the friend and ignore list manager. */ -public interface FriendManager -{ -} +public interface FriendManager {} diff --git a/runelite-api/src/main/java/net/runelite/api/KeyFocusListener.java b/runelite-api/src/main/java/net/runelite/api/KeyFocusListener.java index 990c200086..04a12649e2 100644 --- a/runelite-api/src/main/java/net/runelite/api/KeyFocusListener.java +++ b/runelite-api/src/main/java/net/runelite/api/KeyFocusListener.java @@ -27,6 +27,4 @@ package net.runelite.api; /** * Detects when the window is focused or unfocused. */ -public interface KeyFocusListener -{ -} +public interface KeyFocusListener {} diff --git a/runelite-api/src/main/java/net/runelite/api/Nameable.java b/runelite-api/src/main/java/net/runelite/api/Nameable.java index 081074594e..419f5206ed 100644 --- a/runelite-api/src/main/java/net/runelite/api/Nameable.java +++ b/runelite-api/src/main/java/net/runelite/api/Nameable.java @@ -27,6 +27,4 @@ package net.runelite.api; /** * Represents a chat entity that has a name. */ -public interface Nameable extends Comparable -{ -} +public interface Nameable extends Comparable {} diff --git a/runelite-api/src/main/java/net/runelite/api/annotations/VisibleForDevtools.java b/runelite-api/src/main/java/net/runelite/api/annotations/VisibleForDevtools.java index 9357969d16..a9db920cf8 100644 --- a/runelite-api/src/main/java/net/runelite/api/annotations/VisibleForDevtools.java +++ b/runelite-api/src/main/java/net/runelite/api/annotations/VisibleForDevtools.java @@ -33,6 +33,4 @@ import java.lang.annotation.RetentionPolicy; */ @Documented @Retention(RetentionPolicy.SOURCE) -public @interface VisibleForDevtools -{ -} +public @interface VisibleForDevtools {} diff --git a/runelite-api/src/main/java/net/runelite/api/events/Event.java b/runelite-api/src/main/java/net/runelite/api/events/Event.java index 33ea361467..b031dce09e 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/Event.java +++ b/runelite-api/src/main/java/net/runelite/api/events/Event.java @@ -1,5 +1,3 @@ package net.runelite.api.events; -public interface Event -{ -} +public interface Event {} 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 3e938a65e9..55a51700a7 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 @@ -26,7 +26,6 @@ package net.runelite.api.widgets; import java.awt.Rectangle; import java.util.Collection; - import net.runelite.api.FontTypeFace; import net.runelite.api.Point; import net.runelite.api.Sprite; diff --git a/runelite-client/src/main/java/net/runelite/client/config/Alpha.java b/runelite-client/src/main/java/net/runelite/client/config/Alpha.java index 79815f5ca2..51a0f4d50a 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/Alpha.java +++ b/runelite-client/src/main/java/net/runelite/client/config/Alpha.java @@ -37,6 +37,4 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) @Documented -public @interface Alpha -{ -} +public @interface Alpha {} diff --git a/runelite-client/src/main/java/net/runelite/client/config/Button.java b/runelite-client/src/main/java/net/runelite/client/config/Button.java index 591332ce05..c6cc8d67ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/Button.java +++ b/runelite-client/src/main/java/net/runelite/client/config/Button.java @@ -1,5 +1,3 @@ package net.runelite.client.config; -public class Button -{ -} +public class Button {} diff --git a/runelite-client/src/main/java/net/runelite/client/config/Config.java b/runelite-client/src/main/java/net/runelite/client/config/Config.java index 6c95e9941a..b8d7f71701 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/Config.java +++ b/runelite-client/src/main/java/net/runelite/client/config/Config.java @@ -24,6 +24,4 @@ */ package net.runelite.client.config; -public interface Config -{ -} +public interface Config {} diff --git a/runelite-client/src/main/java/net/runelite/client/config/Title.java b/runelite-client/src/main/java/net/runelite/client/config/Title.java index e4474544a0..4605a9965c 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/Title.java +++ b/runelite-client/src/main/java/net/runelite/client/config/Title.java @@ -1,5 +1,3 @@ package net.runelite.client.config; -public class Title -{ -} +public class Title {} diff --git a/runelite-client/src/main/java/net/runelite/client/events/SessionClose.java b/runelite-client/src/main/java/net/runelite/client/events/SessionClose.java index f73d3a31b5..150b66f412 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/SessionClose.java +++ b/runelite-client/src/main/java/net/runelite/client/events/SessionClose.java @@ -35,7 +35,4 @@ import net.runelite.api.events.Event; * it has nothing to do with whether an account is being logged out. */ @Data -public class SessionClose implements Event -{ - -} +public class SessionClose implements Event {} diff --git a/runelite-client/src/main/java/net/runelite/client/events/SessionOpen.java b/runelite-client/src/main/java/net/runelite/client/events/SessionOpen.java index b1d042af2b..130305798e 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/SessionOpen.java +++ b/runelite-client/src/main/java/net/runelite/client/events/SessionOpen.java @@ -35,7 +35,4 @@ import net.runelite.api.events.Event; * it has nothing to do with whether an account is being logged in. */ @Data -public class SessionOpen implements Event -{ - -} +public class SessionOpen implements Event {} diff --git a/runelite-client/src/main/java/net/runelite/client/input/KeyListener.java b/runelite-client/src/main/java/net/runelite/client/input/KeyListener.java index d8b72f4a04..b86d317c71 100644 --- a/runelite-client/src/main/java/net/runelite/client/input/KeyListener.java +++ b/runelite-client/src/main/java/net/runelite/client/input/KeyListener.java @@ -24,6 +24,4 @@ */ package net.runelite.client.input; -public interface KeyListener extends java.awt.event.KeyListener -{ -} +public interface KeyListener extends java.awt.event.KeyListener {} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/Requirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/Requirement.java index a507cb4538..cddf78e866 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/Requirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/Requirement.java @@ -24,6 +24,4 @@ */ package net.runelite.client.plugins.achievementdiary; -public interface Requirement -{ -} +public interface Requirement {} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java index 7c78947a81..715ad97520 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java @@ -26,7 +26,6 @@ */ package net.runelite.client.plugins.aoewarnings; - import com.google.inject.Provides; import java.awt.Color; import java.time.Instant; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java index 34313e61ac..3e4452f3b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java @@ -27,6 +27,13 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.ImmutableMap; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.Stroke; +import java.util.Map; +import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; @@ -39,14 +46,6 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; -import javax.inject.Inject; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.Stroke; -import java.awt.BasicStroke; -import java.util.Map; - @Singleton class AboveSceneOverlay extends Overlay { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java index 5019de1647..0d97291329 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java @@ -31,7 +31,6 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; - import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java index 01ea64478f..461848ce7d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java @@ -26,18 +26,17 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.Sets; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; import java.util.List; +import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.client.menus.AbstractComparableEntry; import net.runelite.client.menus.MenuManager; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; - class BarbarianAssaultMenu { private final MenuManager menuManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java index c6f1e0c2ad..e7b21a1ecf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java @@ -26,15 +26,14 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.ImmutableList; +import java.time.Duration; +import java.time.Instant; +import java.util.List; import lombok.AccessLevel; import lombok.Data; import lombok.Getter; import net.runelite.api.NPC; -import java.time.Duration; -import java.time.Instant; -import java.util.List; - @Data class Healer diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java index 59fe249b03..8e6c465b71 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.barbarianassault; import java.awt.Color; import java.util.ArrayList; - import java.util.List; import lombok.AccessLevel; import lombok.Getter; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java index c936e82352..8845291326 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java @@ -24,13 +24,12 @@ */ package net.runelite.client.plugins.barbarianassault; -import lombok.AccessLevel; -import lombok.Getter; - import java.time.Duration; import java.time.Instant; import java.time.LocalTime; import java.time.format.DateTimeFormatter; +import lombok.AccessLevel; +import lombok.Getter; class Timer { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java index 36adc1efcc..1d65a35a31 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java @@ -25,14 +25,13 @@ */ package net.runelite.client.plugins.barbarianassault; +import java.awt.Color; +import java.awt.image.BufferedImage; import lombok.Data; import lombok.EqualsAndHashCode; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.InfoBox; -import java.awt.Color; -import java.awt.image.BufferedImage; - @EqualsAndHashCode(callSuper = true) @Data public class TimerBox extends InfoBox diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java index 9f90ab7612..f6d6ffd1ce 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.ImmutableList; +import java.awt.Color; import lombok.AccessLevel; import lombok.Data; import lombok.Getter; @@ -35,8 +36,6 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.chat.ChatMessageBuilder; -import java.awt.Color; - @Data public class Wave { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTracker.java index 882f415c9f..b3d026289e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTracker.java @@ -24,14 +24,13 @@ */ package net.runelite.client.plugins.bosstimetracker; -import net.runelite.client.ui.overlay.infobox.InfoBox; - -import java.awt.image.BufferedImage; import java.awt.Color; +import java.awt.image.BufferedImage; import java.time.Duration; import java.time.Instant; import java.time.LocalTime; import java.time.format.DateTimeFormatter; +import net.runelite.client.ui.overlay.infobox.InfoBox; public class BossTimeTracker extends InfoBox { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java index 02979340d1..db8e7f9653 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java @@ -24,29 +24,27 @@ */ package net.runelite.client.plugins.bosstimetracker; -import lombok.Getter; -import net.runelite.api.ChatMessageType; -import net.runelite.api.Client; -import net.runelite.api.events.ChatMessage; -import net.runelite.api.events.GameStateChanged; -import net.runelite.api.util.Text; -import net.runelite.client.config.ConfigManager; -import net.runelite.client.game.ItemManager; -import net.runelite.client.plugins.Plugin; -import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.plugins.PluginType; -import net.runelite.client.ui.overlay.infobox.InfoBoxManager; -import net.runelite.client.eventbus.EventBus; - -import javax.inject.Inject; import java.time.Duration; import java.time.Instant; import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; - +import javax.inject.Inject; +import lombok.Getter; +import net.runelite.api.ChatMessageType; +import net.runelite.api.Client; import static net.runelite.api.ItemID.FIRE_CAPE; import static net.runelite.api.ItemID.INFERNAL_CAPE; +import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.GameStateChanged; +import net.runelite.api.util.Text; +import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.EventBus; +import net.runelite.client.game.ItemManager; +import net.runelite.client.plugins.Plugin; +import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; +import net.runelite.client.ui.overlay.infobox.InfoBoxManager; @PluginDescriptor( name = "Boss Time Tracker", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java index d6a5c16483..b7f42d4cca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java @@ -28,7 +28,6 @@ package net.runelite.client.plugins.chatnotifications; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.inject.Provides; - import java.util.HashSet; import java.util.List; import java.util.Set; @@ -41,17 +40,17 @@ import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.MessageNode; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.util.Text; import net.runelite.client.Notifier; import net.runelite.client.RuneLiteProperties; import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.api.util.Text; @PluginDescriptor( name = "Chat Notifications", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounterConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounterConfig.java index 56a212fbab..74966f963b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounterConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounterConfig.java @@ -1,11 +1,10 @@ package net.runelite.client.plugins.combatcounter; +import java.awt.Color; import net.runelite.client.config.Alpha; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; - -import java.awt.*; import net.runelite.client.config.ConfigTitleSection; import net.runelite.client.config.Title; @@ -57,7 +56,7 @@ public interface CombatCounterConfig extends Config { return new Title(); } - + @Alpha @ConfigItem( keyName = "selfColor", @@ -70,7 +69,7 @@ public interface CombatCounterConfig extends Config { return Color.green; } - + @Alpha @ConfigItem( keyName = "totalColor", @@ -83,7 +82,7 @@ public interface CombatCounterConfig extends Config { return Color.RED; } - + @Alpha @ConfigItem( keyName = "otherColor", @@ -96,7 +95,7 @@ public interface CombatCounterConfig extends Config { return Color.white; } - + @Alpha @ConfigItem( keyName = "bgColor", @@ -109,7 +108,7 @@ public interface CombatCounterConfig extends Config { return new Color(70, 61, 50, 156); } - + @Alpha @ConfigItem( keyName = "titleColor", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java index da5dedc012..888559d75a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.equipmentinspector; - import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.lang.reflect.InvocationTargetException; 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 81f2fe06e6..08d685260f 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 @@ -108,9 +108,7 @@ public class GrandExchangePlugin extends Plugin private static final OSBGrandExchangeClient CLIENT = new OSBGrandExchangeClient(); private static final String OSB_GE_TEXT = "
OSBuddy Actively traded price: "; private static final String BUY_LIMIT_GE_TEXT = "
Buy limit: "; - private static final TypeToken> BUY_LIMIT_TOKEN = new TypeToken>() - { - }; + private static final TypeToken> BUY_LIMIT_TOKEN = new TypeToken>() {}; @Getter(AccessLevel.PACKAGE) private NavigationButton button; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java index 08b063cef5..c8c8116df9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java @@ -24,20 +24,19 @@ */ package net.runelite.client.plugins.grotesqueguardians; +import java.util.ArrayList; +import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; +import net.runelite.api.Client; +import net.runelite.api.NPC; +import static net.runelite.api.NpcID.DUSK_7888; +import net.runelite.api.events.GameTick; import net.runelite.client.eventbus.EventBus; 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 java.util.ArrayList; -import net.runelite.api.events.GameTick; -import net.runelite.api.NPC; -import javax.annotation.Nullable; -import net.runelite.api.Client; - -import static net.runelite.api.NpcID.DUSK_7888; @PluginDescriptor( diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java index c0acd20c66..93e840a3e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java @@ -28,7 +28,6 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; - import java.util.Objects; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java index 711c9046a0..7d1621e535 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java @@ -140,9 +140,7 @@ public class GroundMarkerPlugin extends Plugin return GSON.fromJson(json, new GroundMarkerListTypeToken().getType()); } - private static class GroundMarkerListTypeToken extends TypeToken> - { - } + private static class GroundMarkerListTypeToken extends TypeToken> {} private GroundMarkerConfig.amount amount; @Getter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java index e9bd791ff0..15ca061026 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java @@ -301,10 +301,7 @@ public class InventorySetupPlugin extends Plugin { // TODO add last resort?, serialize exception just make empty map final Gson gson = new Gson(); - Type type = new TypeToken>() - { - - }.getType(); + Type type = new TypeToken>() {}.getType(); inventorySetups.clear(); inventorySetups.putAll(gson.fromJson(json, type)); } @@ -371,7 +368,7 @@ public class InventorySetupPlugin extends Plugin { return; } - + final String setupName = panel.getSelectedInventorySetup(); if (!setupName.isEmpty()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java index f9d5e7a0c0..926b6e8ae2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java @@ -11,7 +11,6 @@ package net.runelite.client.plugins.loottracker; - import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; import java.time.Duration; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 5cb013712f..b4e3d9795c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -1451,9 +1451,7 @@ public class LootTrackerPlugin extends Plugin try { Collection lootRecords = new ArrayList<>(RuneLiteAPI.GSON.fromJson(new FileReader(LOOT_RECORDS_FILE), - new TypeToken>() - { - }.getType())); + new TypeToken>() {}.getType())); DSLContext dslContext = databaseManager.getDsl(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/localstorage/events/LTNameChange.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/localstorage/events/LTNameChange.java index 130c3ef440..04a7f348da 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/localstorage/events/LTNameChange.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/localstorage/events/LTNameChange.java @@ -26,6 +26,4 @@ package net.runelite.client.plugins.loottracker.localstorage.events; import net.runelite.api.events.Event; -public class LTNameChange implements Event -{ -} \ No newline at end of file +public class LTNameChange implements Event {} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/GrimyHerbLookup.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/GrimyHerbLookup.java index 97236ddc37..3a0a88b953 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/GrimyHerbLookup.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/GrimyHerbLookup.java @@ -17,9 +17,7 @@ public class GrimyHerbLookup { final InputStream herbFile = GrimyHerbLookup.class.getResourceAsStream("/herbs.json"); Gson gson = new Gson(); - mapping = gson.fromJson(new InputStreamReader(herbFile), new TypeToken>() - { - }.getType()); + mapping = gson.fromJson(new InputStreamReader(herbFile), new TypeToken>() {}.getType()); } public int getCleanLevel(int itemId) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/HerbNotFoundException.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/HerbNotFoundException.java index c352d90d47..eb2d0da3a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/HerbNotFoundException.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/HerbNotFoundException.java @@ -1,5 +1,3 @@ package net.runelite.client.plugins.menuentryswapper.util; -public class HerbNotFoundException extends RuntimeException -{ -} +public class HerbNotFoundException extends RuntimeException {} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java index ba05d529fa..ef427c77ca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java @@ -25,30 +25,29 @@ package net.runelite.client.plugins.nightmarezone; import com.google.inject.Provides; - import java.awt.Color; +import java.time.Duration; +import java.time.Instant; import java.util.Arrays; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; -import java.time.Duration; -import java.time.Instant; import lombok.Getter; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.Varbits; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.util.Text; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; -import net.runelite.api.util.Text; @PluginDescriptor( name = "Nightmare Zone", @@ -81,7 +80,7 @@ public class NightmareZonePlugin extends Plugin @Getter private int pointsPerHour; - + private Instant nmzSessionStartTime; // This starts as true since you need to get diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesManager.java index bb77880b71..933f007030 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesManager.java @@ -62,9 +62,7 @@ public class NotesManager if (!Strings.isNullOrEmpty(configJson)) { final Gson gson = new Gson(); - notes = gson.fromJson(configJson, new TypeToken>() - { - }.getType()); + notes = gson.fromJson(configJson, new TypeToken>() {}.getType()); } if (notes == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java index c7690a5369..0d961f53eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java @@ -503,9 +503,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener return null; } - Set points = GSON.fromJson(json, new TypeToken>() - { - }.getType()); + Set points = GSON.fromJson(json, new TypeToken>() {}.getType()); // Prior to multiloc support the plugin would mark objects named "null", which breaks // in most cases due to the specific object being identified being ambiguous, so remove // them diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java index 3185ac2741..e51485e208 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java @@ -24,34 +24,13 @@ */ package net.runelite.client.plugins.runepouch; - import com.google.common.collect.ImmutableMap; import java.awt.image.BufferedImage; import java.util.Map; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; -import static net.runelite.api.ItemID.AIR_RUNE; -import static net.runelite.api.ItemID.ASTRAL_RUNE; -import static net.runelite.api.ItemID.BLOOD_RUNE; -import static net.runelite.api.ItemID.BODY_RUNE; -import static net.runelite.api.ItemID.CHAOS_RUNE; -import static net.runelite.api.ItemID.COSMIC_RUNE; -import static net.runelite.api.ItemID.DEATH_RUNE; -import static net.runelite.api.ItemID.DUST_RUNE; -import static net.runelite.api.ItemID.EARTH_RUNE; -import static net.runelite.api.ItemID.FIRE_RUNE; -import static net.runelite.api.ItemID.LAVA_RUNE; -import static net.runelite.api.ItemID.LAW_RUNE; -import static net.runelite.api.ItemID.MIND_RUNE; -import static net.runelite.api.ItemID.MIST_RUNE; -import static net.runelite.api.ItemID.MUD_RUNE; -import static net.runelite.api.ItemID.NATURE_RUNE; -import static net.runelite.api.ItemID.SMOKE_RUNE; -import static net.runelite.api.ItemID.SOUL_RUNE; -import static net.runelite.api.ItemID.STEAM_RUNE; -import static net.runelite.api.ItemID.WATER_RUNE; -import static net.runelite.api.ItemID.WRATH_RUNE; +import static net.runelite.api.ItemID.*; public enum Runes { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java index a12f659ede..8dd065337d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java @@ -258,9 +258,7 @@ public class ScreenMarkerPlugin extends Plugin } final Gson gson = new Gson(); - final List screenMarkerData = gson.fromJson(json, new TypeToken>() - { - }.getType()); + final List screenMarkerData = gson.fromJson(json, new TypeToken>() {}.getType()); return screenMarkerData.stream().map(ScreenMarkerOverlay::new); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerXpDropLookup.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerXpDropLookup.java index 25dfef058c..612bce5a88 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerXpDropLookup.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerXpDropLookup.java @@ -44,9 +44,7 @@ class SlayerXpDropLookup try (final InputStream xpFile = getClass().getResourceAsStream("/slayer_xp.json")) { Gson gson = new Gson(); - xpMap = gson.fromJson(new InputStreamReader(xpFile), new TypeToken>>() - { - }.getType()); + xpMap = gson.fromJson(new InputStreamReader(xpFile), new TypeToken>>() {}.getType()); } } 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 96b4bec1aa..a0573e14dc 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 @@ -486,9 +486,7 @@ public class SpellbookPlugin extends Plugin } // CHECKSTYLE:OFF - final Collection gson = GSON.fromJson(cfg, new TypeToken>() - { - } + final Collection gson = GSON.fromJson(cfg, new TypeToken>() {} .getType()); // CHECKSTYLE:ON diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 7cd9e33565..45f6a2d5f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -28,7 +28,6 @@ */ package net.runelite.client.plugins.suppliestracker; - import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.util.ArrayDeque; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java index 3be9dc053b..f5a48ce87e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java @@ -153,9 +153,7 @@ public class ClockManager if (!Strings.isNullOrEmpty(timersJson)) { final Gson gson = new Gson(); - final List timers = gson.fromJson(timersJson, new TypeToken>() - { - }.getType()); + final List timers = gson.fromJson(timersJson, new TypeToken>() {}.getType()); this.timers.clear(); this.timers.addAll(timers); @@ -170,9 +168,7 @@ public class ClockManager if (!Strings.isNullOrEmpty(stopwatchesJson)) { final Gson gson = new Gson(); - final List stopwatches = gson.fromJson(stopwatchesJson, new TypeToken>() - { - }.getType()); + final List stopwatches = gson.fromJson(stopwatchesJson, new TypeToken>() {}.getType()); this.stopwatches.clear(); this.stopwatches.addAll(stopwatches); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java index 9ca40b627b..78dea24b8e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java @@ -136,9 +136,7 @@ public class WikiSearchChatboxTextInput extends ChatboxTextInput try { JsonArray jar = new JsonParser().parse(body).getAsJsonArray(); - List apredictions = gson.fromJson(jar.get(1), new TypeToken>() - { - }.getType()); + List apredictions = gson.fromJson(jar.get(1), new TypeToken>() {}.getType()); if (apredictions.size() > MAX_NUM_PREDICTIONS) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java index f599a41428..1fd026bf19 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java @@ -9,7 +9,6 @@ package net.runelite.client.plugins.wildernesslocations; - import com.google.inject.Provides; import java.awt.Color; import javax.inject.Inject; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoOverlay.java index 2bb2c14120..40ea51e461 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoOverlay.java @@ -32,6 +32,7 @@ import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.Shape; import java.util.List; +import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.AnimationID; import net.runelite.api.Client; @@ -40,8 +41,6 @@ import net.runelite.api.GraphicsObject; import net.runelite.api.Perspective; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; - -import javax.inject.Inject; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java index e496268ac1..6c954d062b 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java @@ -31,8 +31,6 @@ public class HiscorePanelTest @Test public void testConstructor() { - new HiscorePanel(new HiscorePlugin() - { - }); + new HiscorePanel(new HiscorePlugin() {}); } } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java index 6702012544..38dbc28382 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java @@ -32,7 +32,6 @@ import net.runelite.api.ItemID; import net.runelite.api.Skill; import net.runelite.api.Varbits; import net.runelite.client.plugins.maxhit.calculators.MagicMaxHitCalculator; - import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java index be9b240de9..2dc09e06bc 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java @@ -36,7 +36,6 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.plugins.attackstyles.WeaponType; import net.runelite.client.plugins.maxhit.calculators.MeleeMaxHitCalculator; - import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java index 2fa986c29c..6d975cd7b2 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java @@ -36,7 +36,6 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.plugins.maxhit.attackstyle.WeaponType; import net.runelite.client.plugins.maxhit.calculators.RangeMaxHitCalculator; - import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Inject.java b/runelite-mixins/src/main/java/net/runelite/api/mixins/Inject.java index a0f40f6bb5..311bb9f4c0 100644 --- a/runelite-mixins/src/main/java/net/runelite/api/mixins/Inject.java +++ b/runelite-mixins/src/main/java/net/runelite/api/mixins/Inject.java @@ -31,7 +31,4 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR}) -public @interface Inject -{ - -} +public @interface Inject {} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java index e71992c810..22062a9e31 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java @@ -24,18 +24,17 @@ */ package net.runelite.mixins; - +import java.util.regex.Matcher; +import java.util.regex.Pattern; import net.runelite.api.Client; import static net.runelite.api.Opcodes.RUNELITE_EXECUTE; import net.runelite.api.events.ScriptCallbackEvent; -import net.runelite.api.widgets.JavaScriptCallback; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Shadow; +import net.runelite.api.widgets.JavaScriptCallback; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSScript; import net.runelite.rs.api.RSScriptEvent; diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java index df5e6acd38..de48e43a8a 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java @@ -1,9 +1,8 @@ package net.runelite.mixins; -import net.runelite.api.Sprite; import java.util.HashMap; import java.util.Map; - +import net.runelite.api.Sprite; import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java index b80d7c8b59..7908b5422f 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java @@ -1,6 +1,5 @@ package net.runelite.mixins; - import java.awt.Dimension; import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Mixin; diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMixin.java index 99ba3f5260..23c71c2ed6 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMixin.java @@ -1,9 +1,8 @@ package net.runelite.mixins; - -import net.runelite.api.Constants; import java.awt.Container; import java.awt.Dimension; +import net.runelite.api.Constants; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; import net.runelite.rs.api.RSClient; diff --git a/runescape-api/src/main/java/net/runelite/mapping/Construct.java b/runescape-api/src/main/java/net/runelite/mapping/Construct.java index a5b5b2541a..894456dc7c 100644 --- a/runescape-api/src/main/java/net/runelite/mapping/Construct.java +++ b/runescape-api/src/main/java/net/runelite/mapping/Construct.java @@ -34,18 +34,15 @@ import java.lang.annotation.Target; * Inject a method to create and construct an object. * The object type is inferred from the return value * of the method. - * + * * {@code * {@literal @}Construct * RSIndexedImage createIndexedImage(); * } - * + * * @author Adam */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) @Documented -public @interface Construct -{ - -} +public @interface Construct {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCanvas.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCanvas.java index f0295a0770..05d6b5bc5e 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCanvas.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSCanvas.java @@ -1,5 +1,3 @@ package net.runelite.rs.api; -public interface RSCanvas -{ -} +public interface RSCanvas {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMate.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMate.java index 1bcfb5b6df..aaa5291c8d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMate.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMate.java @@ -2,6 +2,4 @@ package net.runelite.rs.api; import net.runelite.api.ClanMember; -public interface RSClanMate extends RSBuddy, ClanMember -{ -} +public interface RSClanMate extends RSBuddy, ClanMember {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSDecimator.java b/runescape-api/src/main/java/net/runelite/rs/api/RSDecimator.java index 401b20c13f..1a27187b57 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSDecimator.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSDecimator.java @@ -24,6 +24,4 @@ */ package net.runelite.rs.api; -public interface RSDecimator -{ -} +public interface RSDecimator {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java index b12c97d946..ec246abb22 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java @@ -1,5 +1,3 @@ package net.runelite.rs.api; -public interface RSFont extends RSAbstractFont -{ -} +public interface RSFont extends RSAbstractFont {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java index 3b4e047066..880ae16d81 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java @@ -2,6 +2,4 @@ package net.runelite.rs.api; import net.runelite.api.Friend; -public interface RSFriend extends Friend, RSBuddy -{ -} +public interface RSFriend extends Friend, RSBuddy {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsList.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsList.java index 5617d00bc0..5dfc75efcb 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsList.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsList.java @@ -1,5 +1,3 @@ package net.runelite.rs.api; -public interface RSFriendsList extends RSUserList -{ -} +public interface RSFriendsList extends RSUserList {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreList.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreList.java index 802fe122a0..4bf6ffc33b 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreList.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreList.java @@ -1,5 +1,3 @@ package net.runelite.rs.api; -public interface RSIgnoreList extends RSUserList -{ -} +public interface RSIgnoreList extends RSUserList {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnored.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnored.java index 5fcca27e00..f52ca9a620 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnored.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnored.java @@ -2,6 +2,4 @@ package net.runelite.rs.api; import net.runelite.api.Ignore; -public interface RSIgnored extends Ignore, RSUser -{ -} +public interface RSIgnored extends Ignore, RSUser {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java b/runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java index c683aa129a..2344684c6b 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java @@ -4,6 +4,4 @@ import net.runelite.api.KeyFocusListener; import java.awt.event.FocusListener; import java.awt.event.KeyListener; -public interface RSKeyHandler extends KeyListener, FocusListener, KeyFocusListener -{ -} +public interface RSKeyHandler extends KeyListener, FocusListener, KeyFocusListener {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSLoginType.java b/runescape-api/src/main/java/net/runelite/rs/api/RSLoginType.java index ecbde757f7..41644178b3 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSLoginType.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSLoginType.java @@ -1,5 +1,3 @@ package net.runelite.rs.api; -public interface RSLoginType -{ -} +public interface RSLoginType {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseHandler.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseHandler.java index b89b833c85..7048a39b27 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseHandler.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseHandler.java @@ -4,6 +4,4 @@ import java.awt.event.FocusListener; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -public interface RSMouseHandler extends MouseListener, MouseMotionListener, FocusListener -{ -} +public interface RSMouseHandler extends MouseListener, MouseMotionListener, FocusListener {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java index 2add3af142..e749630541 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java @@ -2,6 +2,4 @@ package net.runelite.rs.api; import java.awt.event.MouseWheelListener; -public interface RSMouseWheelHandler extends MouseWheelListener -{ -} +public interface RSMouseWheelHandler extends MouseWheelListener {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java index 602a497d4a..08619c28a7 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java @@ -1,5 +1,3 @@ package net.runelite.rs.api; -public interface RSPacketBuffer -{ -} +public interface RSPacketBuffer {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPcmStream.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPcmStream.java index 0c5e118782..558f26571c 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPcmStream.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPcmStream.java @@ -24,6 +24,4 @@ */ package net.runelite.rs.api; -public interface RSPcmStream -{ -} +public interface RSPcmStream {} diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java index dd8f86fa9c..9c4bd24313 100644 --- a/runescape-client/src/main/java/class161.java +++ b/runescape-client/src/main/java/class161.java @@ -1,5 +1,4 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("fu") -public interface class161 { -} +public interface class161 {} diff --git a/runescape-client/src/main/java/class181.java b/runescape-client/src/main/java/class181.java index 2911c6240e..e6c1fbce4b 100644 --- a/runescape-client/src/main/java/class181.java +++ b/runescape-client/src/main/java/class181.java @@ -1,5 +1,4 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("fo") -public interface class181 { -} +public interface class181 {} diff --git a/runescape-client/src/main/java/net/runelite/rs/Opcodes.java b/runescape-client/src/main/java/net/runelite/rs/Opcodes.java index 317b2a8c42..c7364a3db6 100644 --- a/runescape-client/src/main/java/net/runelite/rs/Opcodes.java +++ b/runescape-client/src/main/java/net/runelite/rs/Opcodes.java @@ -1,4 +1,3 @@ package net.runelite.rs; -public class Opcodes { -} +public class Opcodes {}