From 9cb2e27fe3d499c565d948a9216b5962c3eec908 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 7 Oct 2014 20:15:18 +0200 Subject: [PATCH] Lava lasts a tad longer. Turns out smelteries are consuming 1.5x as much lava as the old smelteries! It's only 1.25 as much now. To be exact: 15 mb are used every 4 seconds --- src/main/java/tconstruct/smeltery/TinkerSmeltery.java | 4 ++-- src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index dad82c4997a..e6a7456852f 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -1077,11 +1077,11 @@ protected void addRecipesForBasinCasting () protected static void addRecipesForSmeltery () { // Smeltery fuels - Smeltery.addSmelteryFuel(FluidRegistry.LAVA, 1300, 10); + Smeltery.addSmelteryFuel(FluidRegistry.LAVA, 1300, 12); // lava lasts 4 seconds per 15 mb // register pyrotheum if it's present Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); if (pyrotheum != null) - Smeltery.addSmelteryFuel(pyrotheum, 5000, 9); + Smeltery.addSmelteryFuel(pyrotheum, 5000, 9); // pyrotheum lasts 3 seconds per 15 mb // BLOOD FOR THE BLOOD GOD if (TinkerWorld.meatBlock != null) diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index af268d97826..dbc987e4642 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -304,10 +304,10 @@ public void updateEntity () if (!validStructure) checkValidPlacement(); - if (useTime > 0 && inUse) + if (useTime > 0) useTime -= 3; - if (validStructure && useTime <= 0) + if (validStructure && useTime <= 0 && inUse) { updateFuelGague(); } @@ -600,7 +600,7 @@ public void updateFuelGague () { // drain actual liquid, non simulated liquid = tankContainer.drain(ForgeDirection.DOWN, 15, true); - useTime += Smeltery.getFuelDuration(liquid.getFluid()); + useTime += (int)((float)Smeltery.getFuelDuration(liquid.getFluid())*15f/(float)liquid.amount); internalTemp = Smeltery.getFuelPower(liquid.getFluid()); // update fuel display