addd two new fuel

9 files changed, 509 insertions, 14 deletions

diff --git a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
index 94857b73f6..57923a99ad 100644
--- a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
+++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
@@ -23,6 +23,7 @@ public class FluidsBuilder {
         crackedNaquadahAsphalt_Moderately();
         crackedNaquadahAsphalt_Heavily();
         combustionPromotor();
+        coalTar();
     }
 
     public static void crackedNaquadahGas_Lightly(){
@@ -173,4 +174,16 @@ public class FluidsBuilder {
         GameRegistry.registerBlock(tmp2,"combustionPromotor");
         NEI_Config.hide(tmp2);
     }
+
+    public static void coalTar(){
+        Fluid tmp = BaseFluid.BuildFluid("fluid.coalTar");
+        tmp.setGaseous(false)
+                .setTemperature(450)
+                .setUnlocalizedName("fluid.coalTar");
+        BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
+        tmp2.SetTexture("coalTar");
+        tmp2.setBlockTextureName("coalTar");
+        GameRegistry.registerBlock(tmp2,"coalTar");
+        NEI_Config.hide(tmp2);
+    }
 }
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java
new file mode 100644
index 0000000000..9f1d2b7005
--- /dev/null
+++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java
@@ -0,0 +1,159 @@
+package goodgenerator.blocks.tileEntity.GTMetaTileEntity;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.GT_Mod;
+import gregtech.api.enums.ItemList;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
+import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+
+import static gregtech.api.enums.Textures.BlockIcons.*;
+import static gregtech.api.enums.Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE_GLOW;
+
+public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator {
+
+    public int mEfficiency;
+
+    public DieselGenerator(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, new String[]{
+                "Requires liquid Fuel",
+                "Causes " + (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - aTier * 0.1)) + " Pollution per second"});
+        mEfficiency = 100 - aTier * 5;
+    }
+
+    public DieselGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+        mEfficiency = 100 - aTier * 5;
+    }
+
+    @Override
+    public boolean isOutputFacing(byte aSide) {
+        return aSide == getBaseMetaTileEntity().getFrontFacing();
+    }
+
+    @Override
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new DieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+    }
+
+    @Override
+    public GT_Recipe.GT_Recipe_Map getRecipes() {
+        return GT_Recipe.GT_Recipe_Map.sDieselFuels;
+    }
+
+    @Override
+    public int getCapacity() {
+        return 16000;
+    }
+
+    @Override
+    public int getEfficiency() {
+        return this.mEfficiency;
+    }
+
+    @Override
+    public int getFuelValue(ItemStack aStack) {
+        if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return 0;
+        long rValue = Math.max(GT_ModHandler.getFuelCanValue(aStack) * 6 / 5, super.getFuelValue(aStack));
+        if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
+            rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3L);
+        }
+        if (rValue > Integer.MAX_VALUE) {
+            throw new ArithmeticException("Integer LOOPBACK!");
+        }
+        return (int) rValue;
+    }
+
+    @Override
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if (aTick % 100 == 0 && mFluid != null && mFluid.amount > this.getCapacity()) {
+            GT_Log.err.println("Dupe Abuse: " + aBaseMetaTileEntity.getOwnerName() + " Coords: " + aBaseMetaTileEntity.getXCoord() + " " + aBaseMetaTileEntity.getYCoord() + " " + aBaseMetaTileEntity.getZCoord());
+            aBaseMetaTileEntity.setToFire();
+        }
+        super.onPostTick(aBaseMetaTileEntity, aTick);
+    }
+
+    @Override
+    public ITexture[] getFront(byte aColor) {
+        return new ITexture[]{super.getFront(aColor)[0], TextureFactory.of(
+                TextureFactory.of(DIESEL_GENERATOR_FRONT),
+                TextureFactory.builder().addIcon(DIESEL_GENERATOR_FRONT_GLOW).glow().build()),
+                OVERLAYS_ENERGY_OUT[this.mTier]};
+    }
+
+    @Override
+    public ITexture[] getBack(byte aColor) {
+        return new ITexture[]{super.getBack(aColor)[0], TextureFactory.of(
+                TextureFactory.of(DIESEL_GENERATOR_BACK),
+                TextureFactory.builder().addIcon(DIESEL_GENERATOR_BACK_GLOW).glow().build())};
+    }
+
+    @Override
+    public ITexture[] getBottom(byte aColor) {
+        return new ITexture[]{super.getBottom(aColor)[0], TextureFactory.of(
+                TextureFactory.of(DIESEL_GENERATOR_BOTTOM),
+                TextureFactory.builder().addIcon(DIESEL_GENERATOR_BOTTOM_GLOW).glow().build())};
+    }
+
+    @Override
+    public ITexture[] getTop(byte aColor) {
+        return new ITexture[]{super.getTop(aColor)[0], TextureFactory.of(
+                TextureFactory.of(DIESEL_GENERATOR_TOP),
+                TextureFactory.builder().addIcon(DIESEL_GENERATOR_TOP_GLOW).glow().build())};
+    }
+
+    @Override
+    public ITexture[] getSides(byte aColor) {
+        return new ITexture[]{super.getSides(aColor)[0], TextureFactory.of(
+                TextureFactory.of(DIESEL_GENERATOR_SIDE),
+                TextureFactory.builder().addIcon(DIESEL_GENERATOR_SIDE_GLOW).glow().build())};
+    }
+
+    @Override
+    public ITexture[] getFrontActive(byte aColor) {
+        return new ITexture[]{super.getFrontActive(aColor)[0], TextureFactory.of(
+                TextureFactory.of(DIESEL_GENERATOR_FRONT_ACTIVE),
+                TextureFactory.builder().addIcon(DIESEL_GENERATOR_FRONT_ACTIVE_GLOW).glow().build()),
+                OVERLAYS_ENERGY_OUT[this.mTier]};
+    }
+
+    @Override
+    public ITexture[] getBackActive(byte aColor) {
+        return new ITexture[]{super.getBackActive(aColor)[0], TextureFactory.of(
+                TextureFactory.of(DIESEL_GENERATOR_BACK_ACTIVE),
+                TextureFactory.builder().addIcon(DIESEL_GENERATOR_BACK_ACTIVE_GLOW).glow().build())};
+    }
+
+    @Override
+    public ITexture[] getBottomActive(byte aColor) {
+        return new ITexture[]{super.getBottomActive(aColor)[0], TextureFactory.of(
+                TextureFactory.of(DIESEL_GENERATOR_BOTTOM_ACTIVE),
+                TextureFactory.builder().addIcon(DIESEL_GENERATOR_BOTTOM_ACTIVE_GLOW).glow().build())};
+    }
+
+    @Override
+    public ITexture[] getTopActive(byte aColor) {
+        return new ITexture[]{super.getTopActive(aColor)[0], TextureFactory.of(
+                TextureFactory.of(DIESEL_GENERATOR_TOP_ACTIVE),
+                TextureFactory.builder().addIcon(DIESEL_GENERATOR_TOP_ACTIVE_GLOW).glow().build())};
+    }
+
+    @Override
+    public ITexture[] getSidesActive(byte aColor) {
+        return new ITexture[]{super.getSidesActive(aColor)[0], TextureFactory.of(
+                TextureFactory.of(DIESEL_GENERATOR_SIDE_ACTIVE),
+                TextureFactory.builder().addIcon(DIESEL_GENERATOR_SIDE_ACTIVE_GLOW).glow().build())};
+    }
+
+    @Override
+    public int getPollution() {
+        return (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - mTier * 0.1));
+    }
+}
diff --git a/src/main/java/goodgenerator/crossmod/LoadedList.java b/src/main/java/goodgenerator/crossmod/LoadedList.java
new file mode 100644
index 0000000000..f3921f64b8
--- /dev/null
+++ b/src/main/java/goodgenerator/crossmod/LoadedList.java
@@ -0,0 +1,17 @@
+package goodgenerator.crossmod;
+
+import cpw.mods.fml.common.Loader;
+
+public class LoadedList {
+
+    public static boolean GTPP;
+    public static boolean GTNH_CORE;
+    public static boolean BOTDUSTRIES;
+
+    public static void init() {
+        GTPP = Loader.isModLoaded("miscutils");
+        GTNH_CORE = Loader.isModLoaded("dreamcraft");
+        BOTDUSTRIES = Loader.isModLoaded("botdustries");
+    }
+
+}
diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java
index bd7489a593..4787615b16 100644
--- a/src/main/java/goodgenerator/items/MyMaterial.java
+++ b/src/main/java/goodgenerator/items/MyMaterial.java
@@ -605,7 +605,7 @@ public class MyMaterial implements Runnable {
             subscriptNumbers("ZnTh"),
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
-            new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(),
+            new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems().addMultipleIngotMetalWorkingItems(),
             OffsetID + 52,
             TextureSet.SET_SHINY,
             new Pair<>(Zinc, 1),
@@ -954,7 +954,7 @@ public class MyMaterial implements Runnable {
             subscriptNumbers("Zr34Sn5Fe2Cr"),
             new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(2800),
             Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 4),
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 4),
             OffsetID + 81,
             TextureSet.SET_METALLIC,
             new Pair<>(WerkstoffLoader.Zirconium, 34),
