Remove reflection from RTG Hatch (#411)

2 files changed, 7 insertions, 25 deletions

diff --git a/dependencies.gradle b/dependencies.gradle
index 9fa295250a..96d044a44e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.98:dev')
+    compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.99:dev')
     compile("com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev")
     compile("com.github.GTNewHorizons:NotEnoughItems:2.3.7-GTNH:dev")
     compile('com.github.GTNewHorizons:CodeChickenCore:1.1.6:dev')
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java
index d70a84949f..726f7d09d9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java
@@ -13,8 +13,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -26,18 +24,14 @@ public class GT_MetaTileEntity_Hatch_Energy_RTG extends GT_MetaTileEntity_Hatch_
 
     public GT_MetaTileEntity_Hatch_Energy_RTG(
             int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount) {
-        super(aID, aName, aNameRegional, aTier);
-        setInventoryContent(aInvSlotCount);
-    }
-
-    public GT_MetaTileEntity_Hatch_Energy_RTG(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
-        super(aName, aTier, aDescription, aTextures);
+        super(aID, aName, aNameRegional, aTier, aInvSlotCount, new String[] {
+            "Energy Injector for Multiblocks", "Accepts up to 2 Amps"
+        });
     }
 
     public GT_MetaTileEntity_Hatch_Energy_RTG(
-            String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int aInvSlotCount) {
-        super(aName, aTier, aDescription, aTextures);
-        setInventoryContent(aInvSlotCount);
+            String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
@@ -117,7 +111,7 @@ public class GT_MetaTileEntity_Hatch_Energy_RTG extends GT_MetaTileEntity_Hatch_
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Energy_RTG(mName, mTier, mDescriptionArray, mTextures, 9);
+        return new GT_MetaTileEntity_Hatch_Energy_RTG(mName, mTier, 9, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -285,16 +279,4 @@ public class GT_MetaTileEntity_Hatch_Energy_RTG extends GT_MetaTileEntity_Hatch_
         }
         return null;
     }
-
-    private void setInventoryContent(int aInvSlotCount) {
-        try {
-            Field fieldInventory = MetaTileEntity.class.getDeclaredField("mInventory");
-            Field modifiersField = Field.class.getDeclaredField("modifiers");
-            modifiersField.setAccessible(true);
-            modifiersField.setInt(fieldInventory, fieldInventory.getModifiers() & ~Modifier.PRIVATE & ~Modifier.FINAL);
-            fieldInventory.set(this, new ItemStack[aInvSlotCount]);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 }