From 23bf14b37ddd6a10510dc8ef6d67f325fc256ee0 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 7 Jun 2015 18:58:31 +0100 Subject: [PATCH] Clean the sawmill gui a bit, and remove debug code --- .../techreborn/api/recipe/RecipeCrafter.java | 3 ++- .../container/ContainerIndustrialSawmill.java | 3 ++- .../client/gui/GuiIndustrialSawmill.java | 16 ++++++++++++++-- src/main/java/techreborn/init/ModRecipes.java | 1 - .../tiles/TileImplosionCompressor.java | 1 - .../resources/assets/techreborn/lang/en_US.lang | 1 + 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index d04f103d7..73e10e13a 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -130,7 +130,8 @@ public class RecipeCrafter { this.currentTickTime = 0; syncIsActive(); } else { - this.currentTickTime = 0; + this.currentTickTime = -1; + syncIsActive(); } } } diff --git a/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java b/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java index abfae1b13..a93cf3426 100644 --- a/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java +++ b/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.Slot; import techreborn.client.SlotOutput; import techreborn.tiles.TileIndustrialSawmill; -public class ContainerIndustrialSawmill extends TechRebornContainer { +public class ContainerIndustrialSawmill extends ContainerCrafting { EntityPlayer player; @@ -22,6 +22,7 @@ public class ContainerIndustrialSawmill extends TechRebornContainer { public ContainerIndustrialSawmill(TileIndustrialSawmill tileIndustrialSawmill, EntityPlayer player) { + super(tileIndustrialSawmill.crafter); tile = tileIndustrialSawmill; this.player = player; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index a683b1db1..47d41d326 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -43,15 +43,27 @@ public class GuiIndustrialSawmill extends GuiContainer { int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + + int j = 0; + + if(sawmill.crafter.currentTickTime != 0) { + j = this.sawmill.crafter.currentTickTime * 24 / this.sawmill.crafter.currentNeededTicks; + } + this.drawTexturedModalRect(k + 57, l + 36, 176, 11, j - 1, 13); + + j = (int)this.sawmill.energy.getEnergyStored() * 12 / this.sawmill.energy.getCapacity(); + if(j > 0) { + this.drawTexturedModalRect(k + 36, l + 66 + 12 - j, 176, 12 - j, 14, j + 2); + } } protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String name = StatCollector.translateToLocal("tile.techreborn.tilesawmill.name"); + String name = StatCollector.translateToLocal("tile.techreborn.industrialSawmill.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString( - I18n.format("container.inventory", new Object[0]), 8, + I18n.format("container.inventory", new Object[0]), 58, this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index f8cee69af..890b98cf5 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -175,7 +175,6 @@ public class ModRecipes { RecipeHanderer.addRecipe(new ImplosionCompressorRecipe(new ItemStack(Blocks.netherrack, 4), new ItemStack(Blocks.diamond_block, 1), new ItemStack(ModItems.bucketTritium), null, 120, 5)); - RecipeHanderer.addRecipe(new AlloySmelterRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new AssemblingMachineRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new LatheRecipe(new ItemStack(Items.coal), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(Items.diamond), 120, 5)); diff --git a/src/main/java/techreborn/tiles/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/TileImplosionCompressor.java index c817c2ad3..bd3360e15 100644 --- a/src/main/java/techreborn/tiles/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/TileImplosionCompressor.java @@ -73,7 +73,6 @@ public class TileImplosionCompressor extends TileMachineBase implements IWrencha @Override public void updateEntity() { - System.out.println("hello"); super.updateEntity(); crafter.updateEntity(); energy.updateEntity(); diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index ba0d13428..e9d10044b 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -52,6 +52,7 @@ tile.techreborn.machineFrame.bronze.name=Brone Machine Hull tile.techreborn.machineFrame.brass.name=Brass Machine Hull tile.techreborn.machineFrame.steel.name=Steel Machine Hull tile.techreborn.machineFrame.titanium.name=Titanium Machine Hull +tile.techreborn.industrialSawmill.name=Saw Mill #Ores tile.techreborn.ore.Galena.name=Galena Ore