From 7664cacd2f1247c710d709875381e6cdb6f2717f Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 14 Jan 2026 15:54:59 +0100 Subject: [PATCH] double barrel shaboing hot dog (frot dog) --- changelog | 5 ++++- .../com/hbm/inventory/gui/GUICrateDesh.java | 3 +-- .../com/hbm/inventory/gui/GUICrateIron.java | 3 +-- .../com/hbm/inventory/gui/GUICrateSteel.java | 3 +-- .../hbm/inventory/gui/GUICrateTemplate.java | 3 +-- .../hbm/inventory/gui/GUICrateTungsten.java | 3 +-- .../com/hbm/inventory/gui/GuiCrateBase.java | 19 +++++++++++++++++++ .../rbmk/TileEntityRBMKControlAuto.java | 4 ++-- 8 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/hbm/inventory/gui/GuiCrateBase.java diff --git a/changelog b/changelog index b1aec00f0..6033ddcf9 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,7 @@ ## Changed * Rad absorbers now use metadata, existing blocks will be converted automatically * Fissure bombs that go off in crater biomes now create fissures with metadata 1 which creates radioactive volcanic lava - * If a crater biome is created on top of an existing fissue, it will keep producing normal volcanic lava \ No newline at end of file + * If a crater biome is created on top of an existing fissue, it will keep producing normal volcanic lava + +# Fixed +* Potentially fixed yet another issue regarding crates \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/gui/GUICrateDesh.java b/src/main/java/com/hbm/inventory/gui/GUICrateDesh.java index d75a8ee62..78dd9719e 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrateDesh.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrateDesh.java @@ -6,13 +6,12 @@ import com.hbm.inventory.container.ContainerCrateDesh; import com.hbm.lib.RefStrings; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; -public class GUICrateDesh extends GuiContainer { +public class GUICrateDesh extends GuiCrateBase { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_crate_desh.png"); private IInventory crate; diff --git a/src/main/java/com/hbm/inventory/gui/GUICrateIron.java b/src/main/java/com/hbm/inventory/gui/GUICrateIron.java index 42be50f2c..ba5f806de 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrateIron.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrateIron.java @@ -7,12 +7,11 @@ import com.hbm.inventory.container.ContainerCrateIron; import com.hbm.lib.RefStrings; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -public class GUICrateIron extends GuiContainer { +public class GUICrateIron extends GuiCrateBase { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_crate_iron.png"); private IInventory diFurnace; diff --git a/src/main/java/com/hbm/inventory/gui/GUICrateSteel.java b/src/main/java/com/hbm/inventory/gui/GUICrateSteel.java index 4883360d4..a7ecca09c 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrateSteel.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrateSteel.java @@ -6,13 +6,12 @@ import com.hbm.inventory.container.ContainerCrateSteel; import com.hbm.lib.RefStrings; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; -public class GUICrateSteel extends GuiContainer { +public class GUICrateSteel extends GuiCrateBase { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_crate_steel.png"); private IInventory crate; diff --git a/src/main/java/com/hbm/inventory/gui/GUICrateTemplate.java b/src/main/java/com/hbm/inventory/gui/GUICrateTemplate.java index 920e8deba..b51e7cfb8 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrateTemplate.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrateTemplate.java @@ -7,12 +7,11 @@ import com.hbm.inventory.container.ContainerCrateTemplate; import com.hbm.lib.RefStrings; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -public class GUICrateTemplate extends GuiContainer { +public class GUICrateTemplate extends GuiCrateBase { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_crate_template.png"); private IInventory diFurnace; diff --git a/src/main/java/com/hbm/inventory/gui/GUICrateTungsten.java b/src/main/java/com/hbm/inventory/gui/GUICrateTungsten.java index 42a3a4e0c..2b689a722 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrateTungsten.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrateTungsten.java @@ -8,12 +8,11 @@ import com.hbm.inventory.container.ContainerCrateTungsten; import com.hbm.lib.RefStrings; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -public class GUICrateTungsten extends GuiContainer { +public class GUICrateTungsten extends GuiCrateBase { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_crate_tungsten.png"); private static ResourceLocation texture_hot = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_crate_tungsten_hot.png"); diff --git a/src/main/java/com/hbm/inventory/gui/GuiCrateBase.java b/src/main/java/com/hbm/inventory/gui/GuiCrateBase.java new file mode 100644 index 000000000..b721567b8 --- /dev/null +++ b/src/main/java/com/hbm/inventory/gui/GuiCrateBase.java @@ -0,0 +1,19 @@ +package com.hbm.inventory.gui; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Container; + +public abstract class GuiCrateBase extends GuiContainer { + + public GuiCrateBase(Container container) { + super(container); + } + + @Override + protected void mouseClicked(int x, int y, int button) { + boolean touchScreen = this.mc.gameSettings.touchscreen; + this.mc.gameSettings.touchscreen = false; + super.mouseClicked(x, y, button); + this.mc.gameSettings.touchscreen = touchScreen; + } +} diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java index c587fc355..6f137ef2a 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java @@ -182,8 +182,8 @@ public class TileEntityRBMKControlAuto extends TileEntityRBMKControl implements public void pasteSettings(NBTTagCompound nbt, int index, World world, EntityPlayer player, int x, int y, int z) { if(nbt.hasKey("levelLower")) levelLower = nbt.getDouble("levelLower"); if(nbt.hasKey("levelUpper")) levelLower = nbt.getDouble("levelUpper"); - if(nbt.hasKey("heatLower")) levelLower = nbt.getDouble("heatLower"); - if(nbt.hasKey("heatUpper")) levelLower = nbt.getDouble("heatUpper"); + if(nbt.hasKey("heatLower")) heatLower = nbt.getDouble("heatLower"); + if(nbt.hasKey("heatUpper")) heatUpper = nbt.getDouble("heatUpper"); if(nbt.hasKey("function")) function = EnumUtil.grabEnumSafely(RBMKFunction.class, nbt.getInteger("function")); } } \ No newline at end of file