finsh FRF and change texture code

6 files changed, 213 insertions, 13 deletions

diff --git a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java b/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
index 9dd38e0b6f..46e7ccf73e 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
@@ -330,9 +330,9 @@ public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM imple
     @SuppressWarnings("ALL")
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
         if(aSide == aFacing){
-            if(aActive) return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL),new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE)};
-            return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL),new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE)};
+            if(aActive) return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(48),new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE)};
+            return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(48),new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE)};
         }
-        return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL)};
+        return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(48)};
     }
 }
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
index eaa711a3a0..a2fddf9554 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
@@ -38,7 +38,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implem
 
     private IStructureDefinition<MultiNqGenerator> multiDefinition = null;
     private int ticker = 0;
-    private int leftEnergy = 0;
+    private long leftEnergy = 0;
     boolean fluidLocker = true;
     FluidStack lockedFluid = null;
     int times = 1;
@@ -286,7 +286,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implem
                   leftEnergy += outputPower;
                   outputAmperes = leftEnergy / voltage;
                   leftEnergy -= outputAmperes * voltage;
-                  addEnergyOutput_EM(voltage ,outputAmperes);
+                  addEnergyOutput_EM(voltage, outputAmperes);
               }
               else{
                   addEnergyOutput_EM(outputPower, 1);
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java
index a050f5e1de..8bfbe441d6 100644
--- a/src/main/java/GoodGenerator/Items/MyMaterial.java
+++ b/src/main/java/GoodGenerator/Items/MyMaterial.java
@@ -521,6 +521,25 @@ public class MyMaterial implements Runnable {
             TextureSet.SET_METALLIC
     );
     */
+    public static final Werkstoff naquadahBasedFuelMkIII = new Werkstoff(
+            new short[]{0x29,0x22,0x21},
+            "Naquadah Based Liquid Fuel MkIII",
+            new Werkstoff.Stats().setRadioactive(true),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31045,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff naquadahBasedFuelMkIIIDepleted = new Werkstoff(
+            new short[]{0x66,0x40,0x38},
+            "Naquadah Based Liquid Fuel MkIII (Depleted)",
+            new Werkstoff.Stats().setRadioactive(true),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31046,
+            TextureSet.SET_FLUID
+    );
     @Override
     public void run() { }
 }
diff --git a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
index 4ff04491be..75afe50b19 100644
--- a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
@@ -2,7 +2,10 @@ package GoodGenerator.Loader;
 
 import GoodGenerator.Items.MyMaterial;
 import GoodGenerator.util.MyRecipeAdder;
-import gregtech.api.enums.Materials;
+import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
+import gregtech.api.enums.OrePrefixes;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
 
 public class FuelRecipeLoader {
     public static void RegisterFuel(){
@@ -13,5 +16,21 @@ public class FuelRecipeLoader {
         MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1),32400,150);
         MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1),288000,320);
         MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1),1276000,100);
+        MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1),7290000,120);
+
+        MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
+                new FluidStack[]{
+                        MyMaterial.heavyNaquadahFuel.getFluidOrGas(500),
+                        MyMaterial.lightNaquadahFuel.getFluidOrGas(1000),
+                },
+                new ItemStack[]{
+                        MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust,4),
+                        WerkstoffLoader.Tiberium.get(OrePrefixes.dust,27)
+                },
+                MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100),
+                120000,
+                90,
+                1
+        );
     }
 }
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
index c7d8cc4c57..74aaa18394 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
@@ -4,9 +4,9 @@ import GoodGenerator.Items.MyMaterial;
 import GoodGenerator.util.CrackRecipeAdder;
 import GoodGenerator.util.MaterialFix;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-import com.github.bartimaeusnek.bartworks.system.oredict.OreDictHandler;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_OreDictUnificator;
+import ic2.core.Ic2Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
@@ -17,7 +17,7 @@ public class RecipeLoader {
 
         //Radiation Protection Plate
         GT_Values.RA.addAssemblerRecipe(
-                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lanthanum, 16L),
+                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lanthanum, 8L),
                                 GT_OreDictUnificator.get(OrePrefixes.plate,Materials.NaquadahAlloy,8L),
                                 GT_OreDictUnificator.get(OrePrefixes.foil,Materials.Neutronium,1L),
                                 GT_Utility.getIntegratedCircuit(1)},
