ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Optimize imports

Browse Source
This commit is contained in:
Lucwousin
2019-11-16 03:56:15 +01:00
parent 7900089eda
commit 55b0845a18
44 changed files with 99 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java vendored
View File

@@ -25,13 +25,12 @@
package net.runelite.cache.definitions.loaders; package net.runelite.cache.definitions.loaders;
import java.util.HashMap;
import net.runelite.cache.definitions.ItemDefinition; import net.runelite.cache.definitions.ItemDefinition;
import net.runelite.cache.io.InputStream; import net.runelite.cache.io.InputStream;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.HashMap;
public class ItemLoader public class ItemLoader
{ {
private static final Logger logger = LoggerFactory.getLogger(ItemLoader.class); private static final Logger logger = LoggerFactory.getLogger(ItemLoader.class);
@@ -40,7 +39,7 @@ public class ItemLoader
{ {
ItemDefinition def = new ItemDefinition(id); ItemDefinition def = new ItemDefinition(id);
InputStream is = new InputStream(b); InputStream is = new InputStream(b);
while (true) while (true)
{ {
int opcode = is.readUnsignedByte(); int opcode = is.readUnsignedByte();

1
cache/src/test/java/net/runelite/cache/ModelDumperTest.java vendored
View File

@@ -25,7 +25,6 @@
package net.runelite.cache; package net.runelite.cache;
import com.google.common.io.Files; import com.google.common.io.Files;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

1
deobfuscator/src/main/java/net/runelite/asm/attributes/Annotations.java
View File

@@ -28,7 +28,6 @@ package net.runelite.asm.attributes;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import net.runelite.asm.Type; import net.runelite.asm.Type;
import net.runelite.asm.attributes.annotation.Annotation; import net.runelite.asm.attributes.annotation.Annotation;
import net.runelite.asm.attributes.annotation.Element; import net.runelite.asm.attributes.annotation.Element;

1
deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java
View File

@@ -40,7 +40,6 @@ import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.Stack; import net.runelite.asm.execution.Stack;
import net.runelite.asm.execution.StackContext; import net.runelite.asm.execution.StackContext;
import static net.runelite.asm.execution.StaticStep.stepInto; import static net.runelite.asm.execution.StaticStep.stepInto;
import net.runelite.asm.execution.Value; import net.runelite.asm.execution.Value;
import net.runelite.asm.pool.Method; import net.runelite.asm.pool.Method;
import net.runelite.asm.signature.Signature; import net.runelite.asm.signature.Signature;

13
deobfuscator/src/main/java/net/runelite/asm/execution/Stack.java
View File

@@ -25,11 +25,10 @@
package net.runelite.asm.execution; package net.runelite.asm.execution;
import net.runelite.asm.Type;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import net.runelite.asm.Method; import net.runelite.asm.Method;
import net.runelite.asm.Type;
public class Stack public class Stack
{ {
@@ -40,13 +39,13 @@ public class Stack
{ {
stack = new StackContext[sz * 2]; // XXX FIXME stack = new StackContext[sz * 2]; // XXX FIXME
} }
public Stack(Stack other) public Stack(Stack other)
{ {
this.size = other.size; this.size = other.size;
this.stack = other.stack.clone(); this.stack = other.stack.clone();
} }
private void printStack(StackContext ctx, int level) private void printStack(StackContext ctx, int level)
{ {
for (int i = 0; i < level; ++i) for (int i = 0; i < level; ++i)
@@ -66,7 +65,7 @@ public class Stack
printStack(stack[c], 0); printStack(stack[c], 0);
throw new RuntimeException("Stack overflow"); throw new RuntimeException("Stack overflow");
} }
assert !i.getType().equals(Type.VOID); assert !i.getType().equals(Type.VOID);
stack[size] = i; stack[size] = i;
@@ -80,12 +79,12 @@ public class Stack
return stack[--size]; return stack[--size];
} }
public int getSize() public int getSize()
{ {
return size; return size;
} }
public List<StackContext> getStack() public List<StackContext> getStack()
{ {
return Arrays.asList(stack); return Arrays.asList(stack);

19
deobfuscator/src/main/java/net/runelite/asm/execution/VariableContext.java
View File

@@ -25,10 +25,9 @@
package net.runelite.asm.execution; package net.runelite.asm.execution;
import net.runelite.asm.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.runelite.asm.Type;
public class VariableContext public class VariableContext
{ {
@@ -46,13 +45,13 @@ public class VariableContext
type = ctx.getType(); type = ctx.getType();
value = ctx.getValue(); value = ctx.getValue();
} }
public VariableContext(Type type) // for entrypoints public VariableContext(Type type) // for entrypoints
{ {
this.type = type; this.type = type;
value = Value.UNKNOWN; value = Value.UNKNOWN;
} }
public VariableContext(InstructionContext i, VariableContext other) public VariableContext(InstructionContext i, VariableContext other)
{ {
ic = i; ic = i;
@@ -60,24 +59,24 @@ public class VariableContext
type = other.type; type = other.type;
value = other.value; value = other.value;
} }
public VariableContext(InstructionContext i, Type type, Value value) public VariableContext(InstructionContext i, Type type, Value value)
{ {
ic = i; ic = i;
this.type = type; this.type = type;
this.value = value; this.value = value;
} }
public StackContext getStackContext() public StackContext getStackContext()
{ {
return ctx; return ctx;
} }
public InstructionContext getInstructionWhichStored() public InstructionContext getInstructionWhichStored()
{ {
return ic; return ic;
} }
public Type getType() public Type getType()
{ {
return type; return type;
@@ -87,7 +86,7 @@ public class VariableContext
{ {
return value; return value;
} }
public void addRead(InstructionContext ctx) public void addRead(InstructionContext ctx)
{ {
if (!read.contains(ctx)) if (!read.contains(ctx))
@@ -103,7 +102,7 @@ public class VariableContext
{ {
return isParameter; return isParameter;
} }
public VariableContext markParameter() public VariableContext markParameter()
{ {
isParameter = true; isParameter = true;

3
deobfuscator/src/main/java/net/runelite/asm/pool/Field.java
View File

@@ -25,9 +25,8 @@
package net.runelite.asm.pool; package net.runelite.asm.pool;
import net.runelite.asm.Type;
import java.util.Objects; import java.util.Objects;
import net.runelite.asm.Type;
public class Field public class Field
{ {

3
deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java
View File

@@ -24,8 +24,6 @@
*/ */
package net.runelite.asm.signature; package net.runelite.asm.signature;
import net.runelite.asm.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@@ -33,6 +31,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.runelite.asm.Type;
public class Signature public class Signature
{ {

3
deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java
View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.deob; package net.runelite.deob;
import java.util.List;
import net.runelite.asm.ClassFile; import net.runelite.asm.ClassFile;
import net.runelite.asm.Field; import net.runelite.asm.Field;
import net.runelite.asm.Method; 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.attributes.annotation.Element;
import net.runelite.asm.signature.Signature; import net.runelite.asm.signature.Signature;
import java.util.List;
public class DeobAnnotations public class DeobAnnotations
{ {
public static final Type OBFUSCATED_NAME = new Type("Lnet/runelite/mapping/ObfuscatedName;"); public static final Type OBFUSCATED_NAME = new Type("Lnet/runelite/mapping/ObfuscatedName;");

29
deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java
View File

@@ -25,6 +25,7 @@
package net.runelite.deob.deobfuscators; package net.runelite.deob.deobfuscators;
import java.util.List;
import net.runelite.asm.ClassFile; import net.runelite.asm.ClassFile;
import net.runelite.asm.ClassGroup; import net.runelite.asm.ClassGroup;
import net.runelite.asm.Field; import net.runelite.asm.Field;
@@ -35,31 +36,29 @@ import net.runelite.deob.DeobAnnotations;
import net.runelite.deob.Deobfuscator; import net.runelite.deob.Deobfuscator;
import net.runelite.deob.util.NameMappings; import net.runelite.deob.util.NameMappings;
import java.util.List;
public class RenameUnique implements Deobfuscator public class RenameUnique implements Deobfuscator
{ {
private Renamer renamer; private Renamer renamer;
private void generateClassNames(NameMappings map, ClassGroup group) private void generateClassNames(NameMappings map, ClassGroup group)
{ {
int i = 0; int i = 0;
for (ClassFile cf : group.getClasses()) for (ClassFile cf : group.getClasses())
{ {
if (cf.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN) if (cf.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN)
{ {
continue; continue;
} }
map.map(cf.getPoolClass(), "class" + i++); map.map(cf.getPoolClass(), "class" + i++);
} }
} }
private void generateFieldNames(NameMappings map, ClassGroup group) private void generateFieldNames(NameMappings map, ClassGroup group)
{ {
int i = 0; int i = 0;
for (ClassFile cf : group.getClasses()) for (ClassFile cf : group.getClasses())
for (Field field : cf.getFields()) for (Field field : cf.getFields())
{ {
@@ -67,7 +66,7 @@ public class RenameUnique implements Deobfuscator
{ {
continue; continue;
} }
map.map(field.getPoolField(), "field" + i++); map.map(field.getPoolField(), "field" + i++);
} }
} }
@@ -75,7 +74,7 @@ public class RenameUnique implements Deobfuscator
private void generateMethodNames(NameMappings map, ClassGroup group) private void generateMethodNames(NameMappings map, ClassGroup group)
{ {
int i = 0; int i = 0;
for (ClassFile cf : group.getClasses()) for (ClassFile cf : group.getClasses())
for (Method method : cf.getMethods()) for (Method method : cf.getMethods())
{ {
@@ -83,16 +82,16 @@ public class RenameUnique implements Deobfuscator
{ {
continue; continue;
} }
List<Method> virtualMethods = VirtualMethods.getVirtualMethods(method); List<Method> virtualMethods = VirtualMethods.getVirtualMethods(method);
assert !virtualMethods.isEmpty(); assert !virtualMethods.isEmpty();
String name; String name;
if (virtualMethods.size() == 1) if (virtualMethods.size() == 1)
name = "method" + i++; name = "method" + i++;
else else
name = "vmethod" + i++; name = "vmethod" + i++;
for (Method m : virtualMethods) for (Method m : virtualMethods)
map.map(m.getPoolMethod(), name); map.map(m.getPoolMethod(), name);
} }
@@ -103,13 +102,13 @@ public class RenameUnique implements Deobfuscator
{ {
group.buildClassGraph(); group.buildClassGraph();
group.lookup(); group.lookup();
NameMappings mappings = new NameMappings(); NameMappings mappings = new NameMappings();
this.generateClassNames(mappings, group); this.generateClassNames(mappings, group);
this.generateFieldNames(mappings, group); this.generateFieldNames(mappings, group);
this.generateMethodNames(mappings, group); this.generateMethodNames(mappings, group);
renamer = new Renamer(mappings); renamer = new Renamer(mappings);
renamer.run(group); renamer.run(group);
} }

1
deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packethandler/PacketRead.java
View File

@@ -25,7 +25,6 @@
package net.runelite.deob.deobfuscators.packethandler; package net.runelite.deob.deobfuscators.packethandler;
import java.util.Objects; import java.util.Objects;
import net.runelite.asm.Type; import net.runelite.asm.Type;
import net.runelite.asm.attributes.code.Instruction; import net.runelite.asm.attributes.code.Instruction;
import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.InstructionContext;

1
deobfuscator/src/main/java/net/runelite/gamepack/Downloader.java
View File

@@ -1,6 +1,5 @@
package net.runelite.gamepack; package net.runelite.gamepack;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;

7
http-api/src/main/java/net/runelite/http/api/ws/RuntimeTypeAdapterFactory.java
View File

@@ -16,10 +16,6 @@
package net.runelite.http.api.ws; 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.Gson;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; 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.reflect.TypeToken;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter; 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 * Adapts values whose runtime type may differ from their declaration type. This

3
http-service/src/main/java/net/runelite/http/service/util/HiscoreEndpointEditor.java
View File

@@ -26,9 +26,8 @@
package net.runelite.http.service.util; package net.runelite.http.service.util;
import net.runelite.http.api.hiscore.HiscoreEndpoint;
import java.beans.PropertyEditorSupport; import java.beans.PropertyEditorSupport;
import net.runelite.http.api.hiscore.HiscoreEndpoint;
public class HiscoreEndpointEditor extends PropertyEditorSupport public class HiscoreEndpointEditor extends PropertyEditorSupport
{ {

1
runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
View File

@@ -26,7 +26,6 @@ package net.runelite.api.widgets;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.Collection; import java.util.Collection;
import net.runelite.api.FontTypeFace; import net.runelite.api.FontTypeFace;
import net.runelite.api.Point; import net.runelite.api.Point;
import net.runelite.api.Sprite; import net.runelite.api.Sprite;

1
runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java
View File

@@ -26,7 +26,6 @@
*/ */
package net.runelite.client.plugins.aoewarnings; package net.runelite.client.plugins.aoewarnings;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.Color; import java.awt.Color;
import java.time.Instant; import java.time.Instant;

15
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java
View File

@@ -27,6 +27,13 @@
package net.runelite.client.plugins.barbarianassault; package net.runelite.client.plugins.barbarianassault;
import com.google.common.collect.ImmutableMap; 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 javax.inject.Singleton;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Perspective; 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.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil; 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 @Singleton
class AboveSceneOverlay extends Overlay class AboveSceneOverlay extends Overlay
{ {

1
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java
View File

@@ -31,7 +31,6 @@ import java.awt.Graphics2D;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Point; import net.runelite.api.Point;

9
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java
View File

@@ -26,18 +26,17 @@
package net.runelite.client.plugins.barbarianassault; package net.runelite.client.plugins.barbarianassault;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import javax.inject.Inject;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import net.runelite.client.menus.AbstractComparableEntry; import net.runelite.client.menus.AbstractComparableEntry;
import net.runelite.client.menus.MenuManager; import net.runelite.client.menus.MenuManager;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
class BarbarianAssaultMenu class BarbarianAssaultMenu
{ {
private final MenuManager menuManager; private final MenuManager menuManager;

7
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java
View File

@@ -26,15 +26,14 @@
package net.runelite.client.plugins.barbarianassault; package net.runelite.client.plugins.barbarianassault;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
@Data @Data
class Healer class Healer

1
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
View File

@@ -27,7 +27,6 @@ package net.runelite.client.plugins.barbarianassault;
import java.awt.Color; import java.awt.Color;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;

5
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java
View File

@@ -24,13 +24,12 @@
*/ */
package net.runelite.client.plugins.barbarianassault; package net.runelite.client.plugins.barbarianassault;
import lombok.AccessLevel;
import lombok.Getter;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import lombok.AccessLevel;
import lombok.Getter;
class Timer class Timer
{ {

5
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java
View File

@@ -25,14 +25,13 @@
*/ */
package net.runelite.client.plugins.barbarianassault; package net.runelite.client.plugins.barbarianassault;
import java.awt.Color;
import java.awt.image.BufferedImage;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.overlay.infobox.InfoBox; import net.runelite.client.ui.overlay.infobox.InfoBox;
import java.awt.Color;
import java.awt.image.BufferedImage;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class TimerBox extends InfoBox public class TimerBox extends InfoBox

3
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java
View File

@@ -27,6 +27,7 @@
package net.runelite.client.plugins.barbarianassault; package net.runelite.client.plugins.barbarianassault;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.awt.Color;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
@@ -35,8 +36,6 @@ import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageBuilder;
import java.awt.Color;
@Data @Data
public class Wave public class Wave
{ {

5
runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTracker.java
View File

@@ -24,14 +24,13 @@
*/ */
package net.runelite.client.plugins.bosstimetracker; 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.Color;
import java.awt.image.BufferedImage;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import net.runelite.client.ui.overlay.infobox.InfoBox;
public class BossTimeTracker extends InfoBox public class BossTimeTracker extends InfoBox
{ {

30
runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java
View File

@@ -24,29 +24,27 @@
*/ */
package net.runelite.client.plugins.bosstimetracker; 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.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.Arrays; import java.util.Arrays;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; 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.FIRE_CAPE;
import static net.runelite.api.ItemID.INFERNAL_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( @PluginDescriptor(
name = "Boss Time Tracker", name = "Boss Time Tracker",

5
runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
View File

@@ -28,7 +28,6 @@ package net.runelite.client.plugins.chatnotifications;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -41,17 +40,17 @@ import javax.inject.Singleton;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.MessageNode; import net.runelite.api.MessageNode;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.client.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
import net.runelite.api.util.Text;
import net.runelite.client.Notifier; import net.runelite.client.Notifier;
import net.runelite.client.RuneLiteProperties; import net.runelite.client.RuneLiteProperties;
import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatColorType;
import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
import net.runelite.client.events.ConfigChanged;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.api.util.Text;
@PluginDescriptor( @PluginDescriptor(
name = "Chat Notifications", name = "Chat Notifications",

13
runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounterConfig.java
View File

@@ -1,11 +1,10 @@
package net.runelite.client.plugins.combatcounter; package net.runelite.client.plugins.combatcounter;
import java.awt.Color;
import net.runelite.client.config.Alpha; import net.runelite.client.config.Alpha;
import net.runelite.client.config.Config; import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigItem;
import java.awt.*;
import net.runelite.client.config.ConfigTitleSection; import net.runelite.client.config.ConfigTitleSection;
import net.runelite.client.config.Title; import net.runelite.client.config.Title;
@@ -57,7 +56,7 @@ public interface CombatCounterConfig extends Config
{ {
return new Title(); return new Title();
} }
@Alpha @Alpha
@ConfigItem( @ConfigItem(
keyName = "selfColor", keyName = "selfColor",
@@ -70,7 +69,7 @@ public interface CombatCounterConfig extends Config
{ {
return Color.green; return Color.green;
} }
@Alpha @Alpha
@ConfigItem( @ConfigItem(
keyName = "totalColor", keyName = "totalColor",
@@ -83,7 +82,7 @@ public interface CombatCounterConfig extends Config
{ {
return Color.RED; return Color.RED;
} }
@Alpha @Alpha
@ConfigItem( @ConfigItem(
keyName = "otherColor", keyName = "otherColor",
@@ -96,7 +95,7 @@ public interface CombatCounterConfig extends Config
{ {
return Color.white; return Color.white;
} }
@Alpha @Alpha
@ConfigItem( @ConfigItem(
keyName = "bgColor", keyName = "bgColor",
@@ -109,7 +108,7 @@ public interface CombatCounterConfig extends Config
{ {
return new Color(70, 61, 50, 156); return new Color(70, 61, 50, 156);
} }
@Alpha @Alpha
@ConfigItem( @ConfigItem(
keyName = "titleColor", keyName = "titleColor",

1
runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
View File

@@ -24,7 +24,6 @@
*/ */
package net.runelite.client.plugins.equipmentinspector; package net.runelite.client.plugins.equipmentinspector;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;

13
runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java
View File

@@ -24,20 +24,19 @@
*/ */
package net.runelite.client.plugins.grotesqueguardians; package net.runelite.client.plugins.grotesqueguardians;
import java.util.ArrayList;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; 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.eventbus.EventBus;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.PluginType;
import net.runelite.client.ui.overlay.OverlayManager; 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( @PluginDescriptor(

1
runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java
View File

@@ -28,7 +28,6 @@ import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.Objects; import java.util.Objects;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;

1
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java
View File

@@ -11,7 +11,6 @@
package net.runelite.client.plugins.loottracker; package net.runelite.client.plugins.loottracker;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean; import java.lang.management.RuntimeMXBean;
import java.time.Duration; import java.time.Duration;

11
runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java
View File

@@ -25,30 +25,29 @@
package net.runelite.client.plugins.nightmarezone; package net.runelite.client.plugins.nightmarezone;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.Color; import java.awt.Color;
import java.time.Duration;
import java.time.Instant;
import java.util.Arrays; import java.util.Arrays;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import lombok.AccessLevel; import lombok.AccessLevel;
import java.time.Duration;
import java.time.Instant;
import lombok.Getter; import lombok.Getter;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.client.events.ConfigChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.util.Text;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.Notifier; import net.runelite.client.Notifier;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
import net.runelite.client.events.ConfigChanged;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.api.util.Text;
@PluginDescriptor( @PluginDescriptor(
name = "Nightmare Zone", name = "Nightmare Zone",
@@ -81,7 +80,7 @@ public class NightmareZonePlugin extends Plugin
@Getter @Getter
private int pointsPerHour; private int pointsPerHour;
private Instant nmzSessionStartTime; private Instant nmzSessionStartTime;
// This starts as true since you need to get // This starts as true since you need to get

23
runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java
View File

@@ -24,34 +24,13 @@
*/ */
package net.runelite.client.plugins.runepouch; package net.runelite.client.plugins.runepouch;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.Map; import java.util.Map;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import static net.runelite.api.ItemID.AIR_RUNE; import static net.runelite.api.ItemID.*;
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;
public enum Runes public enum Runes
{ {

1
runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java
View File

@@ -28,7 +28,6 @@
*/ */
package net.runelite.client.plugins.suppliestracker; package net.runelite.client.plugins.suppliestracker;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.ArrayDeque; import java.util.ArrayDeque;

1
runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java
View File

@@ -9,7 +9,6 @@
package net.runelite.client.plugins.wildernesslocations; package net.runelite.client.plugins.wildernesslocations;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.Color; import java.awt.Color;
import javax.inject.Inject; import javax.inject.Inject;

3
runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoOverlay.java
View File

@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
import java.awt.Polygon; import java.awt.Polygon;
import java.awt.Shape; import java.awt.Shape;
import java.util.List; import java.util.List;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.AnimationID; import net.runelite.api.AnimationID;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -40,8 +41,6 @@ import net.runelite.api.GraphicsObject;
import net.runelite.api.Perspective; import net.runelite.api.Perspective;
import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import javax.inject.Inject;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;

1
runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java
View File

@@ -32,7 +32,6 @@ import net.runelite.api.ItemID;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.client.plugins.maxhit.calculators.MagicMaxHitCalculator; import net.runelite.client.plugins.maxhit.calculators.MagicMaxHitCalculator;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;

1
runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java
View File

@@ -36,7 +36,6 @@ import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.plugins.attackstyles.WeaponType; import net.runelite.client.plugins.attackstyles.WeaponType;
import net.runelite.client.plugins.maxhit.calculators.MeleeMaxHitCalculator; import net.runelite.client.plugins.maxhit.calculators.MeleeMaxHitCalculator;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;

1
runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java
View File

@@ -36,7 +36,6 @@ import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.plugins.maxhit.attackstyle.WeaponType; import net.runelite.client.plugins.maxhit.attackstyle.WeaponType;
import net.runelite.client.plugins.maxhit.calculators.RangeMaxHitCalculator; import net.runelite.client.plugins.maxhit.calculators.RangeMaxHitCalculator;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;

7
runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java
View File

@@ -24,18 +24,17 @@
*/ */
package net.runelite.mixins; package net.runelite.mixins;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.runelite.api.Client; import net.runelite.api.Client;
import static net.runelite.api.Opcodes.RUNELITE_EXECUTE; import static net.runelite.api.Opcodes.RUNELITE_EXECUTE;
import net.runelite.api.events.ScriptCallbackEvent; 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.Copy;
import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow; import net.runelite.api.mixins.Shadow;
import net.runelite.api.widgets.JavaScriptCallback;
import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSScript; import net.runelite.rs.api.RSScript;
import net.runelite.rs.api.RSScriptEvent; import net.runelite.rs.api.RSScriptEvent;

3
runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java
View File

@@ -1,9 +1,8 @@
package net.runelite.mixins; package net.runelite.mixins;
import net.runelite.api.Sprite;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import net.runelite.api.Sprite;
import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Mixin;

1
runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java
View File

@@ -1,6 +1,5 @@
package net.runelite.mixins; package net.runelite.mixins;
import java.awt.Dimension; import java.awt.Dimension;
import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Mixin;

3
runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMixin.java
View File

@@ -1,9 +1,8 @@
package net.runelite.mixins; package net.runelite.mixins;
import net.runelite.api.Constants;
import java.awt.Container; import java.awt.Container;
import java.awt.Dimension; import java.awt.Dimension;
import net.runelite.api.Constants;
import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSClient;