add a new booster liquid

9 files changed, 236 insertions, 4 deletions

diff --git a/gradle.properties b/gradle.properties
index 7db2fe398a..5d34e1ca6d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 modId = GoodGenerator
 modGroup = GoodGenerator
-modVersion = 0.0.2-QF1
+modVersion = 0.0.5
 
 minecraftVersion=1.7.10
 forgeVersion=10.13.4.1614
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
index ec4c2c593d..a7f5cf02f1 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
@@ -1,5 +1,6 @@
 package GoodGenerator.Blocks.TEs;
 
+import GoodGenerator.Items.MyMaterial;
 import GoodGenerator.Loader.Loaders;
 import GoodGenerator.Main.GoodGenerator;
 import GoodGenerator.util.MyRecipeAdder;
@@ -193,7 +194,11 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implem
         }
 
         if(tFluids.size() > 0){
-            if(tFluids.contains(Materials.Naquadah.getMolten(1L)) && tFluids.get(tFluids.indexOf(Materials.Naquadah.getMolten(1L))).amount >= 1){
+            if (tFluids.contains((MyMaterial.atomicSeparationCatalyst.getMolten(1))) && tFluids.get(tFluids.indexOf(MyMaterial.atomicSeparationCatalyst.getMolten(1))).amount >= 1){
+                times = 16;
+                f2=MyMaterial.atomicSeparationCatalyst.getMolten(1);
+            }
+            else if(tFluids.contains(Materials.Naquadah.getMolten(1L)) && tFluids.get(tFluids.indexOf(Materials.Naquadah.getMolten(1L))).amount >= 1){
                 times = 4;
                 f2=Materials.Naquadah.getMolten(1L);
             }
@@ -328,6 +333,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implem
                       .addInfo("molten caesium | 2x power | 9mb/t ")
                       .addInfo("molten uranium-235 | 3x power | 9mb/t")
                       .addInfo("molten naquadah | 4x power | 1mb/t")
+                      .addInfo("molten Atomic Separation Catalyst | 16x power | 1mb/t")
                       .addSeparator()
                       .beginStructureBlock(7, 8, 7, true)
                       .addController("Front bottom")
diff --git a/src/main/java/GoodGenerator/Items/MyItems.java b/src/main/java/GoodGenerator/Items/MyItems.java
index 126880a247..21d998a4d2 100644
--- a/src/main/java/GoodGenerator/Items/MyItems.java
+++ b/src/main/java/GoodGenerator/Items/MyItems.java
@@ -21,6 +21,4 @@ public class MyItems extends Item {
         public void registerIcons(IIconRegister iconRegister) {
                 this.itemIcon = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":" + this.tex);
         }
-
-
 }
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java
index 4c3522b1fc..398d14ce4b 100644
--- a/src/main/java/GoodGenerator/Items/MyMaterial.java
+++ b/src/main/java/GoodGenerator/Items/MyMaterial.java
@@ -253,6 +253,29 @@ public class MyMaterial implements Runnable {
             new Pair<> (WerkstoffLoader.Thorium232,1),
             new Pair<> (Fluorine,4)
     );
+
+    //Atomic Separation Catalyst
+    public static final Werkstoff atomicSeparationCatalyst = new Werkstoff(
+            new short[]{0xe8,0x5e,0x0c},
+            "Atomic Separation Catalyst",
+            "the melting core...",
+            new Werkstoff.Stats().setMeltingPoint(5000).setBlastFurnace(true),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems().addSimpleMetalWorkingItems().addCraftingMetalWorkingItems().addMultipleIngotMetalWorkingItems(),
+            31021,
+            TextureSet.SET_SHINY
+    );
+
+    public static final Werkstoff orundum = new Werkstoff(
+            new short[]{0xcd,0x26,0x26},
+            "Orundum",
+            "Or",
+            new Werkstoff.Stats(),
+            Werkstoff.Types.ELEMENT,
+            new Werkstoff.GenerationFeatures().addGems(),
+            31022,
+            TextureSet.SET_DIAMOND
+    );
     @Override
     public void run() { }
 }
diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java
index c471314a0c..c2a475aa9e 100644
--- a/src/main/java/GoodGenerator/Loader/Loaders.java
+++ b/src/main/java/GoodGenerator/Loader/Loaders.java
@@ -23,6 +23,7 @@ public class Loaders {
     public static final Item wrappedPlutoniumIngot = new MyItems("wrappedPlutoniumIngot",GoodGenerator.GG);
     public static final Item highDensityPlutoniumNugget = new MyItems("highDensityPlutoniumNugget",GoodGenerator.GG);
     public static final Item highDensityPlutonium = new MyItems("highDensityPlutonium",GoodGenerator.GG);
+    public static final Item rawAtomicSeparationCatalyst = new MyItems("rawAtomicSeparationCatalyst",GoodGenerator.GG);
 
     public static final Block MAR_Casing = new Casing("MAR_Casing",new String[]{
             GoodGenerator.MOD_ID+":MAR_Casing"
@@ -45,6 +46,9 @@ public class Loaders {
         GameRegistry.registerItem(wrappedPlutoniumIngot,"wrappedPlutoniumIngot",GoodGenerator.MOD_ID);
         GameRegistry.registerItem(highDensityPlutoniumNugget,"highDensityPlutoniumNugget",GoodGenerator.MOD_ID);
         GameRegistry.registerItem(highDensityPlutonium,"highDensityPlutonium",GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rawAtomicSeparationCatalyst,"rawAtomicSeparationCatalyst",GoodGenerator.MOD_ID);
         Loaders.MAR = new MultiNqGenerator(12732,"NaG","Large Naquadah Reactor").getStackForm(1L);
     }
+
+    public static void addOreDic(){ }
 }
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
index aaca98af35..7811f1b824 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
@@ -9,6 +9,8 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.util.GT_Utility;
 
+import static net.minecraft.init.Blocks.furnace;
+
 public class RecipeLoader {
     public static void RecipeLoad(){
 
@@ -407,5 +409,200 @@ public class RecipeLoader {
                 120,
                 2500
         );
+
+        //Atomic Separation Catalyst
+        GT_Values.RA.addMixerRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
+                GT_Utility.getIntegratedCircuit(4),null,
+                Materials.Naquadah.getMolten(288),
+                null,
+                new ItemStack(Loaders.rawAtomicSeparationCatalyst,9),
+                300,
+                480
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
+                GT_Utility.getIntegratedCircuit(4),null,
+                Materials.Naquadah.getMolten(288),
+                null,
+                new ItemStack(Loaders.rawAtomicSeparationCatalyst,9),
+                300,
+                480
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
+                GT_Utility.getIntegratedCircuit(4),null,
+                Materials.Naquadah.getMolten(288),
+                null,
+                new ItemStack(Loaders.rawAtomicSeparationCatalyst,27),
+                300,
+                480
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
+                GT_Utility.getIntegratedCircuit(4),null,
+                Materials.Naquadah.getMolten(288),
+                null,
+                new ItemStack(Loaders.rawAtomicSeparationCatalyst,27),
+                300,
+                480
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
+                GT_Utility.getIntegratedCircuit(4),null,
+                Materials.Naquadah.getMolten(288),
+                null,
+                new ItemStack(Loaders.rawAtomicSeparationCatalyst,9),
+                300,
+                480
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
+                GT_Utility.getIntegratedCircuit(4),null,
+                Materials.Naquadah.getMolten(288),
+                null,
+                new ItemStack(Loaders.rawAtomicSeparationCatalyst,9),
+                300,
+                480
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4),
+                GT_Utility.getIntegratedCircuit(4),null,
+                Materials.Naquadah.getMolten(288),
+                null,
+                new ItemStack(Loaders.rawAtomicSeparationCatalyst,27),
+                300,
+                480
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4),
+                GT_Utility.getIntegratedCircuit(4),null,
+                Materials.Naquadah.getMolten(288),
+                null,
+                new ItemStack(Loaders.rawAtomicSeparationCatalyst,27),
+                300,
+                480
+        );
+
+        GT_Values.RA.addFormingPressRecipe(
+                WerkstoffLoader.Tiberium.get(OrePrefixes.plate,4),
+                GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Silicon,8),
+                MyMaterial.orundum.get(OrePrefixes.plate,1),
+                400,
+                3000
+        );
+
+        GT_Values.RA.addBlastRecipe(
+                MyMaterial.orundum.get(OrePrefixes.plate,2),
+                new ItemStack(Loaders.rawAtomicSeparationCatalyst,4),
+                Materials.Plutonium.getMolten(144),
+                null,
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot,1),
+                null,
+                3600,
+                480,
+                5000
+        );
+
+        GT_Values.RA.addVacuumFreezerRecipe(
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot,1),
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingot,1),
+                450,
+                960
+        );
+
+        GT_Values.RA.addFluidExtractionRecipe(
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingot,1),
+                null,
+                MyMaterial.atomicSeparationCatalyst.getMolten(144),
+                0,
+                32,
+                7
+        );
+
+        GT_Values.RA.addFluidExtractionRecipe(
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.stickLong,1),
+                null,
+                MyMaterial.atomicSeparationCatalyst.getMolten(144),
+                0,
+                32,
+                7
+        );
+
+        GT_Values.RA.addFluidExtractionRecipe(
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.plate,1),
+                null,
+                MyMaterial.atomicSeparationCatalyst.getMolten(144),
+                0,
+                32,
+                7
+        );
+
+        GT_Values.RA.addFluidExtractionRecipe(
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.stick,1),
+                null,
+                MyMaterial.atomicSeparationCatalyst.getMolten(72),
+                0,
+                16,
+                7
+        );
+
+        GT_Values.RA.addFluidExtractionRecipe(
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.nugget,1),
+                null,
+                MyMaterial.atomicSeparationCatalyst.getMolten(16),
+                0,
+                8,
+                7
+        );
+
+        GT_Values.RA.addFluidExtractionRecipe(
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.gearGt,1),
+                null,
+                MyMaterial.atomicSeparationCatalyst.getMolten(576),
+                0,
+                128,
+                7
+        );
+
+        GT_Values.RA.addFluidExtractionRecipe(
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.gearGtSmall,1),
+                null,
+                MyMaterial.atomicSeparationCatalyst.getMolten(144),
+                0,
+                32,
+                7
+        );
     }
 }
