Merge branch 'refs/heads/develop' into version/1.20.1

# Conflicts: # CHANGELOG.md # common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt # gradle.properties
Erdragh · Jun 1, 2024 · a086183 · a086183
2 parents 93f0c1e + 0eae5ff
commit a086183
Show file tree

Hide file tree

Showing 6 changed files with 262 additions and 15 deletions.
diff --git a/.idea/icon.svg b/.idea/icon.svg
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.5.2
+Fix tps command using wrong numbers for calculation
+
 # 1.5.1
 Hotfix for Versions 1.18.2 - 1.20.1 fixing missing classes
 

diff --git a/common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt b/common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt
@@ -126,12 +126,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.averageTickTime * 1000))
+        return AstralBotTextConfig.TICK_REPORT.get().replace("{{mspt}}", numberFormat.format(server.averageTickTime))
             .replace(
                 "{{tps}}", numberFormat.format(
                     min(
                         20.0,
-                        1000.0 / (server.averageTickTime * 1000)
+                        1000.0 / (server.averageTickTime)
                     )
                 )
             )

diff --git a/gradle.properties b/gradle.properties
@@ -1,22 +1,25 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx3G -XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4096
 
-license=MIT
-title=AstralBot
-description=Discord Bot and Minecraft Mod in one bundle.
-credits=Erdragh
-version=1.5.1
-group=dev.erdragh.astralbot
-modId=astralbot
-modAuthor=Erdragh
-
 # Minecraft things
-enabledPlatforms=fabric,forge
-# Specified here because it's used in both the fabric and common subproject
+enabledPlatforms=fabric,neoforge
+
+# Fabric
 fabricLoaderVersion=0.15.11
 fabricApiVersion=0.91.0
 fabricKotlinVersion=1.11.0+kotlin.2.0.0
 
+
+version=1.5.2
+group=dev.erdragh.astralbot
+modId=astralbot
+modAuthor=Erdragh
+
+license=MIT
+title=AstralBot
+description=Discord Bot and Minecraft Mod in one bundle.
+credits=Erdragh
+
 minecraftVersion=1.20.1
 parchmentVersion=2023.09.03
 

diff --git 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
@@ -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/.