From 5772100967eaf3c5a57e3dc0cea9ae6df996dff5 Mon Sep 17 00:00:00 2001 From: Erdragh Date: Sat, 1 Jun 2024 12:41:36 +0200 Subject: [PATCH 1/4] Add custom project icon --- .idea/icon.svg | 241 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 241 insertions(+) create mode 100644 .idea/icon.svg diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 0000000..45bc5db --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d680cb5da158f7e87ef20396ee34b659f5259979 Mon Sep 17 00:00:00 2001 From: Erdragh Date: Sat, 1 Jun 2024 13:31:28 +0200 Subject: [PATCH 2/4] Update to Gradle 8.8 --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cee8b1b..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..b740cf1 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. From 0eae5ff1ae1164e2175189d6c0dd1c47477b65f9 Mon Sep 17 00:00:00 2001 From: Erdragh Date: Sat, 1 Jun 2024 21:55:37 +0200 Subject: [PATCH 3/4] Fix tps command --- CHANGELOG.md | 3 +++ .../kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt | 4 ++-- gradle.properties | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f964d3..03f3705 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.5.2 +Fix tps command using wrong numbers for calculation + # 1.5.0 - Introduce webhook chat sync, allowing for user imitation diff --git a/common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt b/common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt index 029ef64..985e14b 100644 --- a/common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt +++ b/common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt @@ -127,12 +127,12 @@ class MinecraftHandler(private val server: MinecraftServer) : ListenerAdapter() */ fun tickReport(): String { // Idea from the TPSCommand in Forge - return AstralBotTextConfig.TICK_REPORT.get().replace("{{mspt}}", numberFormat.format(server.averageTickTimeNanos * 1000)) + return AstralBotTextConfig.TICK_REPORT.get().replace("{{mspt}}", numberFormat.format(server.currentSmoothedTickTime)) .replace( "{{tps}}", numberFormat.format( min( 20.0, - 1000.0 / (server.averageTickTimeNanos * 1000) + 1000.0 / (server.currentSmoothedTickTime) ) ) ) diff --git a/gradle.properties b/gradle.properties index feeca8c..4e0ef14 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ neoVersionRange=[20.4,20.5) kotlinForgeVersion=4.10.0 kffLoaderRange=[4,) -version=1.5.0 +version=1.5.2 group=dev.erdragh.astralbot modId=astralbot modAuthor=Erdragh From 424bc8f99afb7ad72f2cd83639f929184373aeef Mon Sep 17 00:00:00 2001 From: Erdragh Date: Sat, 1 Jun 2024 22:06:48 +0200 Subject: [PATCH 4/4] fix gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c3d32f2..c419cad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ kotlin.code.style=official org.gradle.jvmargs=-Xmx3G -XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4096 # Minecraft things -enabledPlatforms=fabric,neoforge +enabledPlatforms=fabric,forge # Fabric fabricLoaderVersion=0.15.11