diff --git a/src/main/java/GoodGenerator/Main/GoodGenerator.java b/src/main/java/GoodGenerator/Main/GoodGenerator.java
index 4751270c4f..71f9fc83da 100644
--- a/src/main/java/GoodGenerator/Main/GoodGenerator.java
+++ b/src/main/java/GoodGenerator/Main/GoodGenerator.java
@@ -14,6 +14,8 @@ import net.minecraft.creativetab.CreativeTabs;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 
+import static GoodGenerator.Loader.Loaders.addOreDic;
+
 @SuppressWarnings("ALL")
 @Mod(modid = GoodGenerator.MOD_ID, version = GoodGenerator.VERSION)
 public final class GoodGenerator {
@@ -31,6 +33,7 @@ public final class GoodGenerator {
     @Mod.EventHandler
     public static void preInit(FMLPreInitializationEvent event){
         WerkstoffAdderRegistry.addWerkstoffAdder(new MyMaterial());
+        addOreDic();
         proxy.preInit(event);
     }
     @Mod.EventHandler
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index d7f2681469..0c50918da4 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -12,6 +12,7 @@ item.highDensityThorium.name=High Density Thorium
 item.wrappedPlutoniumIngot.name=Wrapped Plutonium Ingot
 item.highDensityPlutoniumNugget.name=High Density Plutonium Nugget
 item.highDensityPlutonium.name=High Density Plutonium
+item.rawAtomicSeparationCatalyst.name=Raw Atomic Separation Catalyst
 
 itemGroup.Good Generator=Good Generator
 
diff --git a/src/main/resources/assets/goodgenerator/textures/items/rawAtomicSeparationCatalyst.png b/src/main/resources/assets/goodgenerator/textures/items/rawAtomicSeparationCatalyst.png
new file mode 100644
index 0000000000..62aaad4fcc
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/rawAtomicSeparationCatalyst.png