From a62b061968d6f09f3b55c681b5baabdb9fd41896 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Thu, 28 Apr 2016 02:16:11 +0100 Subject: [PATCH] More Fixes TODO: Require Dynamo back centered (Currently anywhere) Require Muffler top centered (Currently anywhere) Implement output calculation Implement coolant requirement (Water or IC2Coolant?) Possible add different tiers of diesel generator? --- ...T_MetaTileEntity_LargeDieselGenerator.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeDieselGenerator.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeDieselGenerator.java index ad1be7d8..1c3046b0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeDieselGenerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeDieselGenerator.java @@ -7,8 +7,6 @@ import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; @@ -33,13 +31,13 @@ public class GT_MetaTileEntity_LargeDieselGenerator extends GT_MetaTileEntity_Mu public String[] getDescription() { return new String[]{ "Controller Block for the Large Diesel Generator", - "Size: 3x3x4", + "Size: 3x3x3", "Controller (front centered)", - "3x3x4 of Stable Titanium Casing (hollow, Min 24!)", - "1 Titanium Pipe Casing Block inside the Hollow Casing", - "3x Fluid Input (one of the Casings)", + "3x3x3 of Stable Titanium Casing (hollow, Min 24!)", + "1x Titanium Pipe Casing Block inside the Hollow Casing", + "3x Input Hatch (one of the Casings)", "1x Maintenance Hatch (one of the Casings)", - "1x Muffler Hatch (top centered)", + "1x Muffler Hatch (one of the Casings)", "1x Dynamo Hatch (back centered)"}; } @@ -67,7 +65,6 @@ public class GT_MetaTileEntity_LargeDieselGenerator extends GT_MetaTileEntity_Mu Collection tRecipeList = GT_Recipe.GT_Recipe_Map.sDieselFuels.mRecipeList; boolean hasLubricant = false; - int baseEUt = 4096; if(tFluids.size() > 0 && tRecipeList != null) { for (FluidStack hatchFluid : tFluids) { @@ -83,7 +80,9 @@ public class GT_MetaTileEntity_LargeDieselGenerator extends GT_MetaTileEntity_Mu tLiquid.amount = 5; depleteInput(tLiquid); //Possible issue if diesel isn't divisible by 5? depleteInput(Materials.Lubricant.getFluid(1L)); //Possible NPE? - + + //Implement output calculation + return true; } } @@ -120,10 +119,6 @@ public class GT_MetaTileEntity_LargeDieselGenerator extends GT_MetaTileEntity_Mu return tAmount >= 16; } - public int getCasingMulti() { - return 2; - } - public Block getCasingBlock() { return GregTech_API.sBlockCasings4; } @@ -172,6 +167,7 @@ public class GT_MetaTileEntity_LargeDieselGenerator extends GT_MetaTileEntity_Mu public String[] getInfoData() { return new String[]{ "Large Diesel Generator", + "Efficiency: " + mEfficiency / 100 + "%", "Current Output: " + mEUt + " EU/t" }; }