@@ -969,7 +969,7 @@ public class MyMaterial implements Runnable {
             subscriptNumbers("Zr34Sn4FeCrNi"),
             new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(2800),
             Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 2),
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 2),
             OffsetID + 82,
             TextureSet.SET_METALLIC,
             new Pair<>(WerkstoffLoader.Zirconium, 34),
@@ -985,7 +985,7 @@ public class MyMaterial implements Runnable {
             subscriptNumbers("Fe12Ni10Co8Ti4Mo2Al"),
             new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(3700),
             Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 6),
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 6),
             OffsetID + 83,
             TextureSet.SET_METALLIC,
             new Pair<>(Iron, 12),
@@ -1000,9 +1000,9 @@ public class MyMaterial implements Runnable {
             new short[]{0xa0,0xa0,0xa0},
             "Adamantium Alloy",
             subscriptNumbers("Ad5Nq2La3"),
-            new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(5000),
+            new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(5500).setSpeedOverride(191.2F).setDurOverride(102400),
             Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 3),
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 3),
             OffsetID + 84,
             TextureSet.SET_SHINY,
             new Pair<>(Adamantium, 5),
@@ -1014,12 +1014,106 @@ public class MyMaterial implements Runnable {
             new short[]{0xe4,0xc6,0x61},
             "Ethanol Gasoline",
             new Werkstoff.Stats(),
-            Werkstoff.Types.COMPOUND,
+            Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             OffsetID + 85,
             TextureSet.SET_FLUID
     );
 
