aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/goodgenerator/loader
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-07-15 14:34:19 +0900
committerGitHub <noreply@github.com>2022-07-15 06:34:19 +0100
commitc0eb617fa5c146b7a222c5461faf14394508cf4b (patch)
treee25d23490122b5c663fd4e2791a81704c0183b00 /src/main/java/goodgenerator/loader
parent36301feacf5a33ded24d338ae39985da6080d2bb (diff)
downloadGT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.tar.gz
GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.tar.bz2
GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.zip
Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge (#53)
* Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge * updateBuildScript & spotlessApply
Diffstat (limited to 'src/main/java/goodgenerator/loader')
-rw-r--r--src/main/java/goodgenerator/loader/AchievementLoader.java3
-rw-r--r--src/main/java/goodgenerator/loader/FuelRecipeLoader.java113
-rw-r--r--src/main/java/goodgenerator/loader/FuelRodLoader.java183
-rw-r--r--src/main/java/goodgenerator/loader/Loaders.java253
-rw-r--r--src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java658
-rw-r--r--src/main/java/goodgenerator/loader/NeutronActivatorLoader.java45
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader.java1841
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader_02.java2713
8 files changed, 2913 insertions, 2896 deletions
diff --git a/src/main/java/goodgenerator/loader/AchievementLoader.java b/src/main/java/goodgenerator/loader/AchievementLoader.java
index 2df30c8752..13d9048092 100644
--- a/src/main/java/goodgenerator/loader/AchievementLoader.java
+++ b/src/main/java/goodgenerator/loader/AchievementLoader.java
@@ -1,4 +1,3 @@
package goodgenerator.loader;
-public class AchievementLoader {
-}
+public class AchievementLoader {}
diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java
index 73e97830a2..29d6c9558a 100644
--- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java
@@ -1,9 +1,12 @@
package goodgenerator.loader;
+import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime;
+import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage;
+
+import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import goodgenerator.items.MyMaterial;
import goodgenerator.util.ItemRefer;
import goodgenerator.util.MyRecipeAdder;
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_OreDictUnificator;
@@ -11,69 +14,93 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
-import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime;
-import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage;
-
public class FuelRecipeLoader {
- public static void RegisterFuel(){
- //MyRecipeAdder.instance.addLiquidMentalFuel(Materials.NaquadahEnriched.getMolten(1L),Materials.Naquadah.getMolten(1L),32768,100);
- //MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,120);
- MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1),NaquadahFuelVoltage[0],NaquadahFuelTime[0]);
- MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1),NaquadahFuelVoltage[1],NaquadahFuelTime[1]);
- MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1),NaquadahFuelVoltage[2],NaquadahFuelTime[2]);
- MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1),NaquadahFuelVoltage[3],NaquadahFuelTime[3]);
- MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1),NaquadahFuelVoltage[4],NaquadahFuelTime[4]);
- MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1),NaquadahFuelVoltage[5],NaquadahFuelTime[5]);
- MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1),NaquadahFuelVoltage[6],NaquadahFuelTime[6]);
- MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1),NaquadahFuelVoltage[7],NaquadahFuelTime[7]);
+ public static void RegisterFuel() {
+ // MyRecipeAdder.instance.addLiquidMentalFuel(Materials.NaquadahEnriched.getMolten(1L),Materials.Naquadah.getMolten(1L),32768,100);
+ // MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,120);
+ MyRecipeAdder.instance.addLiquidMentalFuel(
+ MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1),
+ MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1),
+ NaquadahFuelVoltage[0],
+ NaquadahFuelTime[0]);
+ MyRecipeAdder.instance.addLiquidMentalFuel(
+ MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1),
+ MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1),
+ NaquadahFuelVoltage[1],
+ NaquadahFuelTime[1]);
+ MyRecipeAdder.instance.addLiquidMentalFuel(
+ MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1),
+ MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1),
+ NaquadahFuelVoltage[2],
+ NaquadahFuelTime[2]);
+ MyRecipeAdder.instance.addLiquidMentalFuel(
+ MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1),
+ MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1),
+ NaquadahFuelVoltage[3],
+ NaquadahFuelTime[3]);
+ MyRecipeAdder.instance.addLiquidMentalFuel(
+ MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1),
+ MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1),
+ NaquadahFuelVoltage[4],
+ NaquadahFuelTime[4]);
+ MyRecipeAdder.instance.addLiquidMentalFuel(
+ MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1),
+ MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1),
+ NaquadahFuelVoltage[5],
+ NaquadahFuelTime[5]);
+ MyRecipeAdder.instance.addLiquidMentalFuel(
+ MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1),
+ MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1),
+ NaquadahFuelVoltage[6],
+ NaquadahFuelTime[6]);
+ MyRecipeAdder.instance.addLiquidMentalFuel(
+ MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(1),
+ MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1),
+ NaquadahFuelVoltage[7],
+ NaquadahFuelTime[7]);
MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
- new FluidStack[]{
- MyMaterial.heavyNaquadahFuel.getFluidOrGas(800),
- MyMaterial.lightNaquadahFuel.getFluidOrGas(1000),
+ new FluidStack[] {
+ MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), MyMaterial.lightNaquadahFuel.getFluidOrGas(1000),
},
- new ItemStack[]{
- MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust,4),
- WerkstoffLoader.Tiberium.get(OrePrefixes.dust,27),
- ItemRefer.High_Density_Uranium.get(2),
- ItemRefer.High_Density_Plutonium.get(1),
+ new ItemStack[] {
+ MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4),
+ WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 27),
+ ItemRefer.High_Density_Uranium.get(2),
+ ItemRefer.High_Density_Plutonium.get(1),
},
MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100),
1100000,
100,
- 1
- );
+ 1);
MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
- new FluidStack[]{
- MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000),
- Materials.Praseodymium.getMolten(9216L)
+ new FluidStack[] {
+ MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), Materials.Praseodymium.getMolten(9216L)
},
- new ItemStack[]{
- MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust,27),
- GT_OreDictUnificator.get(OrePrefixes.dust,Materials.NetherStar,64),
- GT_OreDictUnificator.get(OrePrefixes.dust,Materials.DraconiumAwakened,64),
- MyMaterial.orundum.get(OrePrefixes.dust,32),
+ new ItemStack[] {
+ MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 64),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
+ MyMaterial.orundum.get(OrePrefixes.dust, 32),
},
MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250),
46000000,
160,
- 2
- );
+ 2);
MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
- new FluidStack[]{
- MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000),
- FluidRegistry.getFluidStack("heavyradox",1000),
+ new FluidStack[] {
+ MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000),
+ FluidRegistry.getFluidStack("heavyradox", 1000),
},
- new ItemStack[]{
- GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Infinity,16),
- MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32),
+ new ItemStack[] {
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 16),
+ MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32),
},
MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(500),
100000000,
200,
- 2
- );
+ 2);
}
}
diff --git a/src/main/java/goodgenerator/loader/FuelRodLoader.java b/src/main/java/goodgenerator/loader/FuelRodLoader.java
index 723821b0e5..93555a834d 100644
--- a/src/main/java/goodgenerator/loader/FuelRodLoader.java
+++ b/src/main/java/goodgenerator/loader/FuelRodLoader.java
@@ -1,14 +1,14 @@
package goodgenerator.loader;
+import static goodgenerator.util.DescTextLocalization.addText;
+
+import cpw.mods.fml.common.registry.GameRegistry;
import goodgenerator.items.DepletedFuelRod;
import goodgenerator.items.FuelRod;
import goodgenerator.main.GoodGenerator;
-import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import static goodgenerator.util.DescTextLocalization.addText;
-
public class FuelRodLoader {
public static Item rodCompressedUraniumDepleted;
@@ -37,25 +37,42 @@ public class FuelRodLoader {
public static Item rodLiquidPlutonium_4;
public static void RegisterRod() {
- rodCompressedUraniumDepleted = new DepletedFuelRod("rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100);
- rodCompressedUraniumDepleted_2 = new DepletedFuelRod("rodCompressedUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 200);
- rodCompressedUraniumDepleted_4 = new DepletedFuelRod("rodCompressedUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 400);
- rodCompressedPlutoniumDepleted = new DepletedFuelRod("rodCompressedPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 120);
- rodCompressedPlutoniumDepleted_2 = new DepletedFuelRod("rodCompressedPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 240);
- rodCompressedPlutoniumDepleted_4 = new DepletedFuelRod("rodCompressedPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 480);
- rodLiquidUraniumDepleted = new DepletedFuelRod("rodLiquidUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 800);
- rodLiquidUraniumDepleted_2 = new DepletedFuelRod("rodLiquidUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1600);
- rodLiquidUraniumDepleted_4 = new DepletedFuelRod("rodLiquidUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 3200);
- rodLiquidPlutoniumDepleted = new DepletedFuelRod("rodLiquidPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1000);
- rodLiquidPlutoniumDepleted_2 = new DepletedFuelRod("rodLiquidPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 2000);
- rodLiquidPlutoniumDepleted_4 = new DepletedFuelRod("rodLiquidPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 4000);
+ rodCompressedUraniumDepleted = new DepletedFuelRod(
+ "rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100);
+ rodCompressedUraniumDepleted_2 = new DepletedFuelRod(
+ "rodCompressedUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 200);
+ rodCompressedUraniumDepleted_4 = new DepletedFuelRod(
+ "rodCompressedUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 400);
+ rodCompressedPlutoniumDepleted = new DepletedFuelRod(
+ "rodCompressedPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 120);
+ rodCompressedPlutoniumDepleted_2 = new DepletedFuelRod(
+ "rodCompressedPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 240);
+ rodCompressedPlutoniumDepleted_4 = new DepletedFuelRod(
+ "rodCompressedPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 480);
+ rodLiquidUraniumDepleted = new DepletedFuelRod(
+ "rodLiquidUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 800);
+ rodLiquidUraniumDepleted_2 = new DepletedFuelRod(
+ "rodLiquidUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1600);
+ rodLiquidUraniumDepleted_4 = new DepletedFuelRod(
+ "rodLiquidUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 3200);
+ rodLiquidPlutoniumDepleted = new DepletedFuelRod(
+ "rodLiquidPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1000);
+ rodLiquidPlutoniumDepleted_2 = new DepletedFuelRod(
+ "rodLiquidPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 2000);
+ rodLiquidPlutoniumDepleted_4 = new DepletedFuelRod(
+ "rodLiquidPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 4000);
GameRegistry.registerItem(rodCompressedUraniumDepleted, "rodCompressedUraniumDepleted", GoodGenerator.MOD_ID);
- GameRegistry.registerItem(rodCompressedUraniumDepleted_2, "rodCompressedUraniumDepleted2", GoodGenerator.MOD_ID);
- GameRegistry.registerItem(rodCompressedUraniumDepleted_4, "rodCompressedUraniumDepleted4", GoodGenerator.MOD_ID);
- GameRegistry.registerItem(rodCompressedPlutoniumDepleted, "rodCompressedPlutoniumDepleted", GoodGenerator.MOD_ID);
- GameRegistry.registerItem(rodCompressedPlutoniumDepleted_2, "rodCompressedPlutoniumDepleted2", GoodGenerator.MOD_ID);
- GameRegistry.registerItem(rodCompressedPlutoniumDepleted_4, "rodCompressedPlutoniumDepleted4", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(
+ rodCompressedUraniumDepleted_2, "rodCompressedUraniumDepleted2", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(
+ rodCompressedUraniumDepleted_4, "rodCompressedUraniumDepleted4", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(
+ rodCompressedPlutoniumDepleted, "rodCompressedPlutoniumDepleted", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(
+ rodCompressedPlutoniumDepleted_2, "rodCompressedPlutoniumDepleted2", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(
+ rodCompressedPlutoniumDepleted_4, "rodCompressedPlutoniumDepleted4", GoodGenerator.MOD_ID);
GameRegistry.registerItem(rodLiquidUraniumDepleted, "rodLiquidUraniumDepleted", GoodGenerator.MOD_ID);
GameRegistry.registerItem(rodLiquidUraniumDepleted_2, "rodLiquidUraniumDepleted2", GoodGenerator.MOD_ID);
GameRegistry.registerItem(rodLiquidUraniumDepleted_4, "rodLiquidUraniumDepleted4", GoodGenerator.MOD_ID);
@@ -63,18 +80,120 @@ public class FuelRodLoader {
GameRegistry.registerItem(rodLiquidPlutoniumDepleted_2, "rodLiquidPlutoniumDepleted2", GoodGenerator.MOD_ID);
GameRegistry.registerItem(rodLiquidPlutoniumDepleted_4, "rodLiquidPlutoniumDepleted4", GoodGenerator.MOD_ID);
- rodCompressedUranium = new FuelRod("rodCompressedUranium", 1, 100, 4, 800, 70000, new ItemStack(rodCompressedUraniumDepleted, 1), GoodGenerator.GG);
- rodCompressedUranium_2 = new FuelRod("rodCompressedUranium2", 2, 100, 4, 1600, 70000, new ItemStack(rodCompressedUraniumDepleted_2, 1), GoodGenerator.GG);
- rodCompressedUranium_4 = new FuelRod("rodCompressedUranium4", 4, 100, 4, 3200, 70000, new ItemStack(rodCompressedUraniumDepleted_4, 1), GoodGenerator.GG);
- rodCompressedPlutonium = new FuelRod("rodCompressedPlutonium", 1, 50, 4, 1000, 30000, 6, new ItemStack(rodCompressedPlutoniumDepleted, 1), GoodGenerator.GG);
- rodCompressedPlutonium_2 = new FuelRod("rodCompressedPlutonium2", 2, 50, 4, 2000, 30000, 6, new ItemStack(rodCompressedPlutoniumDepleted_2, 1), GoodGenerator.GG);
- rodCompressedPlutonium_4 = new FuelRod("rodCompressedPlutonium4", 4, 50, 4, 4000, 30000, 6, new ItemStack(rodCompressedPlutoniumDepleted_4, 1), GoodGenerator.GG);
- rodLiquidUranium = new FuelRod("rodLiquidUranium", 1, 1200, 64, 8000, 6000, new ItemStack(rodLiquidUraniumDepleted, 1), GoodGenerator.GG);
- rodLiquidUranium_2 = new FuelRod("rodLiquidUranium2", 2, 1200, 64, 8000, 6000, new ItemStack(rodLiquidUraniumDepleted_2, 1), GoodGenerator.GG);
- rodLiquidUranium_4 = new FuelRod("rodLiquidUranium4", 4, 1200, 64, 8000, 6000, new ItemStack(rodLiquidUraniumDepleted_4, 1), GoodGenerator.GG);
- rodLiquidPlutonium = new FuelRod("rodLiquidPlutonium", 1, 1600, 64, 10000, 10000, 2, new ItemStack(rodLiquidPlutoniumDepleted, 1), GoodGenerator.GG);
- rodLiquidPlutonium_2 = new FuelRod("rodLiquidPlutonium2", 2, 1600, 64, 10000, 10000, 2, new ItemStack(rodLiquidPlutoniumDepleted_2, 1), GoodGenerator.GG);
- rodLiquidPlutonium_4 = new FuelRod("rodLiquidPlutonium4", 4, 1600, 64, 10000, 10000, 2, new ItemStack(rodLiquidPlutoniumDepleted_4, 1), GoodGenerator.GG);
+ rodCompressedUranium = new FuelRod(
+ "rodCompressedUranium",
+ 1,
+ 100,
+ 4,
+ 800,
+ 70000,
+ new ItemStack(rodCompressedUraniumDepleted, 1),
+ GoodGenerator.GG);
+ rodCompressedUranium_2 = new FuelRod(
+ "rodCompressedUranium2",
+ 2,
+ 100,
+ 4,
+ 1600,
+ 70000,
+ new ItemStack(rodCompressedUraniumDepleted_2, 1),
+ GoodGenerator.GG);
+ rodCompressedUranium_4 = new FuelRod(
+ "rodCompressedUranium4",
+ 4,
+ 100,
+ 4,
+ 3200,
+ 70000,
+ new ItemStack(rodCompressedUraniumDepleted_4, 1),
+ GoodGenerator.GG);
+ rodCompressedPlutonium = new FuelRod(
+ "rodCompressedPlutonium",
+ 1,
+ 50,
+ 4,
+ 1000,
+ 30000,
+ 6,
+ new ItemStack(rodCompressedPlutoniumDepleted, 1),
+ GoodGenerator.GG);
+ rodCompressedPlutonium_2 = new FuelRod(
+ "rodCompressedPlutonium2",
+ 2,
+ 50,
+ 4,
+ 2000,
+ 30000,
+ 6,
+ new ItemStack(rodCompressedPlutoniumDepleted_2, 1),
+ GoodGenerator.GG);
+ rodCompressedPlutonium_4 = new FuelRod(
+ "rodCompressedPlutonium4",
+ 4,
+ 50,
+ 4,
+ 4000,
+ 30000,
+ 6,
+ new ItemStack(rodCompressedPlutoniumDepleted_4, 1),
+ GoodGenerator.GG);
+ rodLiquidUranium = new FuelRod(
+ "rodLiquidUranium",
+ 1,
+ 1200,
+ 64,
+ 8000,
+ 6000,
+ new ItemStack(rodLiquidUraniumDepleted, 1),
+ GoodGenerator.GG);
+ rodLiquidUranium_2 = new FuelRod(
+ "rodLiquidUranium2",
+ 2,
+ 1200,
+ 64,
+ 8000,
+ 6000,
+ new ItemStack(rodLiquidUraniumDepleted_2, 1),
+ GoodGenerator.GG);
+ rodLiquidUranium_4 = new FuelRod(
+ "rodLiquidUranium4",
+ 4,
+ 1200,
+ 64,
+ 8000,
+ 6000,
+ new ItemStack(rodLiquidUraniumDepleted_4, 1),
+ GoodGenerator.GG);
+ rodLiquidPlutonium = new FuelRod(
+ "rodLiquidPlutonium",
+ 1,
+ 1600,
+ 64,
+ 10000,
+ 10000,
+ 2,
+ new ItemStack(rodLiquidPlutoniumDepleted, 1),
+ GoodGenerator.GG);
+ rodLiquidPlutonium_2 = new FuelRod(
+ "rodLiquidPlutonium2",
+ 2,
+ 1600,
+ 64,
+ 10000,
+ 10000,
+ 2,
+ new ItemStack(rodLiquidPlutoniumDepleted_2, 1),
+ GoodGenerator.GG);
+ rodLiquidPlutonium_4 = new FuelRod(
+ "rodLiquidPlutonium4",
+ 4,
+ 1600,
+ 64,
+ 10000,
+ 10000,
+ 2,
+ new ItemStack(rodLiquidPlutoniumDepleted_4, 1),
+ GoodGenerator.GG);
GameRegistry.registerItem(rodCompressedUranium, "rodCompressedUranium", GoodGenerator.MOD_ID);
GameRegistry.registerItem(rodCompressedUranium_2, "rodCompressedUranium2", GoodGenerator.MOD_ID);
diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
index db5f19f3e7..288c422da2 100644
--- a/src/main/java/goodgenerator/loader/Loaders.java
+++ b/src/main/java/goodgenerator/loader/Loaders.java
@@ -1,14 +1,18 @@
package goodgenerator.loader;
+import static goodgenerator.util.DescTextLocalization.addText;
+
import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.registry.GameRegistry;
import goodgenerator.blocks.myFluids.FluidsBuilder;
import goodgenerator.blocks.regularBlock.*;
-import goodgenerator.client.render.BlockRenderHandler;
import goodgenerator.blocks.tileEntity.*;
import goodgenerator.blocks.tileEntity.GTMetaTileEntity.DieselGenerator;
import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronAccelerator;
import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor;
import goodgenerator.blocks.tileEntity.GTMetaTileEntity.YOTTAHatch;
+import goodgenerator.client.render.BlockRenderHandler;
import goodgenerator.crossmod.LoadedList;
import goodgenerator.crossmod.ic2.CropsLoader;
import goodgenerator.crossmod.nei.IMCForNEI;
@@ -19,8 +23,6 @@ import goodgenerator.items.MyItems;
import goodgenerator.items.MyMaterial;
import goodgenerator.items.RadioactiveItem;
import goodgenerator.main.GoodGenerator;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.registry.GameRegistry;
import goodgenerator.util.CrackRecipeAdder;
import goodgenerator.util.MaterialFix;
import gregtech.api.GregTech_API;
@@ -33,8 +35,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
-import static goodgenerator.util.DescTextLocalization.addText;
-
public class Loaders {
public static final int IDOffset = 32001;
@@ -44,16 +44,20 @@ public class Loaders {
public static final Item radiationProtectionPlate = new MyItems("radiationProtectionPlate", GoodGenerator.GG);
public static final Item wrappedUraniumIngot = new MyItems("wrappedUraniumIngot", GoodGenerator.GG);
- public static final Item highDensityUraniumNugget = new RadioactiveItem("highDensityUraniumNugget", GoodGenerator.GG, 200);
+ public static final Item highDensityUraniumNugget =
+ new RadioactiveItem("highDensityUraniumNugget", GoodGenerator.GG, 200);
public static final Item highDensityUranium = new RadioactiveItem("highDensityUranium", GoodGenerator.GG, 1800);
public static final Item wrappedThoriumIngot = new MyItems("wrappedThoriumIngot", GoodGenerator.GG);
- public static final Item highDensityThoriumNugget = new RadioactiveItem("highDensityThoriumNugget", GoodGenerator.GG, 50);
+ public static final Item highDensityThoriumNugget =
+ new RadioactiveItem("highDensityThoriumNugget", GoodGenerator.GG, 50);
public static final Item highDensityThorium = new RadioactiveItem("highDensityThorium", GoodGenerator.GG, 450);
public static final Item wrappedPlutoniumIngot = new MyItems("wrappedPlutoniumIngot", GoodGenerator.GG);
- public static final Item highDensityPlutoniumNugget = new RadioactiveItem("highDensityPlutoniumNugget", GoodGenerator.GG, 450);
+ public static final Item highDensityPlutoniumNugget =
+ new RadioactiveItem("highDensityPlutoniumNugget", GoodGenerator.GG, 450);
public static final Item highDensityPlutonium = new RadioactiveItem("highDensityPlutonium", GoodGenerator.GG, 4050);
public static final Item rawAtomicSeparationCatalyst = new MyItems("rawAtomicSeparationCatalyst", GoodGenerator.GG);
- public static final Item advancedRadiationProtectionPlate = new MyItems("advancedRadiationProtectionPlate", GoodGenerator.GG);
+ public static final Item advancedRadiationProtectionPlate =
+ new MyItems("advancedRadiationProtectionPlate", GoodGenerator.GG);
public static final Item aluminumNitride = new MyItems("aluminumNitride", "AlN", GoodGenerator.GG);
public static final Item specialCeramics = new MyItems("specialCeramics", GoodGenerator.GG);
public static final Item specialCeramicsPlate = new MyItems("specialCeramicsPlate", GoodGenerator.GG);
@@ -64,36 +68,110 @@ public class Loaders {
public static final Item quartzCrystalResonator = new MyItems("quartzCrystalResonator", GoodGenerator.GG);
public static final Item inverter = new MyItems("inverter", addText("inverter.tooltip", 1), GoodGenerator.GG);
public static final Item neutronSource = new MyItems("neutronSource", GoodGenerator.GG);
- public static final Item naquadahMass = new MyItems("naquadahMass", addText("naquadahMass.tooltip", 1), GoodGenerator.GG);
- public static final Item enrichedNaquadahMass = new MyItems("enrichedNaquadahMass", addText("enrichedNaquadahMass.tooltip", 1), GoodGenerator.GG);
- public static final Item naquadriaMass = new MyItems("naquadriaMass", addText("naquadriaMass.tooltip", 1), GoodGenerator.GG);
+ public static final Item naquadahMass =
+ new MyItems("naquadahMass", addText("naquadahMass.tooltip", 1), GoodGenerator.GG);
+ public static final Item enrichedNaquadahMass =
+ new MyItems("enrichedNaquadahMass", addText("enrichedNaquadahMass.tooltip", 1), GoodGenerator.GG);
+ public static final Item naquadriaMass =
+ new MyItems("naquadriaMass", addText("naquadriaMass.tooltip", 1), GoodGenerator.GG);
public static final Item advancedFuelRod = new MyItems("advancedFuelRod", GoodGenerator.GG);
- public static final Item fluidCore = new MyItems("fluidCore", GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":fluidCore/1", GoodGenerator.MOD_ID+":fluidCore/2", GoodGenerator.MOD_ID+":fluidCore/3", GoodGenerator.MOD_ID+":fluidCore/4", GoodGenerator.MOD_ID+":fluidCore/5", GoodGenerator.MOD_ID+":fluidCore/6"});
- public static final Item upgradeEssentia = new MyItems("upgradeEssentia", GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":upgradeEssentia/null", GoodGenerator.MOD_ID+":upgradeEssentia/air", GoodGenerator.MOD_ID+":upgradeEssentia/thermal", GoodGenerator.MOD_ID+":upgradeEssentia/unstable", GoodGenerator.MOD_ID+":upgradeEssentia/victus", GoodGenerator.MOD_ID+":upgradeEssentia/tainted", GoodGenerator.MOD_ID+":upgradeEssentia/mechanics", GoodGenerator.MOD_ID+":upgradeEssentia/spirit", GoodGenerator.MOD_ID+":upgradeEssentia/radiation", GoodGenerator.MOD_ID+":upgradeEssentia/electric"});
- public static final Item highEnergyMixture = new MyItems("highEnergyMixture", GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":highEnergyMixture"});
- public static final Item saltyRoot = new MyItems("saltyRoot", GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":saltyRoot"});
- public static final Item huiCircuit = new MyItems("huiCircuit", addText("huiCircuit.tooltip", 5), GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":ciruits/1", GoodGenerator.MOD_ID+":ciruits/2", GoodGenerator.MOD_ID+":ciruits/3", GoodGenerator.MOD_ID+":ciruits/4", GoodGenerator.MOD_ID+":ciruits/5"});
+ public static final Item fluidCore = new MyItems("fluidCore", GoodGenerator.GG, new String[] {
+ GoodGenerator.MOD_ID + ":fluidCore/1",
+ GoodGenerator.MOD_ID + ":fluidCore/2",
+ GoodGenerator.MOD_ID + ":fluidCore/3",
+ GoodGenerator.MOD_ID + ":fluidCore/4",
+ GoodGenerator.MOD_ID + ":fluidCore/5",
+ GoodGenerator.MOD_ID + ":fluidCore/6"
+ });
+ public static final Item upgradeEssentia = new MyItems("upgradeEssentia", GoodGenerator.GG, new String[] {
+ GoodGenerator.MOD_ID + ":upgradeEssentia/null",
+ GoodGenerator.MOD_ID + ":upgradeEssentia/air",
+ GoodGenerator.MOD_ID + ":upgradeEssentia/thermal",
+ GoodGenerator.MOD_ID + ":upgradeEssentia/unstable",
+ GoodGenerator.MOD_ID + ":upgradeEssentia/victus",
+ GoodGenerator.MOD_ID + ":upgradeEssentia/tainted",
+ GoodGenerator.MOD_ID + ":upgradeEssentia/mechanics",
+ GoodGenerator.MOD_ID + ":upgradeEssentia/spirit",
+ GoodGenerator.MOD_ID + ":upgradeEssentia/radiation",
+ GoodGenerator.MOD_ID + ":upgradeEssentia/electric"
+ });
+ public static final Item highEnergyMixture = new MyItems(
+ "highEnergyMixture", GoodGenerator.GG, new String[] {GoodGenerator.MOD_ID + ":highEnergyMixture"});
+ public static final Item saltyRoot =
+ new MyItems("saltyRoot", GoodGenerator.GG, new String[] {GoodGenerator.MOD_ID + ":saltyRoot"});
+ public static final Item huiCircuit =
+ new MyItems("huiCircuit", addText("huiCircuit.tooltip", 5), GoodGenerator.GG, new String[] {
+ GoodGenerator.MOD_ID + ":ciruits/1",
+ GoodGenerator.MOD_ID + ":ciruits/2",
+ GoodGenerator.MOD_ID + ":ciruits/3",
+ GoodGenerator.MOD_ID + ":ciruits/4",
+ GoodGenerator.MOD_ID + ":ciruits/5"
+ });
- 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"});
- public static final Block FRF_Coil_1 = new Casing("FRF_Coil_1", new String[]{GoodGenerator.MOD_ID+":FRF_Coils/1"});
- public static final Block FRF_Coil_2 = new Casing("FRF_Coil_2", new String[]{GoodGenerator.MOD_ID+":FRF_Coils/2"});
- public static final Block FRF_Coil_3 = new Casing("FRF_Coil_3", new String[]{GoodGenerator.MOD_ID+":FRF_Coils/3"});
- public static final Block radiationProtectionSteelFrame = new Frame("radiationProtectionSteelFrame", new String[]{GoodGenerator.MOD_ID+":radiationProtectionSteelFrame"});
- public static final Block fieldRestrictingGlass = new Frame("fieldRestrictingGlass", new String[]{GoodGenerator.MOD_ID+":fieldRestrictingGlass"});
- public static final Block rawCylinder = new Casing("rawCylinder", new String[]{GoodGenerator.MOD_ID+":rawCylinder"});
- 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",GoodGenerator.MOD_ID+":essentiaCell/4"});
- 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 yottaFluidTankCell = new Casing("yottaFluidTankCell", new String[]{GoodGenerator.MOD_ID+":yottaFluidTankCell/1", GoodGenerator.MOD_ID+":yottaFluidTankCell/2", GoodGenerator.MOD_ID+":yottaFluidTankCell/3", GoodGenerator.MOD_ID+":yottaFluidTankCell/4", GoodGenerator.MOD_ID+":yottaFluidTankCell/5",
- GoodGenerator.MOD_ID+":yottaFluidTankCell/6", GoodGenerator.MOD_ID+":yottaFluidTankCell/7", GoodGenerator.MOD_ID+":yottaFluidTankCell/8", GoodGenerator.MOD_ID+":yottaFluidTankCell/9", GoodGenerator.MOD_ID+":yottaFluidTankCell/10",});
- public static final Block yottaFluidTankCasing = new ComplexTextureCasing("yottaFluidTankCasing", new String[]{GoodGenerator.MOD_ID+":yottaFluidTankCasing_SIDE"}, new String[]{GoodGenerator.MOD_ID+":yottaFluidTankCasing_TOP"});
- public static final Block supercriticalFluidTurbineCasing = new TurbineCasing("supercriticalFluidTurbineCasing", "supercriticalFluidTurbineCasing");
- public static final Block pressureResistantWalls = new Casing("pressureResistantWalls", new String[]{GoodGenerator.MOD_ID+":pressureResistantWalls"});
- public static final Block preciseUnitCasing = new Casing("preciseUnitCasing", new String[]{GoodGenerator.MOD_ID+":preciseUnitCasing/1", GoodGenerator.MOD_ID+":preciseUnitCasing/2", GoodGenerator.MOD_ID+":preciseUnitCasing/3"});
- public static final Block compactFusionCoil = new Casing("compactFusionCoil", new String[]{GoodGenerator.MOD_ID+":fuison/1", GoodGenerator.MOD_ID+":fuison/2", GoodGenerator.MOD_ID+":fuison/3", GoodGenerator.MOD_ID+":fuison/4", GoodGenerator.MOD_ID+":fuison/5"});
- public static final Block essentiaFilterCasing = new Casing("essentiaFilterCasing", new String[]{GoodGenerator.MOD_ID + ":essentiaFilterCasing"});
+ 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"});
+ public static final Block FRF_Coil_1 =
+ new Casing("FRF_Coil_1", new String[] {GoodGenerator.MOD_ID + ":FRF_Coils/1"});
+ public static final Block FRF_Coil_2 =
+ new Casing("FRF_Coil_2", new String[] {GoodGenerator.MOD_ID + ":FRF_Coils/2"});
+ public static final Block FRF_Coil_3 =
+ new Casing("FRF_Coil_3", new String[] {GoodGenerator.MOD_ID + ":FRF_Coils/3"});
+ public static final Block radiationProtectionSteelFrame = new Frame(
+ "radiationProtectionSteelFrame", new String[] {GoodGenerator.MOD_ID + ":radiationProtectionSteelFrame"});
+ public static final Block fieldRestrictingGlass =
+ new Frame("fieldRestrictingGlass", new String[] {GoodGenerator.MOD_ID + ":fieldRestrictingGlass"});
+ public static final Block rawCylinder =
+ new Casing("rawCylinder", new String[] {GoodGenerator.MOD_ID + ":rawCylinder"});
+ 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",
+ GoodGenerator.MOD_ID + ":essentiaCell/4"
+ });
+ 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 yottaFluidTankCell = new Casing("yottaFluidTankCell", new String[] {
+ GoodGenerator.MOD_ID + ":yottaFluidTankCell/1",
+ GoodGenerator.MOD_ID + ":yottaFluidTankCell/2",
+ GoodGenerator.MOD_ID + ":yottaFluidTankCell/3",
+ GoodGenerator.MOD_ID + ":yottaFluidTankCell/4",
+ GoodGenerator.MOD_ID + ":yottaFluidTankCell/5",
+ GoodGenerator.MOD_ID + ":yottaFluidTankCell/6",
+ GoodGenerator.MOD_ID + ":yottaFluidTankCell/7",
+ GoodGenerator.MOD_ID + ":yottaFluidTankCell/8",
+ GoodGenerator.MOD_ID + ":yottaFluidTankCell/9",
+ GoodGenerator.MOD_ID + ":yottaFluidTankCell/10",
+ });
+ public static final Block yottaFluidTankCasing = new ComplexTextureCasing(
+ "yottaFluidTankCasing",
+ new String[] {GoodGenerator.MOD_ID + ":yottaFluidTankCasing_SIDE"},
+ new String[] {GoodGenerator.MOD_ID + ":yottaFluidTankCasing_TOP"});
+ public static final Block supercriticalFluidTurbineCasing =
+ new TurbineCasing("supercriticalFluidTurbineCasing", "supercriticalFluidTurbineCasing");
+ public static final Block pressureResistantWalls =
+ new Casing("pressureResistantWalls", new String[] {GoodGenerator.MOD_ID + ":pressureResistantWalls"});
+ public static final Block preciseUnitCasing = new Casing("preciseUnitCasing", new String[] {
+ GoodGenerator.MOD_ID + ":preciseUnitCasing/1",
+ GoodGenerator.MOD_ID + ":preciseUnitCasing/2",
+ GoodGenerator.MOD_ID + ":preciseUnitCasing/3"
+ });
+ public static final Block compactFusionCoil = new Casing("compactFusionCoil", new String[] {
+ GoodGenerator.MOD_ID + ":fuison/1",
+ GoodGenerator.MOD_ID + ":fuison/2",
+ GoodGenerator.MOD_ID + ":fuison/3",
+ GoodGenerator.MOD_ID + ":fuison/4",
+ GoodGenerator.MOD_ID + ":fuison/5"
+ });
+ public static final Block essentiaFilterCasing =
+ new Casing("essentiaFilterCasing", new String[] {GoodGenerator.MOD_ID + ":essentiaFilterCasing"});
public static Block essentiaHatch;
public static Block essentiaOutputHatch;
public static Block essentiaOutputHatch_ME;
@@ -116,31 +194,56 @@ public class Loaders {
public static ItemStack[] NeutronAccelerators = new ItemStack[9];
public static ItemStack[] Generator_Diesel = new ItemStack[2];
- //public static Item Isotope = new NuclearMetaItemGenerator();
+ // public static Item Isotope = new NuclearMetaItemGenerator();
public static void GTMetaTileRegister() {
Loaders.MAR = new MultiNqGenerator(12732, "NaG", "Large Naquadah Reactor").getStackForm(1L);