@@ -873,11 +873,12 @@ public class RecipeLoader {
         GT_Values.RA.addAssemblerRecipe(
                 new ItemStack[]{
                         new ItemStack(Loaders.radiationProtectionPlate,2),
-                        OreDictHandler.getItemStack("AlloyAdvanced",OrePrefixes.plate,8),
+                        new ItemStack(Ic2Items.advancedAlloy.getItem(),8),
                         GT_OreDictUnificator.get(OrePrefixes.plateDense,Materials.Palladium,2),
                         GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Osmiridium,4),
                         GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Tungsten,4),
-                        GT_OreDictUnificator.get(OrePrefixes.screw,Materials.Cobalt,4)
+                        GT_OreDictUnificator.get(OrePrefixes.screw,Materials.Cobalt,4),
+                        GT_Utility.getIntegratedCircuit(2)
                 },
                 Materials.NiobiumTitanium.getMolten(72),
                 new ItemStack(Loaders.advancedRadiationProtectionPlate),
@@ -888,7 +889,7 @@ public class RecipeLoader {
         GT_Values.RA.addAssemblylineRecipe(
                 new ItemStack(Loaders.MAR_Casing),
                 250000,
-                new ItemStack[]{
+                new Object[]{
                         GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.Thulium,1),
                         new ItemStack(Loaders.advancedRadiationProtectionPlate,6),
                         ItemList.Field_Generator_IV.get(2),
@@ -907,6 +908,168 @@ public class RecipeLoader {
                 500,
                 65536
         );
+
+        GT_Values.RA.addAssemblylineRecipe(
+                MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot),
+                300000,
+                new Object[]{
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.VanadiumGallium,1),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02,Materials.SuperconductorIV,64),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02,Materials.SuperconductorLuV,32),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02,Materials.SuperconductorZPM,16),
+                        ItemList.Neutron_Reflector.get(4),
+                        GT_OreDictUnificator.get(OrePrefixes.wireFine,Materials.Gallium,32),
+                        GT_OreDictUnificator.get(OrePrefixes.spring,Materials.Indium,16),
+                        GT_OreDictUnificator.get(OrePrefixes.gearGt,Materials.Osmiridium,16),
+                        new ItemStack(Ic2Items.iridiumPlate.getItem(),32),
+                        GT_OreDictUnificator.get(OrePrefixes.foil,Materials.CrystallineAlloy,64),
+                        GT_OreDictUnificator.get(OrePrefixes.foil,Materials.CrystallineAlloy,64),
+                        GT_OreDictUnificator.get(OrePrefixes.foil,Materials.CrystallineAlloy,64),
+                        GT_OreDictUnificator.get(OrePrefixes.foil,Materials.CrystallineAlloy,64),
+                        ItemList.Tool_DataStick.get(16),
+                        GT_OreDictUnificator.get(OrePrefixes.screw,Materials.Cobalt,32)
+                },
+                new FluidStack[]{
+                        Materials.Trinium.getMolten(2304),
+                        Materials.Platinum.getMolten(4608),
+                        Materials.SolderingAlloy.getMolten(9216),
+                        FluidRegistry.getFluidStack("ic2coolant",8000)
+                },
+                new ItemStack(Loaders.FRF_Coil_1),
+                900,
+                114514
+        );
+
+        GT_Values.RA.addArcFurnaceRecipe(
+                new ItemStack(Loaders.FRF_Coil_1),
+                new ItemStack[]{
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.Osmiridium,64),
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.CrystallineAlloy,64),
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.Platinum,32),
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.Indium,16)
+                },
+                new int[] {10000,10000,10000,10000},
+                3600,
+                30
+        );
+
+        GT_Values.RA.addAssemblylineRecipe(
+                new ItemStack(Loaders.FRF_Coil_1),
+                350000,
+                new Object[]{
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.Molybdenum,1),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02,Materials.SuperconductorLuV,64),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02,Materials.SuperconductorZPM,32),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02,Materials.SuperconductorUV,16),
+                        ItemList.Field_Generator_LuV.get(4),
+                        GT_OreDictUnificator.get(OrePrefixes.cableGt04,Materials.NiobiumTitanium,16),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeTiny,Materials.Enderium,16),
+                        WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt,64),
+                        ItemList.Circuit_Wafer_QPIC.get(16),
+                        GT_OreDictUnificator.get(OrePrefixes.plate,Materials.CrystallineAlloy,64),
+                        GT_OreDictUnificator.get(OrePrefixes.foil,Materials.Indium,64),
+                        GT_OreDictUnificator.get(OrePrefixes.foil,Materials.Indium,64),
+                        GT_OreDictUnificator.get(OrePrefixes.foil,Materials.Indium,64),
+                        ItemList.Energy_LapotronicOrb.get(4),
+                        GT_OreDictUnificator.get(OrePrefixes.screw,Materials.BlackPlutonium,32)
+                },
+                new FluidStack[]{
+                        Materials.Tritanium.getMolten(2304),
+                        Materials.Palladium.getMolten(4608),
+                        Materials.SolderingAlloy.getMolten(9216),
+                        FluidRegistry.getFluidStack("ic2coolant",8000)
+                },
+                new ItemStack(Loaders.FRF_Coil_2),
+                2700,
+                114514
+        );
+
+        GT_Values.RA.addArcFurnaceRecipe(
+                new ItemStack(Loaders.FRF_Coil_2),
+                new ItemStack[]{
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.CrystallineAlloy,64),
+                        WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.block,56),
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.Indium,48),
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.NiobiumTitanium,32)
+                },
+                new int[] {10000,10000,10000,10000},
+                3600,
+                30
+        );
+
+        GT_Values.RA.addAssemblylineRecipe(
+                new ItemStack(Loaders.FRF_Coil_2),
+                400000,
+                new Object[]{
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.CosmicNeutronium,1),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02,Materials.SuperconductorZPM,64),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02,Materials.SuperconductorUV,32),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02,Materials.SuperconductorUHV,16),
+                        ItemList.Sensor_UV.get(4),
+                        GT_OreDictUnificator.get(OrePrefixes.cableGt04,Materials.NetherStar,16),
+                        GT_OreDictUnificator.get(OrePrefixes.plateDense,Materials.SamariumMagnetic,4),
+                        GT_OreDictUnificator.get(OrePrefixes.gearGt,Materials.BlackPlutonium,16),
+                        ItemList.Circuit_Chip_CrystalSoC2.get(32),
+                        GT_OreDictUnificator.get(OrePrefixes.plate,Materials.CrystallineAlloy,64),
+                        GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Indium,32),
+                        GT_OreDictUnificator.get(OrePrefixes.foil,Materials.VibrantAlloy,64),
+                        GT_OreDictUnificator.get(OrePrefixes.foil,Materials.VibrantAlloy,64),
+                        ItemList.Energy_LapotronicOrb2.get(4),
+                        GT_OreDictUnificator.get(OrePrefixes.screw,Materials.Infinity,16)
+                },
+                new FluidStack[]{
+                        Materials.Americium.getMolten(2304),
+                        Materials.Osmium.getMolten(4608),
+                        Materials.SolderingAlloy.getMolten(9216),
+                        FluidRegistry.getFluidStack("ic2coolant",8000)
+                },
+                new ItemStack(Loaders.FRF_Coil_3),
+                8100,
+                114514
+        );
+
+        GT_Values.RA.addArcFurnaceRecipe(
+                new ItemStack(Loaders.FRF_Coil_3),
+                new ItemStack[]{
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.CrystallineAlloy,64),
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.BlackPlutonium,64),
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.Indium,32),
+                        GT_OreDictUnificator.get(OrePrefixes.ingot,Materials.Osmium,32)
+                },
+                new int[] {10000,10000,10000,10000},
+                3600,
+                30
+        );
+
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[]{
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.BorosilicateGlass,1),
+                        GT_OreDictUnificator.get(OrePrefixes.ring,Materials.NaquadahAlloy,32),
+                        ItemList.Field_Generator_HV.get(4),
+                        GT_Utility.getIntegratedCircuit(6)
+                },
+                MyMaterial.naquadahAsphalt.getFluidOrGas(500),
+                new ItemStack(Loaders.fieldRestrictingGlass),
+                300,
+                120000
+        );
+
+        GT_Values.RA.addCentrifugeRecipe(
+                GT_Utility.getIntegratedCircuit(1),null,
+                MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1000),
+                WerkstoffLoader.Oganesson.getFluidOrGas(144),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,32),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,32),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,32),
+                new int[]{
+                        9500,9000,8000,7000,5000,4000
+                },
+                2000,
+                30000
+        );
     }
 
     public static void Fixer(){
diff --git a/src/main/java/GoodGenerator/Main/GoodGenerator.java b/src/main/java/GoodGenerator/Main/GoodGenerator.java
index b9cf48d607..356903365f 100644
--- a/src/main/java/GoodGenerator/Main/GoodGenerator.java
+++ b/src/main/java/GoodGenerator/Main/GoodGenerator.java
@@ -50,5 +50,4 @@ public final class GoodGenerator {
         RecipeLoader.RecipeLoad();
         RecipeLoader.Fixer();
     }
-
-}
+}
\ No newline at end of file