add desc text for large essebtia generator

6 files changed, 73 insertions, 13 deletions

diff --git a/libs/ElectroMagicTools-1.2.8.2[1.7.10].jar b/libs/ElectroMagicTools-1.2.8.2[1.7.10].jar
deleted file mode 100644
index 1651671ea4..0000000000
--- a/libs/ElectroMagicTools-1.2.8.2[1.7.10].jar
+++ /dev/null
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java
index 6af2e59e14..a769c7ce0e 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java
@@ -1,6 +1,7 @@
 package GoodGenerator.Blocks.TEs;
 
 import GoodGenerator.Loader.Loaders;
+import GoodGenerator.util.DescTextLocalization;
 import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
@@ -9,6 +10,7 @@ import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_H
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -16,10 +18,13 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.*;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
+import org.lwjgl.input.Keyboard;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.common.config.ConfigBlocks;
@@ -32,7 +37,7 @@ import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
 public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM implements TecTechEnabledMulti, IConstructable {
 
     private IStructureDefinition<LargeEssentiaGenerator> multiDefinition = null;
-    protected final int ENERGY_PER_ESSENTIA = 512;
+    protected final int ENERGY_PER_ESSENTIA_DEFAULT = 512;
     protected int mStableValue = 0;
     protected ArrayList<EssentiaHatch> mEssentiaHatch = new ArrayList<>();
 
@@ -71,13 +76,13 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM
     }
 
     @Override
