diff --git a/.gitignore b/.gitignore
index 28626d1e7c..8d06d7383a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,8 @@ classes/artifacts/client_jar/run.bat
classes/artifacts/client_jar/client.jar
*.jar
.live/
+*/build/
+*/out/
+.gradle/
+runelite-client/src/main/resources/runelite/*
+.staging/
\ No newline at end of file
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
deleted file mode 100644
index 67bd169f31..0000000000
--- a/.mvn/jvm.config
+++ /dev/null
@@ -1 +0,0 @@
--Xmx512m
diff --git a/.travis.yml b/.travis.yml
index 9f3f35a358..b723f6b1dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+install: gradle wrapper --gradle-version 4.2
language: java
sudo: false
dist: trusty
@@ -6,7 +7,6 @@ cache:
- $HOME/.m2
jdk:
- oraclejdk8
-install: true
script: ./travis/build.sh
before_install:
- chmod +x ./travis/build.sh
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..75acf95849
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,34 @@
+allprojects {
+ apply plugin: 'maven'
+ apply plugin: 'checkstyle'
+
+ group = 'net.runelite'
+version = '1.5.30-SNAPSHOT'
+}
+
+subprojects {
+ apply plugin: 'java'
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
+ tasks.withType(JavaCompile) {
+ options.encoding = 'UTF-8'
+ }
+
+
+ repositories {
+ mavenLocal()
+
+ maven { url "http://repo1.maven.org/maven2" }
+ maven { url "http://repo.runelite.net" }
+ maven { url "http://repo.maven.apache.org/maven2" }
+ maven { url "https://raw.githubusercontent.com/runelite-extended/maven-repo/master" }
+ }
+
+ checkstyle {
+ toolVersion = '6.4.1'
+ sourceSets = [sourceSets.main]
+ configFile = rootProject.file("./checkstyle/checkstyle.xml");
+ showViolations = true
+ ignoreFailures = false
+ }
+}
diff --git a/cache-client/build.gradle b/cache-client/build.gradle
new file mode 100644
index 0000000000..a0a33cd5e9
--- /dev/null
+++ b/cache-client/build.gradle
@@ -0,0 +1,9 @@
+
+description = 'Cache Client'
+dependencies {
+ compile project(':cache')
+ compile project(':protocol')
+ testCompile group: 'junit', name: 'junit', version:'4.12'
+ testCompile group: 'org.slf4j', name: 'slf4j-simple', version:'1.7.26'
+ testCompile project(':cache')
+}
diff --git a/cache-client/pom.xml b/cache-client/pom.xml
deleted file mode 100644
index 9567f997d3..0000000000
--- a/cache-client/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
The default implementation does nothing.
+ */ + @Override + public void enterProg(rs2asmParser.ProgContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitProg(rs2asmParser.ProgContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterHeader(rs2asmParser.HeaderContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitHeader(rs2asmParser.HeaderContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterId(rs2asmParser.IdContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitId(rs2asmParser.IdContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterInt_stack_count(rs2asmParser.Int_stack_countContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitInt_stack_count(rs2asmParser.Int_stack_countContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterString_stack_count(rs2asmParser.String_stack_countContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitString_stack_count(rs2asmParser.String_stack_countContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterInt_var_count(rs2asmParser.Int_var_countContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitInt_var_count(rs2asmParser.Int_var_countContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterString_var_count(rs2asmParser.String_var_countContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitString_var_count(rs2asmParser.String_var_countContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterId_value(rs2asmParser.Id_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitId_value(rs2asmParser.Id_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterInt_stack_value(rs2asmParser.Int_stack_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitInt_stack_value(rs2asmParser.Int_stack_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterString_stack_value(rs2asmParser.String_stack_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitString_stack_value(rs2asmParser.String_stack_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterInt_var_value(rs2asmParser.Int_var_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitInt_var_value(rs2asmParser.Int_var_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterString_var_value(rs2asmParser.String_var_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitString_var_value(rs2asmParser.String_var_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterLine(rs2asmParser.LineContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitLine(rs2asmParser.LineContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterInstruction(rs2asmParser.InstructionContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitInstruction(rs2asmParser.InstructionContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterLabel(rs2asmParser.LabelContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitLabel(rs2asmParser.LabelContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterInstruction_name(rs2asmParser.Instruction_nameContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitInstruction_name(rs2asmParser.Instruction_nameContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterName_string(rs2asmParser.Name_stringContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitName_string(rs2asmParser.Name_stringContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterName_opcode(rs2asmParser.Name_opcodeContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitName_opcode(rs2asmParser.Name_opcodeContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterInstruction_operand(rs2asmParser.Instruction_operandContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitInstruction_operand(rs2asmParser.Instruction_operandContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterOperand_int(rs2asmParser.Operand_intContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitOperand_int(rs2asmParser.Operand_intContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterOperand_qstring(rs2asmParser.Operand_qstringContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitOperand_qstring(rs2asmParser.Operand_qstringContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterOperand_label(rs2asmParser.Operand_labelContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitOperand_label(rs2asmParser.Operand_labelContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterSwitch_lookup(rs2asmParser.Switch_lookupContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitSwitch_lookup(rs2asmParser.Switch_lookupContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterSwitch_key(rs2asmParser.Switch_keyContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitSwitch_key(rs2asmParser.Switch_keyContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterSwitch_value(rs2asmParser.Switch_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitSwitch_value(rs2asmParser.Switch_valueContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void visitTerminal(TerminalNode node) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void visitErrorNode(ErrorNode node) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void enterEveryRule(ParserRuleContext ctx) + { + } + + /** + * {@inheritDoc} + * + *The default implementation does nothing.
+ */ + @Override + public void exitEveryRule(ParserRuleContext ctx) + { + } +} \ No newline at end of file diff --git a/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.java b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.java new file mode 100644 index 0000000000..15055397fd --- /dev/null +++ b/cache/src/main/java/net/runelite/cache/script/assembler/rs2asmLexer.java @@ -0,0 +1,171 @@ +// Generated from net\runelite\cache\script\assembler\rs2asm.g4 by ANTLR 4.6 +package net.runelite.cache.script.assembler; + +import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.Lexer; +import org.antlr.v4.runtime.RuntimeMetaData; +import org.antlr.v4.runtime.Vocabulary; +import org.antlr.v4.runtime.VocabularyImpl; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.LexerATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; +import org.antlr.v4.runtime.dfa.DFA; + +@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) +public class rs2asmLexer extends Lexer +{ + public static final int + T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, NEWLINE = 7, INT = 8, QSTRING = 9, + IDENTIFIER = 10, COMMENT = 11, WS = 12; + public static final String[] ruleNames = { + "T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "NEWLINE", "INT", "QSTRING", + "IDENTIFIER", "COMMENT", "WS" + }; + /** + * @deprecated Use {@link #VOCABULARY} instead. + */ + @Deprecated + public static final String[] tokenNames; + public static final String _serializedATN = + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2\16\u0099\b\1\4\2" + + "\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4" + + "\13\t\13\4\f\t\f\4\r\t\r\3\2\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3" + + "\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4" + + "\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\5\3\5\3" + + "\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6" + + "\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3" + + "\b\6\bn\n\b\r\b\16\bo\3\t\5\ts\n\t\3\t\6\tv\n\t\r\t\16\tw\3\n\3\n\3\n" + + "\3\n\7\n~\n\n\f\n\16\n\u0081\13\n\3\n\3\n\3\13\6\13\u0086\n\13\r\13\16" + + "\13\u0087\3\f\3\f\7\f\u008c\n\f\f\f\16\f\u008f\13\f\3\f\3\f\3\r\6\r\u0094" + + "\n\r\r\r\16\r\u0095\3\r\3\r\2\2\16\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n" + + "\23\13\25\f\27\r\31\16\3\2\b\4\2\f\f\17\17\3\2\62;\6\2\f\f\17\17$$^^\4" + + "\2$$^^\6\2\62;C\\aac|\4\2\13\13\"\"\u00a0\2\3\3\2\2\2\2\5\3\2\2\2\2\7" + + "\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2" + + "\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\3\33\3\2\2\2\5" + + " \3\2\2\2\7\62\3\2\2\2\tG\3\2\2\2\13W\3\2\2\2\rj\3\2\2\2\17m\3\2\2\2\21" + + "r\3\2\2\2\23y\3\2\2\2\25\u0085\3\2\2\2\27\u0089\3\2\2\2\31\u0093\3\2\2" + + "\2\33\34\7\60\2\2\34\35\7k\2\2\35\36\7f\2\2\36\37\7\"\2\2\37\4\3\2\2\2" + + " !\7\60\2\2!\"\7k\2\2\"#\7p\2\2#$\7v\2\2$%\7a\2\2%&\7u\2\2&\'\7v\2\2\'" + + "(\7c\2\2()\7e\2\2)*\7m\2\2*+\7a\2\2+,\7e\2\2,-\7q\2\2-.\7w\2\2./\7p\2" + + "\2/\60\7v\2\2\60\61\7\"\2\2\61\6\3\2\2\2\62\63\7\60\2\2\63\64\7u\2\2\64" + + "\65\7v\2\2\65\66\7t\2\2\66\67\7k\2\2\678\7p\2\289\7i\2\29:\7a\2\2:;\7" + + "u\2\2;<\7v\2\2<=\7c\2\2=>\7e\2\2>?\7m\2\2?@\7a\2\2@A\7e\2\2AB\7q\2\2B" + + "C\7w\2\2CD\7p\2\2DE\7v\2\2EF\7\"\2\2F\b\3\2\2\2GH\7\60\2\2HI\7k\2\2IJ" + + "\7p\2\2JK\7v\2\2KL\7a\2\2LM\7x\2\2MN\7c\2\2NO\7t\2\2OP\7a\2\2PQ\7e\2\2" + + "QR\7q\2\2RS\7w\2\2ST\7p\2\2TU\7v\2\2UV\7\"\2\2V\n\3\2\2\2WX\7\60\2\2X" + + "Y\7u\2\2YZ\7v\2\2Z[\7t\2\2[\\\7k\2\2\\]\7p\2\2]^\7i\2\2^_\7a\2\2_`\7x" + + "\2\2`a\7c\2\2ab\7t\2\2bc\7a\2\2cd\7e\2\2de\7q\2\2ef\7w\2\2fg\7p\2\2gh" + + "\7v\2\2hi\7\"\2\2i\f\3\2\2\2jk\7<\2\2k\16\3\2\2\2ln\t\2\2\2ml\3\2\2\2" + + "no\3\2\2\2om\3\2\2\2op\3\2\2\2p\20\3\2\2\2qs\7/\2\2rq\3\2\2\2rs\3\2\2" + + "\2su\3\2\2\2tv\t\3\2\2ut\3\2\2\2vw\3\2\2\2wu\3\2\2\2wx\3\2\2\2x\22\3\2" + + "\2\2y\177\7$\2\2z~\n\4\2\2{|\7^\2\2|~\t\5\2\2}z\3\2\2\2}{\3\2\2\2~\u0081" + + "\3\2\2\2\177}\3\2\2\2\177\u0080\3\2\2\2\u0080\u0082\3\2\2\2\u0081\177" + + "\3\2\2\2\u0082\u0083\7$\2\2\u0083\24\3\2\2\2\u0084\u0086\t\6\2\2\u0085" + + "\u0084\3\2\2\2\u0086\u0087\3\2\2\2\u0087\u0085\3\2\2\2\u0087\u0088\3\2" + + "\2\2\u0088\26\3\2\2\2\u0089\u008d\7=\2\2\u008a\u008c\n\2\2\2\u008b\u008a" + + "\3\2\2\2\u008c\u008f\3\2\2\2\u008d\u008b\3\2\2\2\u008d\u008e\3\2\2\2\u008e" + + "\u0090\3\2\2\2\u008f\u008d\3\2\2\2\u0090\u0091\b\f\2\2\u0091\30\3\2\2" + + "\2\u0092\u0094\t\7\2\2\u0093\u0092\3\2\2\2\u0094\u0095\3\2\2\2\u0095\u0093" + + "\3\2\2\2\u0095\u0096\3\2\2\2\u0096\u0097\3\2\2\2\u0097\u0098\b\r\2\2\u0098" + + "\32\3\2\2\2\13\2orw}\177\u0087\u008d\u0095\3\2\3\2"; + public static final ATN _ATN = + new ATNDeserializer().deserialize(_serializedATN.toCharArray()); + protected static final DFA[] _decisionToDFA; + protected static final PredictionContextCache _sharedContextCache = + new PredictionContextCache(); + private static final String[] _LITERAL_NAMES = { + null, "'.id '", "'.int_stack_count '", "'.string_stack_count '", "'.int_var_count '", + "'.string_var_count '", "':'" + }; + private static final String[] _SYMBOLIC_NAMES = { + null, null, null, null, null, null, null, "NEWLINE", "INT", "QSTRING", + "IDENTIFIER", "COMMENT", "WS" + }; + public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); + public static String[] modeNames = { + "DEFAULT_MODE" + }; + + static + { + RuntimeMetaData.checkVersion("4.6", RuntimeMetaData.VERSION); + } + + static + { + tokenNames = new String[_SYMBOLIC_NAMES.length]; + for (int i = 0; i < tokenNames.length; i++) + { + tokenNames[i] = VOCABULARY.getLiteralName(i); + if (tokenNames[i] == null) + { + tokenNames[i] = VOCABULARY.getSymbolicName(i); + } + + if (tokenNames[i] == null) + { + tokenNames[i] = "* When the client initially logs in, this event is called for all grand - * exchange slots with the {@link GrandExchangeOfferState#EMPTY} state, + * exchange slots with the {GrandExchangeOfferState#EMPTY} state, * regardless of whether any slots have offers. Once the exchange is * initialized, the client then updates any offers with items as it * receives information from the server. *
- * See {@link GrandExchangeOfferState} for potential states an offer + * See {GrandExchangeOfferState} for potential states an offer * can change into. */ @Data diff --git a/runelite-api/src/main/java/net/runelite/api/kit/KitType.java b/runelite-api/src/main/java/net/runelite/api/kit/KitType.java index 57d09251b0..2ecfa411e0 100644 --- a/runelite-api/src/main/java/net/runelite/api/kit/KitType.java +++ b/runelite-api/src/main/java/net/runelite/api/kit/KitType.java @@ -24,15 +24,13 @@ */ package net.runelite.api.kit; -import net.runelite.api.PlayerAppearance; - /** * Represents an equipment slot in a players composition. *
- * These values are intended for use with {@link PlayerAppearance} equipment
+ * These values are intended for use with {PlayerAppearance} equipment
* slots. For obtaining information about equipment in the local players
- * equipment {@link net.runelite.api.ItemContainer}, use
- * {@link net.runelite.api.EquipmentInventorySlot}.
+ * equipment {net.runelite.api.ItemContainer}, use
+ * {net.runelite.api.EquipmentInventorySlot}.
*/
public enum KitType
{
@@ -61,7 +59,7 @@ public enum KitType
}
/**
- * Gets the raw equipment index for use in {@link PlayerAppearance#getEquipmentIds()}.
+ * Gets the raw equipment index for use in {PlayerAppearance#getEquipmentIds()}.
*
* @return raw equipment index
*/
diff --git a/runelite-api/src/main/java/net/runelite/api/vars/InputType.java b/runelite-api/src/main/java/net/runelite/api/vars/InputType.java
index 020063a12c..1721fcb8db 100644
--- a/runelite-api/src/main/java/net/runelite/api/vars/InputType.java
+++ b/runelite-api/src/main/java/net/runelite/api/vars/InputType.java
@@ -24,12 +24,11 @@
*/
package net.runelite.api.vars;
-import net.runelite.api.VarClientInt;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * An enumeration of input types for {@link VarClientInt#INPUT_TYPE}.
+ * An enumeration of input types for {VarClientInt#INPUT_TYPE}.
*/
@Getter
@RequiredArgsConstructor
diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java b/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
index 8a4633d38c..07f7c4c52d 100644
--- a/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
@@ -29,7 +29,6 @@ import java.util.Collection;
import net.runelite.api.FontTypeFace;
import net.runelite.api.Point;
-import net.runelite.api.SpriteID;
/**
* Represents an on-screen UI element that is drawn on the canvas.
@@ -254,7 +253,7 @@ public interface Widget
* Gets the sprite ID displayed in the widget.
*
* @return the sprite ID
- * @see SpriteID
+ * SpriteID
*/
int getSpriteId();
@@ -262,7 +261,7 @@ public interface Widget
* Sets the sprite ID displayed in the widget.
*
* @param spriteId the sprite ID
- * @see SpriteID
+ * SpriteID
*/
void setSpriteId(int spriteId);
diff --git a/runelite-client/build.gradle b/runelite-client/build.gradle
new file mode 100644
index 0000000000..e4adb69553
--- /dev/null
+++ b/runelite-client/build.gradle
@@ -0,0 +1,49 @@
+
+description = 'RuneLite Client'
+dependencies {
+ compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25'
+ compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.3'
+ compile group: 'net.sf.jopt-simple', name: 'jopt-simple', version:'5.0.1'
+ compile group: 'com.google.guava', name: 'guava', version:'28.0-jre'
+ compile group: 'com.google.inject', name: 'guice', version:'4.1.0', classifier:'no_aop'
+ compile group: 'com.google.code.gson', name: 'gson', version:'2.8.5'
+ compile group: 'net.runelite.pushingpixels', name: 'substance', version:'8.0.02'
+ compile group: 'org.apache.commons', name: 'commons-text', version:'1.2'
+ compile group: 'org.jogamp.jogl', name: 'jogl-all', version:'2.3.2'
+ compile group: 'org.jogamp.gluegen', name: 'gluegen-rt', version:'2.3.2'
+ compile(group: 'io.sigpipe', name: 'jbsdiff', version:'1.0') {
+exclude(module: 'xz')
+ }
+ compile group: 'net.java.dev.jna', name: 'jna', version:'4.5.1'
+ compile group: 'net.java.dev.jna', name: 'jna-platform', version:'4.5.1'
+ compile project(':runelite-api')
+ compile project(':http-api')
+ compile group: 'net.runelite', name: 'discord', version:'1.1'
+ compile group: 'org.javassist', name: 'javassist', version:'3.25.0-GA'
+ compile group: 'org.xeustechnologies', name: 'jcl-core', version:'2.8'
+ compile group: 'org.jetbrains', name: 'annotations', version:'17.0.0'
+ compile group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version:'[1.0.0,)'
+ compile group: 'org.ow2.asm', name: 'asm-all', version:'6.0_BETA'
+ compile group: 'org.codehaus.plexus', name: 'plexus-utils', version:'3.2.0'
+ compile group: 'org.apache.httpcomponents', name: 'httpcore', version:'4.4.11'
+ compile group: 'org.apache.httpcomponents', name: 'httpmime', version:'4.5.9'
+ compile group: 'io.reactivex.rxjava2', name: 'rxjava', version:'2.2.10'
+ compile group: 'com.jakewharton.rxrelay2', name: 'rxrelay', version:'2.1.0'
+ runtime group: 'net.runelite.pushingpixels', name: 'trident', version:'1.5.00'
+ runtime group: 'org.jogamp.jogl', name: 'jogl-all', version:'2.3.2', classifier:'natives-windows-amd64'
+ runtime group: 'org.jogamp.jogl', name: 'jogl-all', version:'2.3.2', classifier:'natives-windows-i586'
+ runtime group: 'org.jogamp.jogl', name: 'jogl-all', version:'2.3.2', classifier:'natives-linux-amd64'
+ runtime group: 'org.jogamp.jogl', name: 'jogl-all', version:'2.3.2', classifier:'natives-linux-i586'
+ runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version:'2.3.2', classifier:'natives-windows-amd64'
+ runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version:'2.3.2', classifier:'natives-windows-i586'
+ runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version:'2.3.2', classifier:'natives-linux-amd64'
+ runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version:'2.3.2', classifier:'natives-linux-i586'
+ runtime project(':runescape-api')
+ testCompile group: 'junit', name: 'junit', version:'4.12'
+ testCompile group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3'
+ testCompile group: 'org.mockito', name: 'mockito-all', version:'1.10.19'
+ testCompile group: 'com.google.inject.extensions', name: 'guice-testlib', version:'4.1.0'
+ testCompile group: 'com.google.inject.extensions', name: 'guice-grapher', version:'4.1.0'
+ compileOnly group: 'org.projectlombok', name: 'lombok', version:'1.18.8'
+ compileOnly group: 'net.runelite', name: 'orange-extensions', version:'1.0'
+}
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
deleted file mode 100644
index 1363d27664..0000000000
--- a/runelite-client/pom.xml
+++ /dev/null
@@ -1,457 +0,0 @@
-
-
-RUN_ENERGY.
- *
- * @see Stats
*/
public abstract class Stat
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java
index c64dacff12..bcf779909b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java
@@ -9,7 +9,6 @@
package net.runelite.client.plugins.pvptools;
-import com.google.common.base.MoreObjects;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Font;
@@ -21,7 +20,6 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
import lombok.extern.slf4j.Slf4j;
-import net.runelite.client.RuneLiteProperties;
import net.runelite.client.plugins.info.JRichTextPane;
import net.runelite.client.ui.ColorScheme;
import net.runelite.client.ui.FontManager;
@@ -94,10 +92,6 @@ class PvpToolsPanel extends PluginPanel
revision.setText("Oldschool revision: ");
- JLabel launcher = new JLabel(htmlLabel("Launcher version: ", MoreObjects
- .firstNonNull(RuneLiteProperties.getLauncherVersion(), "Unknown")));
- launcher.setFont(smallFont);
-
loggedLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR);
loggedLabel.setFont(smallFont);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java
index aa770f37f8..f4be604917 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java
@@ -34,7 +34,6 @@ import java.io.Reader;
import java.util.Arrays;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import net.runelite.api.Client;
class Skybox
{
@@ -43,8 +42,6 @@ class Skybox
{
/**
* Gets the instance template chunk data for the specified point
- *
- * @see Client#getInstanceTemplateChunks
*/
int getTemplateChunk(int cx, int cy, int plane);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java
index 3694512f1e..9fca35f0c6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java
@@ -57,11 +57,11 @@ import net.runelite.client.eventbus.EventBus;
import net.runelite.client.input.MouseManager;
import net.runelite.client.menus.MenuManager;
import net.runelite.client.menus.WidgetMenuOption;
-import static net.runelite.client.util.MiscUtils.clamp;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
import net.runelite.client.ui.overlay.OverlayManager;
+import static net.runelite.client.util.MiscUtils.clamp;
import net.runelite.client.util.Text;
@PluginDescriptor(
@@ -87,15 +87,7 @@ public class SpellbookPlugin extends Plugin
private static final WidgetMenuOption RESIZABLE_MAGIC_TAB_UNLOCK = new WidgetMenuOption(UNLOCK, MENU_TARGET, WidgetInfo.RESIZABLE_VIEWPORT_MAGIC_TAB);
private static final WidgetMenuOption RESIZABLE_BOTTOM_LINE_MAGIC_TAB_LOCK = new WidgetMenuOption(LOCK, MENU_TARGET, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_MAGIC_TAB);
private static final WidgetMenuOption RESIZABLE_BOTTOM_LINE_MAGIC_TAB_UNLOCK = new WidgetMenuOption(UNLOCK, MENU_TARGET, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_MAGIC_TAB);
-
- private enum WordFilterMode
- {
- CONTAINS,
- EQUALS,
- STARTSWITH,
- ENDSWITH
- }
-
+ private final Map>() {}.getType());
+ Collection
>()
+ {
+ }.getType());
// CHECKSTYLE:ON
gson.stream().filter(Objects::nonNull).forEach(s -> spells.put(s.getWidget(), s));
@@ -509,24 +523,6 @@ public class SpellbookPlugin extends Plugin
);
}
- private static WordFilterMode getFilterMode(String s)
- {
- if (!s.contains("\""))
- {
- return WordFilterMode.CONTAINS;
- }
- if (s.startsWith("\""))
- {
- return s.endsWith("\"") ? WordFilterMode.EQUALS : WordFilterMode.STARTSWITH;
- }
- else if (s.endsWith("\""))
- {
- return WordFilterMode.ENDSWITH;
- }
-
- return WordFilterMode.CONTAINS; // but probably null soz
- }
-
boolean isNotOnSpellWidget(java.awt.Point point)
{
Widget boundsWidget = client.getWidget(WidgetInfo.SPELLBOOK_FILTERED_BOUNDS);
@@ -712,11 +708,6 @@ public class SpellbookPlugin extends Plugin
runRebuild();
}
- private static String removeFlyingComma(String s)
- {
- return s.replaceAll("\"", "");
- }
-
private int trueSize(Spell s)
{
return s.getSize() * 2 + this.size;
@@ -730,4 +721,12 @@ public class SpellbookPlugin extends Plugin
this.size = config.size();
this.filter = config.filter();
}
+
+ private enum WordFilterMode
+ {
+ CONTAINS,
+ EQUALS,
+ STARTSWITH,
+ ENDSWITH
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java
index 1427745ea0..66a388e9bf 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java
@@ -128,7 +128,7 @@ public class RuneLiteSplashScreen
panel.add(version, versionConstraints);
// version
- final JLabel litVersion = new JLabel("Plus Version : " + RuneLite.RUNELIT_VERSION);
+ final JLabel litVersion = new JLabel("Plus Version : " + RuneLite.PLUS_VERSION);
litVersion.setForeground(Color.GREEN);
litVersion.setFont(FontManager.getRunescapeSmallFont());
litVersion.setForeground(litVersion.getForeground().darker());
diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java
index f0c756804e..ccbc6dc57e 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java
@@ -318,29 +318,29 @@ public class Bootstrap
//Dynamic artifacts
artifacts[3] = new Artifact();
artifacts[3].name = "client-" + RuneLiteAPI.getVersion() + ".jar";
- artifacts[3].hash = getChecksumFile("./runelite-client/target/" + artifacts[3].name);
- artifacts[3].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[3].name;
+ artifacts[3].hash = getChecksumFile("./runelite-client/build/libs/" + artifacts[3].name);
+ artifacts[3].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master" + Bootstrapper.remoteLocation + artifacts[3].name;
artifacts[3].size = Long.toString(getFileSize("./runelite-client/target/" + artifacts[3].name));
- copyTodir("./runelite-client/target/" + artifacts[3].name, "./live/");
+ copyTodir("./runelite-client/build/libs/" + artifacts[3].name, Bootstrapper.localLocation);
artifacts[35] = new Artifact();
artifacts[35].name = "runelite-api-" + RuneLiteAPI.getVersion() + ".jar";
- artifacts[35].hash = getChecksumFile("./runelite-api/target/" + artifacts[35].name);
- artifacts[35].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[35].name;
+ artifacts[35].hash = getChecksumFile("./runelite-api/build/libs/" + artifacts[35].name);
+ artifacts[35].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/" + Bootstrapper.remoteLocation + artifacts[35].name;
artifacts[35].size = Long.toString(getFileSize("./runelite-api/target/" + artifacts[35].name));
- copyTodir("./runelite-api/target/" + artifacts[35].name, "./live/");
+ copyTodir("./runelite-api/build/libs/" + artifacts[35].name, Bootstrapper.localLocation);
artifacts[36] = new Artifact();
artifacts[36].name = "runescape-api-" + RuneLiteAPI.getVersion() + ".jar";
- artifacts[36].hash = getChecksumFile("./runescape-api/target/" + artifacts[36].name);
- artifacts[36].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[36].name;
+ artifacts[36].hash = getChecksumFile("./runescape-api/build/libs/" + artifacts[36].name);
+ artifacts[36].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/" + Bootstrapper.remoteLocation + artifacts[36].name;
artifacts[36].size = Long.toString(getFileSize("./runescape-api/target/" + artifacts[36].name));
- copyTodir("./runescape-api/target/" + artifacts[36].name, "./live/");
+ copyTodir("./runescape-api/build/libs/" + artifacts[36].name, Bootstrapper.localLocation);
artifacts[37] = new Artifact();
artifacts[37].name = "http-api-" + RuneLiteAPI.getVersion() + ".jar";
- artifacts[37].hash = getChecksumFile("./http-api/target/" + artifacts[37].name);
- artifacts[37].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[37].name;
+ artifacts[37].hash = getChecksumFile("./http-api/build/libs/" + artifacts[37].name);
+ artifacts[37].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/" + Bootstrapper.remoteLocation + artifacts[37].name;
artifacts[37].size = Long.toString(getFileSize("./http-api/target/" + artifacts[37].name));
- copyTodir("./http-api/target/" + artifacts[37].name, "./live/");
- copyTodir("./injected-client/target/injected-client-" + RuneLiteAPI.getVersion() + ".jar", "./live/");
+ copyTodir("./http-api/build/libs/" + artifacts[37].name, Bootstrapper.localLocation);
+ copyTodir("./injected-client/build/libs/injected-client-" + RuneLiteAPI.getVersion() + ".jar", Bootstrapper.localLocation);
}
catch (IOException | NoSuchAlgorithmException e)
{
diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java
index 7e21bed246..0911f44260 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java
@@ -2,26 +2,49 @@ package net.runelite.client.util.bootstrap;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-
import java.io.File;
import java.io.FileWriter;
public class Bootstrapper
{
+ public static String remoteLocation;
+ public static String localLocation;
+
public static void main(String[] args)
{
- Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
- File dir = new File("./live/");
- dir.mkdir();
- try (FileWriter fw = new FileWriter("./live/bootstrap.json"))
- {
- gson.toJson(new Bootstrap(), fw);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ if (args.length > 0)
+ {
+ remoteLocation = "/staging/";
+ localLocation = "./staging/";
+ Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
+ File dir = new File("./staging/");
+ dir.mkdir();
+ try (FileWriter fw = new FileWriter("./staging/bootstrap-staging.json"))
+ {
+ gson.toJson(new Bootstrap(), fw);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ else
+ {
+ remoteLocation = "/live/";
+ localLocation = "./live/";
+ Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
+ File dir = new File("./live/");
+ dir.mkdir();
+ try (FileWriter fw = new FileWriter("./live/bootstrap.json"))
+ {
+ gson.toJson(new Bootstrap(), fw);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
}
}
diff --git a/runelite-mixins/build.gradle b/runelite-mixins/build.gradle
new file mode 100644
index 0000000000..198b761f2a
--- /dev/null
+++ b/runelite-mixins/build.gradle
@@ -0,0 +1,10 @@
+
+description = 'RuneLite Mixins'
+dependencies {
+ testCompile group: 'junit', name: 'junit', version:'4.12'
+ testCompile group: 'org.mockito', name: 'mockito-all', version:'1.10.19'
+ compileOnly group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25'
+ compile project(':runescape-api')
+ compileOnly group: 'com.google.guava', name: 'guava', version:'28.0-jre'
+ compileOnly group: 'javax.inject', name: 'javax.inject', version:'1'
+}
diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml
deleted file mode 100644
index d359e592da..0000000000
--- a/runelite-mixins/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-