From 266c5475209ae11d92de18febc85b89113b687d9 Mon Sep 17 00:00:00 2001 From: Gig Date: Sat, 9 May 2015 18:51:31 +0100 Subject: [PATCH] Small fix's to multiple things --- .../generator/BlockSemiFluidGenerator.java | 16 ---------------- .../techreborn/client/gui/GuiAlloySmelter.java | 2 +- .../client/gui/GuiAssemblingMachine.java | 2 +- .../techreborn/client/gui/GuiBlastFurnace.java | 2 +- .../techreborn/client/gui/GuiCentrifuge.java | 1 - .../java/techreborn/client/gui/GuiGrinder.java | 2 +- .../client/gui/GuiImplosionCompressor.java | 2 +- .../client/gui/GuiMatterFabricator.java | 2 +- .../client/gui/GuiPlateCuttingMachine.java | 2 +- .../techreborn/client/gui/GuiRollingMachine.java | 13 ++++++++++++- .../techreborn/tiles/TileDragonEggSiphoner.java | 2 +- .../resources/assets/techreborn/lang/en_US.lang | 1 + 12 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index b533cbaee..a82430652 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -39,22 +39,6 @@ public class BlockSemiFluidGenerator extends BlockMachineBase { setBlockName("techreborn.semifluidgenerator"); } - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) - { - return new TileAlloySmelter(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) - { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.alloySmelterID, world, x, y, - z); - return true; - } - @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister icon) diff --git a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java index bec59bca1..0d58ac4f1 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java @@ -50,7 +50,7 @@ public class GuiAlloySmelter extends GuiContainer { protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.alloysmelter.name"), 60, 6, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.alloysmelter.name"), 40, 6, 4210752); this.fontRendererObj.drawString( I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); diff --git a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java index 18d598bff..1bb34acee 100644 --- a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -52,7 +52,7 @@ public class GuiAssemblingMachine extends GuiContainer { protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.assemblinmachine.name"), 60, 6, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.assemblinmachine.name"), 40, 6, 4210752); this.fontRendererObj.drawString( I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index fd8769303..009d3b272 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -53,7 +53,7 @@ public class GuiBlastFurnace extends GuiContainer { int p_146979_2_) { super.drawGuiContainerForegroundLayer(p_146979_1_, p_146979_2_); - this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.blastfurnace.name"), 60, 6, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.blastfurnace.name"), 35, 6, 4210752); this.fontRendererObj.drawString(blastfurnace.getHeat() + " heat", 75, 20, 4210752); this.fontRendererObj.drawString( I18n.format("container.inventory", new Object[0]), 8, diff --git a/src/main/java/techreborn/client/gui/GuiCentrifuge.java b/src/main/java/techreborn/client/gui/GuiCentrifuge.java index 35e607160..5b1d81ba4 100644 --- a/src/main/java/techreborn/client/gui/GuiCentrifuge.java +++ b/src/main/java/techreborn/client/gui/GuiCentrifuge.java @@ -37,7 +37,6 @@ public class GuiCentrifuge extends GuiContainer { protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.centrifuge.name"), 110, 6, 4210752); this.fontRendererObj.drawString( I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); diff --git a/src/main/java/techreborn/client/gui/GuiGrinder.java b/src/main/java/techreborn/client/gui/GuiGrinder.java index c4256eff1..22675aa36 100644 --- a/src/main/java/techreborn/client/gui/GuiGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiGrinder.java @@ -40,7 +40,7 @@ public class GuiGrinder extends GuiContainer{ protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.grinder.name"), 60, 6, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.grinder.name"), 40, 6, 4210752); this.fontRendererObj.drawString( I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index d857d9387..20d9c0900 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -50,7 +50,7 @@ public class GuiImplosionCompressor extends GuiContainer{ protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.implosioncompressor.name"), 60, 6, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.implosioncompressor.name"), 40, 6, 4210752); this.fontRendererObj.drawString( I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); diff --git a/src/main/java/techreborn/client/gui/GuiMatterFabricator.java b/src/main/java/techreborn/client/gui/GuiMatterFabricator.java index fca223ffe..fce8b4d4e 100644 --- a/src/main/java/techreborn/client/gui/GuiMatterFabricator.java +++ b/src/main/java/techreborn/client/gui/GuiMatterFabricator.java @@ -40,7 +40,7 @@ public class GuiMatterFabricator extends GuiContainer{ protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.matterfabricator.name"), 60, 6, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.matterfabricator.name"), 40, 6, 4210752); this.fontRendererObj.drawString( I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); diff --git a/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java b/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java index 25523f9c2..b3baac0e5 100644 --- a/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java @@ -54,7 +54,7 @@ public class GuiPlateCuttingMachine extends GuiContainer { protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.platecuttingmachine.name"), 60, 6, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.platecuttingmachine.name"), 40, 6, 4210752); this.fontRendererObj.drawString( I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); diff --git a/src/main/java/techreborn/client/gui/GuiRollingMachine.java b/src/main/java/techreborn/client/gui/GuiRollingMachine.java index b641f93b9..21b5a09cc 100644 --- a/src/main/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiRollingMachine.java @@ -1,5 +1,6 @@ package techreborn.client.gui; +import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -36,10 +37,20 @@ public class GuiRollingMachine extends GuiContainer { protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.rollingmachine.name"), 8, 6, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.rollingmachine.name"), 50, 6, 4210752); this.fontRendererObj.drawString( I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); } + + @Override + public void initGui() + { + this.buttonList.clear(); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.buttonList.add(new GuiButton(0, k + 4, l + 4, 20, 20, "R")); + super.initGui(); + } } diff --git a/src/main/java/techreborn/tiles/TileDragonEggSiphoner.java b/src/main/java/techreborn/tiles/TileDragonEggSiphoner.java index bf9b9eb65..c8535bae8 100644 --- a/src/main/java/techreborn/tiles/TileDragonEggSiphoner.java +++ b/src/main/java/techreborn/tiles/TileDragonEggSiphoner.java @@ -72,7 +72,7 @@ public class TileDragonEggSiphoner extends TileMachineBase implements IWrenchabl @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.AlloySmelter, 1); + return new ItemStack(ModBlocks.Dragoneggenergysiphoner, 1); } public boolean isComplete() diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 84ab298aa..30237cbc9 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -41,6 +41,7 @@ tile.techreborn.plasmagenerator.name=Plasma Generator tile.techreborn.fusioncontrolcomputer.name=Fusion Control Computer tile.techreborn.fusioncoil.name=Fusion Coil tile.techreborn.lightningrod.name=Lightning Rod +tile.techreborn.assemblinmachine.name=Assembling Machine #Ores