Merge pull request #18 from Displee/develop

Develop

build.gradle

@@ -1,8 +1,7 @@
 buildscript {
-    ext.kotlin_version = '1.4.31'
-    ext.jetty_version = '9.4.7.v20170914'
+    ext.kotlin_version = '1.9.22'
+    ext.jetty_version = '12.0.4'
     repositories {
-        jcenter()
         mavenCentral()
     }
     dependencies {
@@ -16,11 +15,9 @@ plugins {
 }
 
 archivesBaseName = 'cs2-editor'
-
-version = '1.3'
+version = '1.5'
 
 repositories {
-    jcenter()
     mavenCentral()
 }
 
@@ -37,11 +34,11 @@ compileTestKotlin {
 }
 
 dependencies {
-    compile fileTree(dir: 'lib', include: '*.jar')
+    implementation fileTree(dir: 'lib', include: '*.jar')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
     implementation 'com.displee:disio:2.2'
-    implementation 'com.displee:rs-cache-library:6.5'
+    implementation 'com.displee:rs-cache-library:7.1.0'
 
     implementation "org.eclipse.jetty:jetty-io:$jetty_version"
     implementation "org.eclipse.jetty:jetty-server:$jetty_version"
@@ -50,10 +47,10 @@ dependencies {
     implementation 'javax.servlet:javax.servlet-api:3.1.0'
 
     implementation 'org.fxmisc.richtext:richtextfx:0.10.5'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'org.apache.commons:commons-lang3:3.10'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
 }
 
 compileJava.options.encoding = 'UTF-8'
@@ -64,6 +61,7 @@ tasks.withType(JavaCompile) {
 
 jar {
     destinationDirectory = file("$rootDir")
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes 'Main-Class': 'com.displee.editor.Editor'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Fri Jun 12 00:09:33 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

src/main/resources/cs2/opcode/database/osrs.ini

@@ -1,3 +1,6 @@
+49 getVarcString string
+50 setVarcString void string arg0
+
 74 getVarClanSetting int
 76 getVarClan int
 
@@ -603,6 +606,12 @@
 
 3157 cs2method3157 void int arg0 int arg1
 
+3170 cs2method3170 int
+
+3177 cs2method3177 void
+
+3179 cs2method3179 void
+
 3181 cs2method3181 void int arg0
 
 3182 cs2method3182 int
@@ -1011,6 +1020,10 @@
 
 4029 cs2method4029 int int arg0 int arg1 int arg2
 
+4030 setBitRangeToInt int int arg0 int arg1 int arg2 int arg3
+
+4035 abs int int arg0
+
 4100 concat string string arg1 int arg0
 
 4101 concat string string arg0 string arg1
@@ -1793,6 +1806,10 @@
 
 7103 hasJagtheoraLib boolean
 
+7104 cs2method7104 int
+
+7105 cs2method7105 int
+
 7108 cs2method7108 boolean
 
 7109 cs2method7109 int

src/main/resources/cs2/opcode/unscramble/179.txt

@@ -28,6 +28,7 @@
 # !!! varcstring opcodes changed?
 47 49
 48 50
+49 49
 51 60
 74 74
 76 76
@@ -41,9 +42,11 @@
 200 200
 201 201
 202 202
+203 203
 
 1000 1000
 1001 1001
+1050 1050
 21121 1121
 21122 1122
 21123 1123
@@ -592,6 +595,7 @@
 4018 4018
 4019 4019
 4020 4020
+4035 4035
 4100 4100
 4101 4101
 4102 4102
@@ -818,6 +822,7 @@
 6221 6221
 6222 6222
 6223 6223
+6230 6230
 6300 6300
 6301 6301
 6302 6302
@@ -876,6 +881,8 @@
 7101 7101
 7102 7102
 7103 7103
+7104 7104
+7105 7105
 7201 7201
 7202 7202
 7203 7203
@@ -997,6 +1004,10 @@
 
 2928 2928
 3157 3157
+3170 3170
+3177 3177
+3179 3179
+39 3180
 3182 3182
 3183 3183
 3184 3184
@@ -1008,6 +1019,7 @@
 5312 5312
 6527 6527
 6754 6754
+6758 6758
 6851 6851
 6852 6852
 6950 6950
@@ -1049,6 +1061,7 @@
 7250 7250
 7252 7252
 4029 4029
+4030 4030
 6751 6751
 6752 6752
 6753 6753
@@ -1062,5 +1075,13 @@
 1616 1616
 3326 3326
 3327 3327
+3328 3328
+3329 3329
 3330 3330
 6706 6706
+7451 7451
+7453 7453
+7454 7454
+7455 7455
+7456 7456
+7460 7460