-    public void loadNBTData(NBTTagCompound aNBT){
+    public void loadNBTData(NBTTagCompound aNBT) {
         super.loadNBTData(aNBT);
         this.mStableValue = aNBT.getInteger("mStableValue");
     }
 
     @Override
-    public void saveNBTData(NBTTagCompound aNBT){
+    public void saveNBTData(NBTTagCompound aNBT) {
         super.saveNBTData(aNBT);
         aNBT.setInteger("mStableValue", this.mStableValue);
     }
@@ -207,17 +212,44 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM
         this.mEfficiency = 10000;
         this.mMaxProgresstime = 1;
         getEssentiaHatch();
-        this.mEUt = (int)getEssentiaToEU();
+        this.mEUt = (int)getEssentiaToEU(getPower());
         return true;
     }
 
-    public long getEssentiaToEU(){
+    public long getPower() {
+        long power = 0;
+        for (GT_MetaTileEntity_Hatch tHatch : this.eDynamoMulti) {
+            power += tHatch.maxEUOutput();
+        }
+        for (GT_MetaTileEntity_Hatch tHatch : this.mDynamoHatches) {
+            power += tHatch.maxEUOutput();
+        }
+        return power;
+    }
+
+    public long getPerAspectEnergy(Aspect aspect) {
+        if (aspect.equals(Aspect.ENERGY)) return 4500 * mStableValue / 25;
+        if (aspect.equals(Aspect.FIRE)) return 3000 * mStableValue / 25;
+        if (aspect.equals(Aspect.GREED)) return 13000 * mStableValue / 25;
+        if (aspect.equals(Aspect.AURA)) return 9000 * mStableValue / 25;
+        if (aspect.equals(Aspect.TREE)) return 2200 * mStableValue / 25;
+        if (aspect.equals(Aspect.AIR)) return 1300 * mStableValue / 25;
+        if (aspect.equals(Aspect.MAGIC)) return 5200 * mStableValue / 25;
+        if (aspect.equals(Aspect.MECHANISM)) return 4000 * mStableValue / 25;
+        if (aspect.equals(TC_Aspects.ELECTRUM.mAspect)) return 32768 * mStableValue / 25;
+        if (aspect.equals(TC_Aspects.RADIO.mAspect)) return 131072 * mStableValue / 25;
+
+        return ENERGY_PER_ESSENTIA_DEFAULT * mStableValue / 25;
+    }
+
+    public long getEssentiaToEU(long EULimit) {
         long EUt = 0;
+
         for (EssentiaHatch hatch: this.mEssentiaHatch){
             AspectList aspects = hatch.getAspects();
             for (Aspect aspect: aspects.aspects.keySet()) {
-                while (EUt < 8192 && aspects.getAmount(aspect) > 0) {
-                    EUt += ENERGY_PER_ESSENTIA;
+                while (EUt < EULimit && aspects.getAmount(aspect) > 0) {
+                    EUt += getPerAspectEnergy(aspect);
                     aspects.reduce(aspect, 1);
                 }
             }
@@ -232,7 +264,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM
 
     @Override
     public String[] getStructureDescription(ItemStack itemStack) {
-        return new String[0];
+        return DescTextLocalization.addText("LargeEssentiaGenerator.hint", 5);
     }
 
     @Override
@@ -241,6 +273,29 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM
     }
 
     @Override
+    public String[] getDescription() {
+        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+        tt.addMachineType("Essentia Generator")
+                .addInfo("Controller block for the Large Essentia Generator")
+                .addInfo("Maybe some thaumaturages are upset by it. . .")
+                .addInfo("Transform essentia into energy!")
+                .addInfo("You can find more information about this generator in Thaumonomicon.")
+                .addInfo("The structure is too complex!")
+                .addInfo("Follow the" + EnumChatFormatting.DARK_BLUE + " Tec" + EnumChatFormatting.BLUE + "Tech" + EnumChatFormatting.GRAY + " blueprint to build the main structure.")
+                .addSeparator()
+                .addMaintenanceHatch("Hint block with dot 1")
+                .addInputHatch("Hint block with dot 1")
+                .addDynamoHatch("Hint block with dot 1")
+                .addOtherStructurePart("Essentia Input Hatch","Hint block with dot 1")
+                .toolTipFinisher("Good Generator");
+        if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+            return tt.getInformation();
+        } else {
+            return tt.getStructureInformation();
+        }
+    }
+
+    @Override
     @SuppressWarnings("ALL")
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
         if(aSide == aFacing) {
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
index cf38e0b221..769f4fefc6 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
@@ -392,11 +392,11 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implem
                       .addInfo("molten uranium-235 | 3x power | 9mb/t")
                       .addInfo("molten naquadah | 4x power | 1mb/t")
                       .addInfo("molten Atomic Separation Catalyst | 16x power | 1mb/t")
+                      .addInfo("The structure is too complex!")
+                      .addInfo("Follow the" + EnumChatFormatting.DARK_BLUE + " Tec" + EnumChatFormatting.BLUE + "Tech" + EnumChatFormatting.GRAY + " blueprint to build the main structure.")
                       .addSeparator()
                       .beginStructureBlock(7, 8, 7, true)
                       .addController("Front bottom")
-                      .addInfo("The structure is too complex!")
-                      .addInfo("Follow the" + EnumChatFormatting.DARK_BLUE + " Tec" + EnumChatFormatting.BLUE + "Tech" + EnumChatFormatting.GRAY + " blueprint to build the main structure.")
                       .addEnergyHatch("Any bottom layer casing, only accept ONE!")
                       .addInputHatch("Any bottom layer casing")
                       .addOutputHatch("Any bottom layer casing")
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java b/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
index de8470ef9b..06cbfdb7fc 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
@@ -206,7 +206,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBas
                 .addInfo("The structure is too complex!")
                 .addInfo("Follow the" + EnumChatFormatting.DARK_BLUE + " Tec" + EnumChatFormatting.BLUE + "Tech" + EnumChatFormatting.GRAY + " blueprint to build the main structure.")
                 .addSeparator()
-                .addEnergyHatch("Hint block with dot 1")
+                .addMaintenanceHatch("Hint block with dot 1")
                 .addMufflerHatch("Hint block with dot 2")
                 .addInputHatch("Hint block with dot 3")
                 .addDynamoHatch("Hint block with dot 4")
diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java
index a17bedec03..a69651c38b 100644
--- a/src/main/java/GoodGenerator/Loader/Loaders.java
+++ b/src/main/java/GoodGenerator/Loader/Loaders.java
@@ -68,7 +68,6 @@ public class Loaders {
         GameRegistry.registerBlock(FRF_Coil_3, MyItemBlocks.class, "FRF_Coil_3");
         GameRegistry.registerBlock(rawCylinder, MyItemBlocks.class, "rawCylinder");
         GameRegistry.registerBlock(titaniumPlatedCylinder, MyItemBlocks.class, "titaniumPlatedCylinder");
-        GameRegistry.registerBlock(essentiaHatch, MyItemBlocks.class, "essentiaHatch");
         GameRegistry.registerItem(radiationProtectionPlate, "radiationProtectionPlate", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(wrappedUraniumIngot, "wrappedUraniumIngot", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(highDensityUraniumNugget, "highDensityUraniumNugget", GoodGenerator.MOD_ID);
@@ -84,13 +83,14 @@ public class Loaders {
         GameRegistry.registerItem(aluminumNitride, "aluminumNitride", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(specialCeramics, "specialCeramics", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(specialCeramicsPlate, "specialCeramicsPlate", GoodGenerator.MOD_ID);
-        GameRegistry.registerTileEntity(EssentiaHatch.class, "EssentiaHatch");
         Loaders.MAR = new MultiNqGenerator(12732, "NaG", "Large Naquadah Reactor").getStackForm(1L);
         Loaders.FRF = new FuelRefineFactory(16999, "FRF", "Naquadah Fuel Refinery").getStackForm(1L);
         Loaders.UCFE = new UniversalChemicalFuelEngine(IDOffset, "UniversalChemicalFuelEngine", "Universal Chemical Fuel Engine").getStackForm(1L);
         if (Loader.isModLoaded("Thaumcraft")){
             GameRegistry.registerBlock(magicCasing, MyItemBlocks.class, "magicCasing");
             GameRegistry.registerBlock(essentiaCells[0], MyItemBlocks.class, "essentiaCell");
+            GameRegistry.registerBlock(essentiaHatch, MyItemBlocks.class, "essentiaHatch");
+            GameRegistry.registerTileEntity(EssentiaHatch.class, "EssentiaHatch");
             Loaders.LEG = new LargeEssentiaGenerator(IDOffset + 1, "LargeEssentiaGenerator", "Large Essentia Generator").getStackForm(1L);
         }
     }
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index c82acfeb96..6d5c40ee64 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -96,6 +96,11 @@ UniversalChemicalFuelEngine.hint.7=2 - Muffler Hatch
 UniversalChemicalFuelEngine.hint.8=3 - Input Hatch
 UniversalChemicalFuelEngine.hint.9=4 - Dynamo Hatch
 UniversalChemicalFuelEngine.hint.10=Doesn't support TecTech Dynamo Hatch
+LargeEssentiaGenerator.hint.0=25x Any Essentia Cell
+LargeEssentiaGenerator.hint.1=4x Amber Bricks
+LargeEssentiaGenerator.hint.2=24x Arcane Stone Bricks
+LargeEssentiaGenerator.hint.3=At least 53x Magic Casings
+LargeEssentiaGenerator.hint.4=1 - Maintenance Hatch/Input Hatch/Dynamo Hatch/Essentia Input Hatch
 
 achievement.gt.blockmachines.nag=Large Naquadah Reactor
 achievement.gt.blockmachines.nag.desc=Pickup this item to see the recipe in NEI