+    public static final Werkstoff cyclopentadiene = new Werkstoff(
+            new short[]{0xff,0xf6,0xbd},
+            "Cyclopentadiene",
+            subscriptNumbers("C5H6"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            OffsetID + 86,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff ferrousChloride = new Werkstoff(
+            new short[]{0x5b,0x5b,0x5b},
+            "Iron II Chloride",
+            subscriptNumbers("FeCl2"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            OffsetID + 87,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff diethylamine = new Werkstoff(
+            new short[]{0x69,0x77,0xca},
+            "Diethylamine",
+            subscriptNumbers("C4H11N"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            OffsetID + 88,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff impureFerroceneMixture = new Werkstoff(
+            new short[]{0x79,0x55,0x08},
+            "Impure Ferrocene Mixture",
+            new Werkstoff.Stats(),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            OffsetID + 89,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff ferroceneSolution = new Werkstoff(
+            new short[]{0xde,0x7e,0x1c},
+            "Ferrocene Solution",
+            new Werkstoff.Stats(),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            OffsetID + 90,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff ferroceneWaste = new Werkstoff(
+            new short[]{0x35,0x1d,0x03},
+            "Ferrocene Waste",
+            new Werkstoff.Stats(),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            OffsetID + 91,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff ferrocene = new Werkstoff(
+            new short[]{0xf1,0x8f,0x2b},
+            "Ferrocene",
+            subscriptNumbers("Fe(C5H5)2"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().onlyDust(),
+            OffsetID + 92,
+            TextureSet.SET_SHINY
+    );
+
+    public static final Werkstoff ironedKerosene = new Werkstoff(
+            new short[]{0x97,0x00,0x61},
+            "Jet Fuel No.3",
+            new Werkstoff.Stats(),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            OffsetID + 93,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff ironedFuel = new Werkstoff(
+            new short[]{0xff,0x98,0x00},
+            "Jet Fuel A",
+            new Werkstoff.Stats(),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            OffsetID + 94,
+            TextureSet.SET_FLUID
+    );
+
     @Override
     public void run() { }
 }
diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
index 95c956a85a..9983c96d86 100644
--- a/src/main/java/goodgenerator/loader/Loaders.java
+++ b/src/main/java/goodgenerator/loader/Loaders.java
@@ -6,8 +6,10 @@ import goodgenerator.blocks.regularBlock.ComplexTextureCasing;
 import goodgenerator.blocks.regularBlock.Frame;
 import goodgenerator.blocks.regularBlock.TEBlock;
 import goodgenerator.blocks.tileEntity.*;
+import goodgenerator.blocks.tileEntity.GTMetaTileEntity.DieselGenerator;
 import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronAccelerator;
 import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor;
+import goodgenerator.crossmod.LoadedList;
 import goodgenerator.crossmod.nei.IMCForNEI;
 import goodgenerator.crossmod.nei.NEI_Config;
 import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData;
@@ -92,6 +94,7 @@ public class Loaders {
     public static ItemStack YFT;
 
     public static ItemStack[] NeutronAccelerators = new ItemStack[9];
+    public static ItemStack[] Generator_Diesel = new ItemStack[2];
 
     public static Item Isotope = new NuclearMetaItemGenerator();
 
@@ -105,6 +108,8 @@ public class Loaders {
         Loaders.NS = new NeutronSensor(IDOffset + 11, "Neutron Sensor", "Neutron Sensor", 5).getStackForm(1L);
         Loaders.NA = new NeutronActivator(IDOffset + 12, "NeutronActivator", "Neutron Activator").getStackForm(1L);
         Loaders.YFT = new YottaFluidTank(IDOffset + 13, "YottaFluidTank", "YOTTank").getStackForm(1L);
+        Loaders.Generator_Diesel[0] = new DieselGenerator(1113, "basicgenerator.diesel.tier.04", "Turbo Supercharging Combustion Generator", 4).getStackForm(1);
+        Loaders.Generator_Diesel[1] = new DieselGenerator(1114, "basicgenerator.diesel.tier.05", "Ultimate Chemical Energy Releaser", 5).getStackForm(1);
     }
 
     public static void Register() {
@@ -187,6 +192,7 @@ public class Loaders {
         compactMod();
         FluidsBuilder.Register();
         FuelRodLoader.RegisterRod();
+        LoadedList.init();
     }
 
     public static void initLoad(){
diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
index 609534d8f4..df2b4e504b 100644
--- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -1,11 +1,11 @@
 package goodgenerator.loader;
 
+import goodgenerator.crossmod.LoadedList;
 import goodgenerator.main.GoodGenerator;
 import goodgenerator.util.ItemRefer;
 import goodgenerator.util.MyRecipeAdder;
 import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -853,7 +853,7 @@ public class NaquadahReworkRecipeLoader {
 
         GT_Log.out.print("Multi Chemical Reactor done!\n");
 
-        if (Loader.isModLoaded("miscutils")) {
+        if (LoadedList.GTPP) {
             //For Multi Centrifuge
             //Blame alk. She made some shit in it, NEI will break down if anyone modify the hash list directly.
             GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.clear();
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
index f98a44a6b9..f7c472b921 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -1,11 +1,11 @@
 package goodgenerator.loader;
 
+import goodgenerator.crossmod.LoadedList;
 import goodgenerator.items.MyMaterial;
 import goodgenerator.util.CrackRecipeAdder;
 import goodgenerator.util.ItemRefer;
 import goodgenerator.util.MaterialFix;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -690,6 +690,9 @@ public class RecipeLoader {
         GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell), null, 537, 0);
         GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell), null, 537, 1);
         GT_Values.RA.addFuel(MyMaterial.ethanolGasoline.get(OrePrefixes.cell), null, 750, 0);
+        GT_Values.RA.addFuel(MyMaterial.cyclopentadiene.get(OrePrefixes.cell), null, 70, 1);
+        GT_Values.RA.addFuel(MyMaterial.ironedFuel.get(OrePrefixes.cell), null, 2048, 0);
+        GT_Values.RA.addFuel(MyMaterial.ironedKerosene.get(OrePrefixes.cell), null, 1324, 0);
 
         GT_Values.RA.addMultiblockChemicalRecipe(
                 new ItemStack[]{
@@ -926,7 +929,7 @@ public class RecipeLoader {
                 65536
         );
 
-        if (Loader.isModLoaded("dreamcraft")) {
+        if (LoadedList.GTNH_CORE) {
             GT_Values.RA.addAssemblylineRecipe(
                     MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot),
                     300000,
@@ -1237,7 +1240,7 @@ public class RecipeLoader {
                 120
         );
 
-        if (Loader.isModLoaded("miscutils")) {
+        if (LoadedList.GTPP) {
             GT_Values.RA.addMultiblockChemicalRecipe(
                     new ItemStack[]{
                             GT_Utility.getIntegratedCircuit(16),
@@ -1290,7 +1293,7 @@ public class RecipeLoader {
             );
         }
 
-        if (Loader.isModLoaded("botdustries")) {
+        if (LoadedList.BOTDUSTRIES) {
             GT_Values.RA.addMultiblockChemicalRecipe(
                     new ItemStack[]{
                             GT_Utility.getIntegratedCircuit(16),
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index 9c66226c1b..d2bda42305 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -1,5 +1,6 @@
 package goodgenerator.loader;
 
+import goodgenerator.crossmod.LoadedList;
 import goodgenerator.items.MyMaterial;
 import goodgenerator.util.CrackRecipeAdder;
 import goodgenerator.util.ItemRefer;
@@ -14,6 +15,7 @@ import gregtech.api.util.GT_Utility;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
 
 public class RecipeLoader_02 {
 
@@ -38,7 +40,7 @@ public class RecipeLoader_02 {
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy4, 500, 480, 2800, true);
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy4, 513, 480, 2800, false);
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.incoloy903, 2400, 1920, 3700, true);
-        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.adamantiumAlloy, 2500, 1920, 5000, true);
+        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.adamantiumAlloy, 2500, 1920, 5500, true);
 
         GT_Values.RA.addAssemblerRecipe(
                 new ItemStack[] {
@@ -580,6 +582,205 @@ public class RecipeLoader_02 {
                 120,
                 480
         );
+
+        GT_Values.RA.addFluidExtractionRecipe(
+                Materials.Coal.getGems(1),
+                Materials.Ash.getDust(1),
+                FluidRegistry.getFluidStack("fluid.coaltar", 250),
+                10,
+                60,
+                120
+        );
+
+        if (OreDictionary.getOres("fuelCoke").size() > 0) {
+            GT_Values.RA.addFluidExtractionRecipe(
+                    OreDictionary.getOres("fuelCoke").get(0),
+                    Materials.Ash.getDust(1),
+                    FluidRegistry.getFluidStack("fluid.coaltar", 500),
+                    10,
+                    60,
+                    120
+            );
+        }
+
+        if (LoadedList.GTPP) {
+            GT_Values.RA.addDistilleryRecipe(
+                    24,
+                    FluidRegistry.getFluidStack("fluid.coaltaroil", 100),
+                    MyMaterial.cyclopentadiene.getFluidOrGas(30),
+                    100,
+                    120,
+                    false
+            );
+        }
+        else {
+            GT_Values.RA.addDistilleryRecipe(
+                    24,
+                    FluidRegistry.getFluidStack("fluid.coaltar", 300),
+                    MyMaterial.cyclopentadiene.getFluidOrGas(100),
+                    100,
+                    120,
+                    false
+            );
+        }
+
+        GT_Values.RA.addDistilleryRecipe(
+                24,
+                Materials.WoodTar.getFluid(500),
+                MyMaterial.cyclopentadiene.getFluidOrGas(20),
+                100,
+                120,
+                false
+        );
+
+        GT_Values.RA.addChemicalRecipe(
+                MyMaterial.ferrousChloride.get(OrePrefixes.cell, 1),
+                GT_Utility.getIntegratedCircuit(1),
+                Materials.Chlorine.getGas(1000),
+                null,
+                Materials.IronIIIChloride.getCells(1),
+                40
+        );
+
+        GT_Values.RA.addChemicalRecipe(
+                Materials.IronIIIChloride.getCells(1),
+                GT_Utility.getIntegratedCircuit(7),
+                Materials.Hydrogen.getGas(1000),
+                Materials.HydrochloricAcid.getFluid(1000),
+                MyMaterial.ferrousChloride.get(OrePrefixes.cell, 1),
+                80,
+                120
+        );
+
+        GT_Values.RA.addChemicalRecipe(
+                Materials.Ammonia.getCells(1),
+                GT_Utility.getIntegratedCircuit(1),
+                Materials.Ethanol.getFluid(2000),
+                null,
+                MyMaterial.diethylamine.get(OrePrefixes.cell, 1),
+                200,
+                120
+        );
+
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        GT_Utility.getIntegratedCircuit(2)
+                },
+                new FluidStack[]{
+                        MyMaterial.cyclopentadiene.getFluidOrGas(2000),
+                        MyMaterial.ferrousChloride.getFluidOrGas(1000),
+                        MyMaterial.diethylamine.getFluidOrGas(8000),
+                        Materials.Ice.getSolid(4000)
+                },
+                new FluidStack[]{
+                        MyMaterial.impureFerroceneMixture.getFluidOrGas(15000)
+                },
+                null,
+                2400,
+                120
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                MyMaterial.ether.get(OrePrefixes.cell, 1),
+                GT_Utility.getIntegratedCircuit(1),
+                null,
+                null,
+                MyMaterial.impureFerroceneMixture.getFluidOrGas(7500),
+                MyMaterial.ferroceneWaste.getFluidOrGas(5000),
+                MyMaterial.ferroceneSolution.get(OrePrefixes.cell, 1),
+                800,
+                120
+        );
+
+        GT_Values.RA.addUniversalDistillationRecipe(
+                MyMaterial.ferroceneWaste.getFluidOrGas(1000),
+                new FluidStack[] {
+                        Materials.Water.getFluid(400),
+                        MyMaterial.diethylamine.getFluidOrGas(800),
+                        MyMaterial.ether.getFluidOrGas(500)
+                },
+                null,
+                600,
+                120
+        );
+
+        GT_Values.RA.addUniversalDistillationRecipe(
+                MyMaterial.ferroceneSolution.getFluidOrGas(2000),
+                new FluidStack[]{
+                        MyMaterial.ether.getFluidOrGas(1000)
+                },
+                MyMaterial.ferrocene.get(OrePrefixes.dust, 1),
+                600,
+                120
+        );
+
+        if (LoadedList.GTPP) {
+            GT_Values.RA.addMultiblockChemicalRecipe(
+                    new ItemStack[]{
+                            MyMaterial.ferrocene.get(OrePrefixes.dust, 4),
+                            Materials.SodiumHydroxide.getDust(8)
+                    },
+                    new FluidStack[]{
+                            FluidRegistry.getFluidStack("fluid.kerosene", 40000),
+                            Materials.Naphtha.getFluid(3000),
+                            MyMaterial.diethylamine.getFluidOrGas(1000)
+                    },
+                    new FluidStack[]{
+                            MyMaterial.ironedKerosene.getFluidOrGas(16000)
+                    },
+                    null,
+                    2400,
+                    1920
+            );
+        }
+
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        MyMaterial.ferrocene.get(OrePrefixes.dust, 4),
+                },
+                new FluidStack[]{
+                        FluidRegistry.getFluidStack("combustionpromotor", 4000),
+                        Materials.Naphtha.getFluid(40000),
+                        Materials.LightFuel.getFluid(3000),
+                        Materials.LPG.getFluid(1000),
+                        Materials.Tetranitromethane.getFluid(2000),
+                },
+                new FluidStack[]{
+                        MyMaterial.ironedFuel.getFluidOrGas(24000)
+                },
+                null,
+                2400,
+                7680
+        );
+
+        GT_ModHandler.addCraftingRecipe(
+                ItemRefer.Combustion_Generator_EV.get(1),
+                GT_ModHandler.RecipeBits.DISMANTLEABLE,
+                new Object[] {
+                        "PCP","MHM","GWG",
+                        'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium,1),
+                        'C', "circuitData",
+                        'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium,1),
+                        'P', ItemList.Electric_Piston_EV,
+                        'H', ItemList.Hull_EV,
+                        'M', ItemList.Electric_Motor_EV
+                }
+        );
+
+        GT_ModHandler.addCraftingRecipe(
+                ItemRefer.Combustion_Generator_IV.get(1),
+                GT_ModHandler.RecipeBits.DISMANTLEABLE,
+                new Object[] {
+                        "PCP","MHM","GWG",
+                        'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel,1),
+                        'C', "circuitElite",
+                        'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten,1),
+                        'P', ItemList.Electric_Piston_IV,
+                        'H', ItemList.Hull_IV,
+                        'M', ItemList.Electric_Motor_IV
+                }
+        );
+
     }
 
     public static void InitLoadRecipe() {
diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java
index 5ffec9e7eb..8bb80e10df 100644
--- a/src/main/java/goodgenerator/util/ItemRefer.java
+++ b/src/main/java/goodgenerator/util/ItemRefer.java
@@ -100,6 +100,8 @@ public final class ItemRefer {
     public static ItemRefer Universal_Chemical_Fuel_Engine = getItemStack(UCFE);
     public static ItemRefer Large_Essentia_Generator = getItemStack(LEG);
     public static ItemRefer YOTTank = getItemStack(YFT);
+    public static ItemRefer Combustion_Generator_EV = getItemStack(Generator_Diesel[0]);
+    public static ItemRefer Combustion_Generator_IV = getItemStack(Generator_Diesel[1]);
 
     private Item mItem = null;
     private Block mBlock = null;