2 files changed, 12 insertions, 26 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 1b8919f6f2..ad1be7d89b 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
@@ -23,13 +23,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 public class GT_MetaTileEntity_LargeDieselGenerator extends GT_MetaTileEntity_MultiBlockBase {
-
-    private static boolean controller;
-    public GT_MetaTileEntity_Hatch_Input mInputHotFluidHatch;
-    public GT_MetaTileEntity_Hatch_Output mOutputColdFluidHatch;
-    public boolean superheated = false;
-    private float water;
-
     public GT_MetaTileEntity_LargeDieselGenerator(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
@@ -39,16 +32,15 @@ public class GT_MetaTileEntity_LargeDieselGenerator extends GT_MetaTileEntity_Mu
 
     public String[] getDescription() {
         return new String[]{
-                "Controller Block for the Heat Exchanger",
+                "Controller Block for the Large Diesel Generator",
                 "Size: 3x3x4",
-                "Controller (front middle at bottom)",
+                "Controller (front centered)",
                 "3x3x4 of Stable Titanium Casing (hollow, Min 24!)",
-                "2 Titanium Pipe Casing Blocks inside the Hollow Casing",
-                "1x Distillated Water Input (one of the Casings)",
-                "min 1 Steam Output (one of the Casings)",
+                "1 Titanium Pipe Casing Block inside the Hollow Casing",
+                "3x Fluid Input (one of the Casings)",
                 "1x Maintenance Hatch (one of the Casings)",
-                "1x Hot Fluid Input (botton Center)",
-                "1x Cold Fluid Output (top Center)"};
+                "1x Muffler Hatch (top centered)",
+                "1x Dynamo Hatch (back centered)"};
     }
 
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
@@ -59,7 +51,7 @@ public class GT_MetaTileEntity_LargeDieselGenerator extends GT_MetaTileEntity_Mu
     }
 
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "LargeHeatExchanger.png");
+        return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "LargeDieselGenerator.png");
     }
 
     public boolean isCorrectMachinePart(ItemStack aStack) {
@@ -89,15 +81,9 @@ public class GT_MetaTileEntity_LargeDieselGenerator extends GT_MetaTileEntity_Mu
                     if ((tLiquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null) {
                         if (hatchFluid.isFluidEqual(tLiquid) && hasLubricant) {
                             tLiquid.amount = 5;
-                            depleteInput(tLiquid);
-                            depleteInput(Materials.Lubricant.getFluid(1L));
-                            this.mProgresstime = 1;
-                            this.mMaxProgresstime = 1;
-                            this.mEfficiencyIncrease = 5;
-                            this.mEUt = (2048 * (aFuel.mSpecialValue / 100) * getCasingMulti()) * (mEfficiency / 1000);
-                            System.out.println("Eff Value: " + mEfficiency);
-                            System.out.println("Fuel Value: " + aFuel.mSpecialValue);
-                            System.out.println("EU/t : " + mEUt);
+                            depleteInput(tLiquid); //Possible issue if diesel isn't divisible by 5?
+                            depleteInput(Materials.Lubricant.getFluid(1L)); //Possible NPE?
+                            
                             return true;
                         }
                     }
@@ -185,7 +171,7 @@ public class GT_MetaTileEntity_LargeDieselGenerator extends GT_MetaTileEntity_Mu
     @Override
     public String[] getInfoData() {
         return new String[]{
-                "Diesel Engine",
+                "Large Diesel Generator",
                 "Current Output: " + mEUt + " EU/t"
         };
     }
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index 37fa61ce53..ca3962122f 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -1033,7 +1033,7 @@ public class GT_Loader_MetaTileEntities
         ItemList.Machine_Multi_Assemblyline.set(new GT_MetaTileEntity_AssemblyLine(1170, "multimachine.assemblyline", "Assemblyline").getStackForm(1L));
         GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Assemblyline.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WCW", "EME", "WCW", 'M', ItemList.Hull_IV, 'W', ItemList.Casing_Assembler, 'E', OrePrefixes.circuit.get(Materials.Ultimate), 'C', ItemList.Robot_Arm_IV});
 
-        ItemList.Machine_Multi_LargeDieselGenerator.set(new GT_MetaTileEntity_LargeDieselGenerator(1171, "multimachine.dieselgenerator", "Diesel Generator").getStackForm(1L));
+        ItemList.Machine_Multi_LargeDieselGenerator.set(new GT_MetaTileEntity_LargeDieselGenerator(1171, "multimachine.dieselgenerator", "Large Diesel Generator").getStackForm(1L));
         GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeDieselGenerator.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WCW", "EME", "WCW", 'M', ItemList.Hull_IV, 'W', ItemList.Casing_Assembler, 'E', OrePrefixes.circuit.get(Materials.Ultimate), 'C', ItemList.Robot_Arm_IV});
     }