diff --git a/gradle.properties b/gradle.properties index e86984e3..20d01041 100644 --- 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 index 04716a7c..eaf364aa 100644 --- 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 = 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 index 1e03e2ac..1d29868b 100644 --- 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 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) } }