EIG fix + info changes (GTNewHorizons/bartworks#130)

* Fix power usage

* Add info about internal structure parts

* Add more info to tricorder

* Add structure description info

* More checks

* Remove endless loop possibility

1 files changed, 37 insertions, 10 deletions

diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java
index 7348ee951f..3054fbe721 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java
@@ -12,6 +12,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -52,6 +53,8 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_ExtremeIndustrialGreenhouse> {
 
+    private static final boolean debug = false;
+
     private int mCasing = 0;
     private int mMaxSlots = 0;
     private int setupphase = 1;
@@ -77,7 +80,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse extends GT_MetaTileEn
             ofHatchAdder(GT_MetaTileEntity_ExtremeIndustrialGreenhouse::addOutputToMachineList, CASING_INDEX, 1)
         ))
         .addElement('l', LoaderReference.ProjRedIllumination ? ofBlock(Block.getBlockFromName("ProjRed|Illumination:projectred.illumination.lamp"), 10) : ofBlock(Blocks.redstone_lamp, 0))
-        .addElement('g', BorosilicateGlass.ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glasTier = t, te -> te.glasTier))
+        .addElement('g', debug ? ofBlock(Blocks.glass, 0) : BorosilicateGlass.ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glasTier = t, te -> te.glasTier))
         .addElement('d', ofBlock(LoaderReference.RandomThings ? Block.getBlockFromName("RandomThings:fertilizedDirt_tilled") : Blocks.farmland, 0))
         .addElement('w', ofBlock(Blocks.water, 0))
         .build();
@@ -176,6 +179,8 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse extends GT_MetaTileEn
             addCasingInfo("Clean Stainless Steel Casings", 70).
             addOtherStructurePart("Borosilicate Glass", "Hollow two middle layers", 2).
             addStructureInfo("The glass tier limits the Energy Input tier").
+            addStructureInfo("The dirt is from RandomThings, must be tilled").
+            addStructureInfo("Purple lamps are from ProjectRedIllumination. They can be lit").
             addMaintenanceHatch("Any casing", 1).
             addInputBus("Any casing", 1).
             addOutputBus("Any casing", 1).
@@ -186,6 +191,14 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse extends GT_MetaTileEn
     }
 
     @Override
+    public String[] getStructureDescription(ItemStack stackSize) {
+        List<String> info = new ArrayList<>(Arrays.asList(super.getStructureDescription(stackSize)));
+        info.add("The dirt is from RandomThings, must be tilled");
+        info.add("Purple lamps are from ProjectRedIllumination. They can be lit");
+        return info.toArray(new String[]{});
+    }
+
+    @Override
     public void saveNBTData(NBTTagCompound aNBT) {
         super.saveNBTData(aNBT);
         aNBT.setByte("glasTier", glasTier);
@@ -255,6 +268,8 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse extends GT_MetaTileEn
         buildPiece(STRUCTURE_PIECE_MAIN, itemStack, b, 2, 5, 0);
     }
 
+
+
     @Override
     public boolean isCorrectMachinePart(ItemStack itemStack) {
         return true;
@@ -295,7 +310,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse extends GT_MetaTileEn
         for(GreenHouseSlot s : mStorage)
             waterusage += s.input.stackSize;
 
-        if(!depleteInput(new FluidStack(FluidRegistry.WATER, waterusage * 1000)))
+        if(!depleteInput(new FluidStack(FluidRegistry.WATER, waterusage * 1000)) && !debug)
             return false;
 
         // OVERCLOCK
@@ -318,7 +333,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse extends GT_MetaTileEn
             }
             this.mOutputItems = outputs.toArray(new ItemStack[0]);
         }
-        this.mEUt = -(int)((double)v * 0.99d);
+        this.mEUt = -(int)((double) GT_Values.V[tier] * 0.99d);
         this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
         this.mEfficiencyIncrease = 10000;
         return true;
@@ -329,6 +344,8 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse extends GT_MetaTileEn
     public boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
         mCasing = 0;
         glasTier = 0;
+        if(debug)
+            glasTier = 8;
 
         if(!checkPiece(STRUCTURE_PIECE_MAIN, 2, 5, 0))
             return false;
@@ -362,12 +379,21 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse extends GT_MetaTileEn
     public String[] getInfoData() {
         List<String> info = new ArrayList<>(Arrays.asList(
             "Running in mode: " + EnumChatFormatting.GREEN + (setupphase == 0 ? (isIC2Mode ? "IC2 crops" : "Normal crops") : ("Setup mode " + (setupphase == 1 ? "(input)" : "(output)"))) + EnumChatFormatting.RESET,
-            "Uses " + waterusage * 1000 + "/operation of water",
+            "Uses " + waterusage * 1000 + "L/operation of water",
             "Max slots: " + EnumChatFormatting.GREEN + this.mMaxSlots + EnumChatFormatting.RESET,
             "Used slots: " + EnumChatFormatting.GREEN + this.mStorage.size() + EnumChatFormatting.RESET
         ));
-        for(int i = 0; i < mStorage.size(); i++)
-            info.add("Slot " + i + ": " + EnumChatFormatting.GREEN + "x" + this.mStorage.get(i).input.stackSize + " " + this.mStorage.get(i).input.getDisplayName() + EnumChatFormatting.RESET);
+        for(int i = 0; i < mStorage.size(); i++) {
+            if(!mStorage.get(i).isValid)
+                continue;
+            StringBuilder a = new StringBuilder("Slot " + i + ": " + EnumChatFormatting.GREEN + "x" + this.mStorage.get(i).input.stackSize + " " + this.mStorage.get(i).input.getDisplayName() + " : ");
+            if(this.isIC2Mode)
+                for(Map.Entry<String, Double> entry : mStorage.get(i).dropprogress.entrySet())
+                    a.append((int) (entry.getValue() * 100d)).append("% ");
+            a.append(EnumChatFormatting.RESET);
+            info.add(a.toString());
+        }
+
         info.addAll(Arrays.asList(super.getInfoData()));
         return info.toArray(new String[0]);
     }
@@ -594,16 +620,17 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse extends GT_MetaTileEn
                     return;
                 // GENERATE DROPS
                 generations = new ArrayList<>();
-                for(int i = 0; i < 10; i++) // get 10 generations
+                out: for(int i = 0; i < 10; i++) // get 10 generations
                 {
                     ItemStack[] st = te.harvest_automated(false);
                     te.setSize((byte) cc.maxSize());
-                    if (st == null){
-                        i--;
+                    if (st == null)
                         continue;
-                    }
                     if (st.length == 0)
                         continue;
+                    for(ItemStack s : st)
+                        if(s == null)
+                            continue out;
                     generations.add(new ArrayList<>(Arrays.asList(st)));
                 }
                 if(generations.isEmpty())