From 26dd2ab70e32c1c62abc8ff85f89c4014141ec43 Mon Sep 17 00:00:00 2001
From: sotakoira <63243610+sotakoira@users.noreply.github.com>
Date: Sun, 24 Oct 2021 14:29:01 +0200
Subject: [PATCH] no more jcenter
---
.idea/jarRepositories.xml | 5 ++++
.idea/kotlinc.xml | 7 ++---
build.gradle | 26 +++++++++----------
gradle/wrapper/gradle-wrapper.properties | 2 +-
.../rat/poison/game/hooks/EntityIteration.kt | 2 +-
.../utils/extensions/StringExtensions.kt | 4 +--
6 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 19fa7a0b..23ef8a65 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index e2e07e00..66501f7d 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -3,12 +3,9 @@
-
-
-
-
-
+
+
diff --git a/build.gradle b/build.gradle
index d83e1725..1809f0b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,19 +2,20 @@ import java.nio.file.Files
import org.apache.commons.io.FileUtils
buildscript {
- ext.kotlin_version = '1.4.21'
- ext.jnaVersion = '5.6.0'
- ext.gdxVersion = '1.9.14'
+ ext.kotlin_version = '1.5.31'
+ ext.jnaVersion = '5.9.0'
+ ext.gdxVersion = '1.10.0'
ext.visuiVersion = "1.5.0"
repositories {
- jcenter()
+ mavenCentral()
+ gradlePluginPortal()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
- classpath "commons-io:commons-io:2.8.0"
+ classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.0'
+ classpath "commons-io:commons-io:2.11.0"
}
}
@@ -33,9 +34,8 @@ sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
repositories {
- jcenter()
maven { url 'https://jitpack.io' }
- maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+ gradlePluginPortal()
}
dependencies {
@@ -56,16 +56,16 @@ dependencies {
implementation group: 'org.jetbrains.kotlin', name: 'kotlin-script-util', version: kotlin_version
implementation group: 'org.jetbrains.kotlin', name: 'kotlin-compiler-embeddable', version: kotlin_version
- implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
+ implementation group: 'commons-io', name: 'commons-io', version: '2.11.0'
implementation 'com.github.ata4:ioutils:b1f26588b5'
implementation 'com.github.ata4:bspsrc:v1.3.24'
implementation group: 'it.unimi.dsi', name: 'fastutil', version: '8.4.4'
- implementation group: 'net.openhft', name: 'chronicle-core', version: '2.20.125'
- implementation "io.ktor:ktor-client-websockets:1.5.2"
- implementation "io.ktor:ktor-client-okhttp:1.5.2"
- implementation 'com.google.code.gson:gson:2.8.6'
+ implementation group: 'net.openhft', name: 'chronicle-core', version: '2.21.92'
+ implementation "io.ktor:ktor-client-websockets:1.5.4"
+ implementation "io.ktor:ktor-client-okhttp:1.5.4"
+ implementation 'com.google.code.gson:gson:2.8.8'
implementation "org.slf4j:slf4j-nop:1.7.31"
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 53722778..74dc8f66 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
#Mon Dec 02 21:43:01 CST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/rat/poison/game/hooks/EntityIteration.kt b/src/main/kotlin/rat/poison/game/hooks/EntityIteration.kt
index 16bb5abc..b2abe65f 100644
--- a/src/main/kotlin/rat/poison/game/hooks/EntityIteration.kt
+++ b/src/main/kotlin/rat/poison/game/hooks/EntityIteration.kt
@@ -78,7 +78,7 @@ private var signOnState by Delegates.observable(SignOnState.MAIN_MENU) { _, old,
//Find correct tonemap values
// File("$SETTINGS_DIRECTORY\\Data\\ToneMaps.txt").forEachLine { line ->
-// if (mapName.toLowerCase().contains(line.split(" : ")[0].toLowerCase())) {
+// if (mapName.lowercase().contains(line.split(" : ")[0].lowercase())) {
// //this is working... not needed for now
// }
// }
diff --git a/src/main/kotlin/rat/poison/utils/extensions/StringExtensions.kt b/src/main/kotlin/rat/poison/utils/extensions/StringExtensions.kt
index 4fb8beee..fda4e783 100644
--- a/src/main/kotlin/rat/poison/utils/extensions/StringExtensions.kt
+++ b/src/main/kotlin/rat/poison/utils/extensions/StringExtensions.kt
@@ -7,7 +7,7 @@ fun String.upper(): String {
val get = upperCaseCache[this]
return when (get == null) {
true -> {
- val tmpStr = this.toUpperCase()
+ val tmpStr = this.uppercase()
upperCaseCache[this] = tmpStr
tmpStr
}
@@ -20,7 +20,7 @@ fun String.lower(): String {
val get = lowerCaseCache[this]
return when (get == null) {
true -> {
- val tmpStr = this.toLowerCase()
+ val tmpStr = this.lowercase()
lowerCaseCache[this] = tmpStr
tmpStr
}