add Neutron Activator and NEI compact

2 files changed, 22 insertions, 3 deletions

diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java
index 88ea24b226..0b78e92bd7 100644
--- a/src/main/java/GoodGenerator/Loader/Loaders.java
+++ b/src/main/java/GoodGenerator/Loader/Loaders.java
@@ -1,6 +1,7 @@
 package GoodGenerator.Loader;
 
 import GoodGenerator.Blocks.RegularBlock.Casing;
+import GoodGenerator.Blocks.RegularBlock.ComplexTextureCasing;
 import GoodGenerator.Blocks.RegularBlock.Frame;
 import GoodGenerator.Blocks.RegularBlock.TEBlock;
 import GoodGenerator.Blocks.TEs.*;
@@ -40,6 +41,7 @@ public class Loaders {
     public static final Item aluminumNitride = new MyItems("aluminumNitride", GoodGenerator.GG);
     public static final Item specialCeramics = new MyItems("specialCeramics", GoodGenerator.GG);
     public static final Item specialCeramicsPlate = new MyItems("specialCeramicsPlate", GoodGenerator.GG);
+    public static final Item radioactiveWaste = new MyItems("radioactiveWaste", GoodGenerator.GG);
 
     public static final Block MAR_Casing = new Casing("MAR_Casing", new String[]{GoodGenerator.MOD_ID+":MAR_Casing"});
     public static final Block FRF_Casings = new Casing("FRF_Casing", new String[]{"gregtech:iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM"});
@@ -52,15 +54,17 @@ public class Loaders {
     public static final Block titaniumPlatedCylinder = new Casing("titaniumPlatedCylinder", new String[]{GoodGenerator.MOD_ID+":titaniumPlatedCylinder"});
     public static final Block magicCasing = new Casing("magicCasing", new String[]{GoodGenerator.MOD_ID+":MagicCasing"});
     public static final Block essentiaCell = new Casing("essentiaCell", new String[]{GoodGenerator.MOD_ID+":essentiaCell/1",GoodGenerator.MOD_ID+":essentiaCell/2",GoodGenerator.MOD_ID+":essentiaCell/3"});
-    public static final Block essentiaHatch = new TEBlock("essentiaHatch", new String[]{GoodGenerator.MOD_ID+":essentiaHatch"}, 1);
-
+    public static final Block speedingPipe = new ComplexTextureCasing("speedingPipe", new String[]{GoodGenerator.MOD_ID+":speedingPipe_SIDE"}, new String[]{GoodGenerator.MOD_ID+":speedingPipe_TOP"});
     public static final Block[] essentiaCells = new Block[]{essentiaCell};
 
+    public static Block essentiaHatch;
+
     public static ItemStack MAR;
     public static ItemStack FRF;
     public static ItemStack UCFE;
     public static ItemStack LEG;
     public static ItemStack NS;
+    public static ItemStack NA;
 
     public static ItemStack[] NeutronAccelerators = new ItemStack[9];
 
@@ -74,6 +78,7 @@ 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(speedingPipe, MyItemBlocks.class, "speedingPipe");
         GameRegistry.registerItem(radiationProtectionPlate, "radiationProtectionPlate", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(wrappedUraniumIngot, "wrappedUraniumIngot", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(highDensityUraniumNugget, "highDensityUraniumNugget", GoodGenerator.MOD_ID);
@@ -89,6 +94,7 @@ 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.registerItem(radioactiveWaste, "radioactiveWaste", GoodGenerator.MOD_ID);
         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);
@@ -102,7 +108,14 @@ public class Loaders {
         for (int i = 0; i < 9; i ++) {
             Loaders.NeutronAccelerators[i] = new NeutronAccelerator(IDOffset + 2 + i, "Neutron Accelerator " + GT_Values.VN[i], "Neutron Accelerator " + GT_Values.VN[i], i).getStackForm(1L);
         }
-       Loaders.NS = new NeutronSensor(IDOffset + 11, "Neutron Sensor", "Neutron Sensor", 5).getStackForm(1L);
+        Loaders.NS = new NeutronSensor(IDOffset + 11, "Neutron Sensor", "Neutron Sensor", 5).getStackForm(1L);
+        Loaders.NA = new NeutronActivator(IDOffset + 12, "NeutronActivator", "Neutron Activator").getStackForm(1L);
+    }
+
+    public static void compactMod() {
+        if (Loader.isModLoaded("Thaumcraft")) {
+            essentiaHatch = new TEBlock("essentiaHatch", new String[]{GoodGenerator.MOD_ID + ":essentiaHatch"}, 1);
+        }
     }
 
     public static void addOreDic(){
diff --git a/src/main/java/GoodGenerator/Loader/NeutronActivatorLoader.java b/src/main/java/GoodGenerator/Loader/NeutronActivatorLoader.java
new file mode 100644
index 0000000000..01555eb8d2
--- /dev/null
+++ b/src/main/java/GoodGenerator/Loader/NeutronActivatorLoader.java
@@ -0,0 +1,6 @@
+package GoodGenerator.Loader;
+
+public class NeutronActivatorLoader {
+    public static void NARecipeLoad() {
+    }
+}