Fix resources display when hovering upgrade slot inside building scre…

…en. Updated the version.
remmintan · Jan 10, 2025 · e6b02b2 · e6b02b2
1 parent fd95f39
commit e6b02b2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx4G
 	loader_version=0.14.24
 
 # Mod Properties
-mod_version=1.13.0-beta
+mod_version=1.14.0-beta
 	maven_group = org.minefortress
 	archives_base_name = minefortress
 

diff --git a/src/gui/java/net/remmintan/mods/minefortress/gui/widget/BlueprintUpgradeSlot.kt b/src/gui/java/net/remmintan/mods/minefortress/gui/widget/BlueprintUpgradeSlot.kt
@@ -24,7 +24,8 @@ class BlueprintUpgradeSlot(
     private val costsX: Int,
     private val costsY: Int,
     private val index: Int,
-    private val textRenderer: TextRenderer
+    private val textRenderer: TextRenderer,
+    private val showItems: Boolean
 ) : Drawable {
 
     private val slotEndX = slotX + UPGRADE_SLOT_SIDE_SIZE
@@ -60,7 +61,7 @@ class BlueprintUpgradeSlot(
             hovered = slot.isEnoughResources
 
             val fortressManager = CoreModUtils.getFortressManager()
-            if (fortressManager.isSurvival) {
+            if (fortressManager.isSurvival && showItems) {
                 val stacks: List<ItemInfo> = slot.blockData.getStacks()
                 for (i1 in stacks.indices) {
                     val stack = stacks[i1]
@@ -115,11 +116,12 @@ class BlueprintUpgradeSlot(
             costsX: Int,
             costsY: Int,
             slot: BlueprintSlot,
-            textRenderer: TextRenderer
+            textRenderer: TextRenderer,
+            showItems: Boolean = true
         ): BlueprintUpgradeSlot {
             val slotX = x + index * (UPGRADE_SLOT_SIDE_SIZE + 4)
             val slotY = y
-            return BlueprintUpgradeSlot(slot, slotX, slotY, costsX, costsY, index, textRenderer)
+            return BlueprintUpgradeSlot(slot, slotX, slotY, costsX, costsY, index, textRenderer, showItems)
         }
     }
 }

diff --git a/src/main/java/org/minefortress/renderer/gui/blueprints/EditUpgradesScreen.kt b/src/main/java/org/minefortress/renderer/gui/blueprints/EditUpgradesScreen.kt
@@ -33,7 +33,7 @@ class EditUpgradesScreen(private val handler: EditUpgradesScreenHandler) : Scree
 
     private val upgradeSlots: List<BlueprintUpgradeSlot> by lazy {
         handler.upgrades.mapIndexed { index, slot ->
-            BlueprintUpgradeSlot.create(SLOT_X, SLOT_Y, index, 0, 0, slot, this.textRenderer)
+            BlueprintUpgradeSlot.create(SLOT_X, SLOT_Y, index, 0, 0, slot, this.textRenderer, false)
         }
     }