diff --git a/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java b/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java index f94527ed6..f5b86037e 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java @@ -44,7 +44,7 @@ public class GUICrystallizer extends GuiInfoContainer { protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.acidomatic.hasCustomInventoryName() ? this.acidomatic.getInventoryName() : I18n.format(this.acidomatic.getInventoryName()); - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(name, 70 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java b/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java index 29cf1d2a1..546bd8570 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java @@ -47,7 +47,7 @@ public class GUIMachineCyclotron extends GuiInfoContainer { protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.cyclotron.hasCustomInventoryName() ? this.cyclotron.getInventoryName() : I18n.format(this.cyclotron.getInventoryName()); - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(name, 79 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 15, this.ySize - 96 + 2, 4210752); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineEPress.java b/src/main/java/com/hbm/inventory/gui/GUIMachineEPress.java index 4d4f54caa..006461313 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineEPress.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineEPress.java @@ -12,7 +12,7 @@ import net.minecraft.util.ResourceLocation; public class GUIMachineEPress extends GuiInfoContainer { - private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_epress.png"); + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_electric_press.png"); private TileEntityMachineEPress press; public GUIMachineEPress(InventoryPlayer invPlayer, TileEntityMachineEPress tedf) { @@ -34,7 +34,7 @@ public class GUIMachineEPress extends GuiInfoContainer { protected void drawGuiContainerForegroundLayer( int i, int j) { String name = this.press.hasCustomInventoryName() ? this.press.getInventoryName() : I18n.format(this.press.getInventoryName()); - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(name, 89 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineElectricFurnace.java b/src/main/java/com/hbm/inventory/gui/GUIMachineElectricFurnace.java index 06d37ff96..5519b2fa1 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineElectricFurnace.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineElectricFurnace.java @@ -15,7 +15,7 @@ import com.hbm.util.i18n.I18nUtil; public class GUIMachineElectricFurnace extends GuiInfoContainer { - private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/GUIElectricFurnace.png"); + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_electric_furnace.png"); private TileEntityMachineElectricFurnace furnace; public GUIMachineElectricFurnace(InventoryPlayer invPlayer, TileEntityMachineElectricFurnace furnace) { @@ -43,7 +43,7 @@ public class GUIMachineElectricFurnace extends GuiInfoContainer { protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.furnace.hasCustomInventoryName() ? this.furnace.getInventoryName() : I18n.format(this.furnace.getInventoryName()); - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(name, 70 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } @@ -74,7 +74,7 @@ public class GUIMachineElectricFurnace extends GuiInfoContainer { int p = furnace.getProgressScaled(28); drawTexturedModalRect(guiLeft + 43, guiTop + 36, 176, 0, p, 12); - this.drawInfoPanel(guiLeft + 116, guiTop + 20, 8, 8, 8); + this.drawInfoPanel(guiLeft + 115, guiTop + 19, 8, 8, 8); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachinePress.java b/src/main/java/com/hbm/inventory/gui/GUIMachinePress.java index 17e64d6ed..d0d6a64c6 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachinePress.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachinePress.java @@ -14,7 +14,7 @@ import net.minecraft.util.ResourceLocation; public class GUIMachinePress extends GuiInfoContainer { - private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_press.png"); + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_press.png"); private TileEntityMachinePress press; public GUIMachinePress(InventoryPlayer invPlayer, TileEntityMachinePress tedf) { @@ -48,7 +48,7 @@ public class GUIMachinePress extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(press.burnTime >= 20) { - this.drawTexturedModalRect(guiLeft + 27, guiTop + 36, 0, 214, 14, 14); + this.drawTexturedModalRect(guiLeft + 26, guiTop + 36, 0, 214, 14, 14); } int k = (int) (press.renderPress * 16 / press.maxPress); diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java index 90ca0759b..a0ebfe680 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java @@ -52,7 +52,7 @@ public class GUIMachineRTG extends GuiInfoContainer { protected void drawGuiContainerForegroundLayer( int i, int j) { String name = this.rtg.hasCustomInventoryName() ? this.rtg.getInventoryName() : I18n.format(this.rtg.getInventoryName()); - this.fontRendererObj.drawString(name, 13 ,7, 10925486); + this.fontRendererObj.drawString(name, 60 - this.fontRendererObj.getStringWidth(name) / 2, 7, 10925486); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineShredder.java b/src/main/java/com/hbm/inventory/gui/GUIMachineShredder.java index d7df00134..5bf8b7259 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineShredder.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineShredder.java @@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation; public class GUIMachineShredder extends GuiInfoContainer { - private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_shredder.png"); + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_shredder.png"); private TileEntityMachineShredder diFurnace; public GUIMachineShredder(InventoryPlayer invPlayer, TileEntityMachineShredder tedf) { @@ -45,7 +45,7 @@ public class GUIMachineShredder extends GuiInfoContainer { protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName()); - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(name, 106 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } diff --git a/src/main/resources/assets/hbm/textures/gui/GUIElectricFurnace.png b/src/main/resources/assets/hbm/textures/gui/GUIElectricFurnace.png deleted file mode 100644 index a0aa8fd26..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/GUIElectricFurnace.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_epress.png b/src/main/resources/assets/hbm/textures/gui/gui_epress.png deleted file mode 100644 index 0079b6484..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_epress.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_press.png b/src/main/resources/assets/hbm/textures/gui/gui_press.png deleted file mode 100644 index 9fabaa595..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_press.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_rtg.png b/src/main/resources/assets/hbm/textures/gui/gui_rtg.png index ce99dbca6..1c2dfac5f 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_rtg.png and b/src/main/resources/assets/hbm/textures/gui/gui_rtg.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_shredder.png b/src/main/resources/assets/hbm/textures/gui/gui_shredder.png deleted file mode 100644 index 19b774c76..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_shredder.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/machine/gui_cyclotron.png b/src/main/resources/assets/hbm/textures/gui/machine/gui_cyclotron.png index 9da387278..6657da233 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/machine/gui_cyclotron.png and b/src/main/resources/assets/hbm/textures/gui/machine/gui_cyclotron.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_electric_furnace.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_electric_furnace.png new file mode 100644 index 000000000..ef12cb413 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/processing/gui_electric_furnace.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_electric_press.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_electric_press.png new file mode 100644 index 000000000..8575156ba Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/processing/gui_electric_press.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_press.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_press.png new file mode 100644 index 000000000..a9e7ed166 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/processing/gui_press.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_shredder.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_shredder.png new file mode 100644 index 000000000..7e6757850 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/processing/gui_shredder.png differ diff --git a/src/main/resources/assets/hbm/textures/models/pheodoors/secure_door_black.png b/src/main/resources/assets/hbm/textures/models/pheodoors/secure_door_black.png index 4018c6972..cc9100cf0 100644 Binary files a/src/main/resources/assets/hbm/textures/models/pheodoors/secure_door_black.png and b/src/main/resources/assets/hbm/textures/models/pheodoors/secure_door_black.png differ