From 267ac7b8a2b17c4d36d170c2ebadf2efc431c1f8 Mon Sep 17 00:00:00 2001 From: Stuart Pomeroy Date: Sat, 26 Mar 2016 16:59:12 +0000 Subject: [PATCH 1/2] Fixed Grinder GUI and other? Just fixed the grinder GUI and stuff. --- src/main/java/techreborn/client/gui/GuiGrinder.java | 2 +- src/main/java/techreborn/multiblocks/MultiBlockCasing.java | 1 + src/main/java/techreborn/tiles/TileBlastFurnace.java | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/techreborn/client/gui/GuiGrinder.java b/src/main/java/techreborn/client/gui/GuiGrinder.java index eaba97b48..b4181ed91 100644 --- a/src/main/java/techreborn/client/gui/GuiGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiGrinder.java @@ -39,7 +39,7 @@ public class GuiGrinder extends GuiContainer j = grinder.getProgressScaled(24); if (j > 0) { - this.drawTexturedModalRect(k + 50, l + 36, 176, 14, j + 1, 16); + this.drawTexturedModalRect(k + 80, l + 36, 176, 14, j + 1, 16); } j = grinder.getEnergyScaled(12); diff --git a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java index df9f0a304..7616e08f3 100644 --- a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java +++ b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java @@ -238,6 +238,7 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase @Override protected void onBlockAdded(IMultiblockPart newPart) { + } @Override diff --git a/src/main/java/techreborn/tiles/TileBlastFurnace.java b/src/main/java/techreborn/tiles/TileBlastFurnace.java index b912fc268..227ca0095 100644 --- a/src/main/java/techreborn/tiles/TileBlastFurnace.java +++ b/src/main/java/techreborn/tiles/TileBlastFurnace.java @@ -94,8 +94,11 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, { TileEntity tileEntity = worldObj.getTileEntity(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ())); + + if (tileEntity instanceof TileMachineCasing) { + System.out.print(((TileMachineCasing) tileEntity).isConnected()); if (((TileMachineCasing) tileEntity).isConnected() && ((TileMachineCasing) tileEntity).getMultiblockController().isAssembled()) { From a284c454758ddefbe1cda2442d80878dfb68dfbe Mon Sep 17 00:00:00 2001 From: Stuart Pomeroy Date: Sat, 26 Mar 2016 17:05:44 +0000 Subject: [PATCH 2/2] Fix Grinder GUI --- src/main/java/techreborn/blocks/generator/BlockSolarPanel.java | 1 + src/main/java/techreborn/blocks/generator/BlockWaterMill.java | 1 + src/main/java/techreborn/blocks/generator/BlockWindMill.java | 1 + src/main/java/techreborn/client/gui/GuiGrinder.java | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index b267d30ad..0323c6806 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -27,6 +27,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock setUnlocalizedName("techreborn.solarpanel"); setCreativeTab(TechRebornCreativeTab.instance); this.setDefaultState(this.getDefaultState().withProperty(ACTIVE, false)); + setHardness(2.0F); } protected BlockStateContainer createBlockState() diff --git a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java index a3df4292e..62259472e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java @@ -24,6 +24,7 @@ public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock super(Material.iron); setUnlocalizedName("techreborn.watermill"); setCreativeTab(TechRebornCreativeTab.instance); + setHardness(2.0F); RebornCore.jsonDestroyer.registerObject(this); } diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java index b52c11fc2..a10ce1688 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWindMill.java @@ -24,6 +24,7 @@ public class BlockWindMill extends BaseTileBlock implements ITexturedBlock super(Material.iron); setUnlocalizedName("techreborn.windmill"); setCreativeTab(TechRebornCreativeTab.instance); + setHardness(2.0F); RebornCore.jsonDestroyer.registerObject(this); } diff --git a/src/main/java/techreborn/client/gui/GuiGrinder.java b/src/main/java/techreborn/client/gui/GuiGrinder.java index b4181ed91..eaba97b48 100644 --- a/src/main/java/techreborn/client/gui/GuiGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiGrinder.java @@ -39,7 +39,7 @@ public class GuiGrinder extends GuiContainer j = grinder.getProgressScaled(24); if (j > 0) { - this.drawTexturedModalRect(k + 80, l + 36, 176, 14, j + 1, 16); + this.drawTexturedModalRect(k + 50, l + 36, 176, 14, j + 1, 16); } j = grinder.getEnergyScaled(12);