From a85ec75445ba97cae920c9d2552de5126e624800 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Thu, 10 Sep 2015 11:53:30 +0100 Subject: [PATCH] More injector work --- src/main/java/steamcraft/common/Steamcraft.java | 2 +- .../java/steamcraft/common/init/InitItems.java | 10 +++++----- .../tiles/container/ContainerInjector.java | 10 ++++++++-- .../assets/steamcraft/textures/gui/guitank.png | Bin 4964 -> 0 bytes .../assets/steamcraft/textures/gui/injector.png | Bin 0 -> 4411 bytes 5 files changed, 14 insertions(+), 8 deletions(-) delete mode 100755 src/main/resources/assets/steamcraft/textures/gui/guitank.png create mode 100755 src/main/resources/assets/steamcraft/textures/gui/injector.png diff --git a/src/main/java/steamcraft/common/Steamcraft.java b/src/main/java/steamcraft/common/Steamcraft.java index e1b41272..8f446854 100755 --- a/src/main/java/steamcraft/common/Steamcraft.java +++ b/src/main/java/steamcraft/common/Steamcraft.java @@ -39,6 +39,7 @@ import net.minecraftforge.common.MinecraftForge; import boilerplate.client.GuiHandler; import boilerplate.common.compathandler.FMPCompatHandler; +import boilerplate.common.utils.handlers.BucketHandler; import steamcraft.common.compat.CompatabilityLayer; import steamcraft.common.compat.CompatibilityHandler; import steamcraft.common.config.Config; @@ -52,7 +53,6 @@ import steamcraft.common.init.InitItems; import steamcraft.common.init.InitMisc; import steamcraft.common.init.InitPackets; import steamcraft.common.init.InitRecipes; -import steamcraft.common.lib.BucketHandler; import steamcraft.common.lib.CommandSteamcraft; import steamcraft.common.lib.CreativeTabSteamcraft; import steamcraft.common.lib.LoggerSteamcraft; diff --git a/src/main/java/steamcraft/common/init/InitItems.java b/src/main/java/steamcraft/common/init/InitItems.java index e19ae60a..ec009be1 100755 --- a/src/main/java/steamcraft/common/init/InitItems.java +++ b/src/main/java/steamcraft/common/init/InitItems.java @@ -25,6 +25,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import boilerplate.common.utils.handlers.BucketHandler; import boilerplate.common.utils.helpers.RegistryHelper; import steamcraft.common.Steamcraft; import steamcraft.common.items.BaseItem; @@ -102,7 +103,6 @@ import steamcraft.common.items.tools.steam.ItemSteamPickaxe; import steamcraft.common.items.tools.steam.ItemSteamShovel; import steamcraft.common.items.tools.steam.ItemSteamSword; import steamcraft.common.items.vanity.ItemTopHat; -import steamcraft.common.lib.BucketHandler; import steamcraft.common.lib.ModInfo; /** @@ -511,10 +511,10 @@ public class InitItems new ItemStack(itemBoilingMudBucket), new ItemStack(Items.bucket)); FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("whaleoil", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(itemWhaleOilBucket), new ItemStack(Items.bucket)); - BucketHandler.INSTANCE.buckets.put(InitBlocks.blockBoilingWater, itemBoilingWaterBucket); - BucketHandler.INSTANCE.buckets.put(InitBlocks.blockBoilingMud, itemBoilingMudBucket); - BucketHandler.INSTANCE.buckets.put(InitBlocks.blockWhaleOil, itemWhaleOilBucket); - MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); + BucketHandler.getInstance().bucketMap.put(InitBlocks.blockBoilingWater, itemBoilingWaterBucket); + BucketHandler.getInstance().bucketMap.put(InitBlocks.blockBoilingMud, itemBoilingMudBucket); + BucketHandler.getInstance().bucketMap.put(InitBlocks.blockWhaleOil, itemWhaleOilBucket); + MinecraftForge.EVENT_BUS.register(BucketHandler.getInstance()); itemWhalebone = new BaseItem().setUnlocalizedName("itemWhalebone"); registerItem(itemWhalebone, "ItemWhalebone"); diff --git a/src/main/java/steamcraft/common/tiles/container/ContainerInjector.java b/src/main/java/steamcraft/common/tiles/container/ContainerInjector.java index f14755b9..29a4993d 100644 --- a/src/main/java/steamcraft/common/tiles/container/ContainerInjector.java +++ b/src/main/java/steamcraft/common/tiles/container/ContainerInjector.java @@ -39,6 +39,8 @@ public class ContainerInjector extends BaseContainer { private TileInjector tileent; + private int lastFluidLevel = 0; + public ContainerInjector(InventoryPlayer player, TileInjector tile) { this.tileent = tile; @@ -61,6 +63,7 @@ public class ContainerInjector extends BaseContainer public void addCraftingToCrafters(ICrafting par1ICrafting) { super.addCraftingToCrafters(par1ICrafting); + par1ICrafting.sendProgressBarUpdate(this, 0, this.tileent.buffer.getFluidAmount()); } @Override @@ -71,15 +74,18 @@ public class ContainerInjector extends BaseContainer for (Object obj : this.crafters) { ICrafting var2 = (ICrafting) obj; - + if (this.lastFluidLevel != this.tileent.buffer.getFluidAmount()) + var2.sendProgressBarUpdate(this, 2, this.tileent.buffer.getFluidAmount()); } + this.lastFluidLevel = this.tileent.buffer.getFluidAmount(); } @Override @SideOnly(Side.CLIENT) public void updateProgressBar(int par1, int par2) { - + if (par1 == 0) + this.tileent.buffer.getFluid().amount = par2; } @Override diff --git a/src/main/resources/assets/steamcraft/textures/gui/guitank.png b/src/main/resources/assets/steamcraft/textures/gui/guitank.png deleted file mode 100755 index 0e8f6b73fc774ea8e67168f79e04035df9f32b1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4964 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 k8sTYQ5b*zW