1.2.1 changes

brainage04 · Jan 24, 2024 · e2db889 · e2db889
1 parent 5c145e6
commit e2db889
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs=-Xmx2g
 baseGroup = com.github.brainage04.togglesprint
 mcVersion = 1.8.9
 modid = togglesprint
-version = 1.2.0
+version = 1.2.1
diff --git a/src/main/kotlin/com/github/brainage04/togglesprint/gui/EquipmentTracker.kt b/src/main/kotlin/com/github/brainage04/togglesprint/gui/EquipmentTracker.kt
@@ -44,7 +44,10 @@ object EquipmentTracker {
                     }
                 }
 
-                else -> currentLine += equipmentList[i].item.getItemStackDisplayName(equipmentList[i]) // name (1)
+                else -> { // name (1)
+                    currentLine += if (equipmentList[i].hasDisplayName()) equipmentList[i].displayName.trim()
+                    else equipmentList[i].item.getItemStackDisplayName(equipmentList[i]).trim()
+                }
             }
 
             if (equipmentList[i].isItemStackDamageable) { // if item has durability:

diff --git a/src/main/kotlin/com/github/brainage04/togglesprint/gui/PlayerRotationTracker.kt b/src/main/kotlin/com/github/brainage04/togglesprint/gui/PlayerRotationTracker.kt
@@ -10,16 +10,16 @@ object PlayerRotationTracker {
     private val guiElements get() = ToggleSprintMain.config.guiElements
 
     private fun formatYaw(yaw: Float): String {
-        val positiveYaw = (((yaw + 180) % 360) - 180).round(guiElements.rotationTracker.decimals)
-        val negativeYaw = (((yaw - 180) % 360) + 180).round(guiElements.rotationTracker.decimals)
+        val positiveYaw = (((yaw + 180.0f) % 360.0f) - 180.0f).round(guiElements.rotationTracker.decimals)
+        val negativeYaw = (((yaw - 180.0f) % 360.0f) + 180.0f).round(guiElements.rotationTracker.decimals)
 
-        var returnString: String = if (yaw > 0.0) {
+        var returnString = if (yaw > 0.0f) {
             "${GUIUtils.primaryChars}Yaw: $positiveYaw"
         } else {
             "${GUIUtils.primaryChars}Yaw: $negativeYaw"
         }
 
-        if (guiElements.rotationTracker.showTrueYaw && !(yaw == positiveYaw || yaw == negativeYaw)) {
+        if (guiElements.rotationTracker.showTrueYaw && !(yaw > -180.0f && yaw < 180.0f)) {
             returnString += " (${yaw.round(guiElements.rotationTracker.decimals)})"
         }
 

diff --git a/src/main/kotlin/com/github/brainage04/togglesprint/gui/TPSTracker.kt b/src/main/kotlin/com/github/brainage04/togglesprint/gui/TPSTracker.kt
@@ -41,6 +41,7 @@ class TPSTracker {
     private var ignoreFirstTicks = waitAfterWorldSwitch
     private var hasPacketReceived = false
 
+    /*
     init {
         fixedRateTimer(name = "brainage04-togglesprint-tps-counter-seconds", period = 1_000L) {
             if (!guiElements.tpsTracker.coreSettings.isEnabled) return@fixedRateTimer
@@ -83,6 +84,7 @@ class TPSTracker {
             }
         }
     }
+     */
 
     @SubscribeEvent
     fun onWorldChange(event: Event) {

diff --git a/src/main/kotlin/com/github/brainage04/togglesprint/gui/core/RenderGuiData.kt b/src/main/kotlin/com/github/brainage04/togglesprint/gui/core/RenderGuiData.kt
@@ -34,7 +34,7 @@ class RenderGuiData {
         foodTracker()
         realTimeTracker()
         pingTracker()
-        tpsTracker()
+        //tpsTracker()
         entityTracker()
 
         GlStateManager.popMatrix()

diff --git a/src/main/kotlin/com/github/brainage04/togglesprint/gui/inventory_trackers/FoodTracker.kt b/src/main/kotlin/com/github/brainage04/togglesprint/gui/inventory_trackers/FoodTracker.kt
@@ -41,7 +41,7 @@ object FoodTracker {
             "${GUIUtils.secondaryChars}Food:"
         )
 
-        textArray.addAll(trackInventoryItems(itemList))
+        textArray.addAll(trackInventoryItems(itemList, guiElements.foodTracker.includeArrays))
 
         if (textArray.size < 2) textArray[0] += "${ChatUtils.redChar} N/A"