diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
9 files changed, 71 insertions, 20 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java index f405c8b5c6..37e61c433a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -7,10 +10,12 @@ import gtPlusPlus.core.material.Material; public class RecipeGen_AlloySmelter implements Runnable{ + public static final Set<Runnable> mRecipeGenMap = new HashSet<Runnable>(); final Material toGenerate; public RecipeGen_AlloySmelter(final Material M){ this.toGenerate = M; + mRecipeGenMap.add(this); } @Override @@ -18,7 +23,7 @@ public class RecipeGen_AlloySmelter implements Runnable{ generateRecipes(this.toGenerate); } - public static void generateRecipes(final Material material){ + private void generateRecipes(final Material material){ final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; //Nuggets diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java index 9f27cfd5ab..2880c9f5bd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import net.minecraft.item.ItemStack; import gregtech.api.enums.GT_Values; @@ -10,10 +13,12 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Assembler implements Runnable{ + public static final Set<Runnable> mRecipeGenMap = new HashSet<Runnable>(); final Material toGenerate; public RecipeGen_Assembler(final Material M){ this.toGenerate = M; + mRecipeGenMap.add(this); } @Override @@ -21,7 +26,7 @@ public class RecipeGen_Assembler implements Runnable{ generateRecipes(this.toGenerate); } - public static void generateRecipes(final Material material){ + private void generateRecipes(final Material material){ //Frame Box GT_Values.RA.addAssemblerRecipe( diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index 33b39eba85..de634c1415 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -1,6 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; import net.minecraft.item.ItemStack; @@ -22,10 +24,12 @@ import net.minecraftforge.fluids.FluidStack; public class RecipeGen_BlastSmelter implements Runnable{ + public static final Set<Runnable> mRecipeGenMap = new HashSet<Runnable>(); final Material toGenerate; public RecipeGen_BlastSmelter(final Material M){ this.toGenerate = M; + mRecipeGenMap.add(this); } @Override @@ -33,7 +37,7 @@ public class RecipeGen_BlastSmelter implements Runnable{ generateARecipe(this.toGenerate); } - public static void generateARecipe(final Material M){ + private void generateARecipe(final Material M){ //Add a Blast Smelting Recipe, Let's go! ItemStack tStack; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index 056d5a2afd..369178abd0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import net.minecraft.item.ItemStack; import gregtech.api.enums.GT_Values; @@ -16,22 +19,27 @@ import net.minecraftforge.fluids.FluidStack; public class RecipeGen_DustGeneration implements Runnable{ + public static final Set<Runnable> mRecipeGenMap = new HashSet<Runnable>(); + final Material toGenerate; + final boolean disableOptional; public RecipeGen_DustGeneration(final Material M){ - this.toGenerate = M; + this(M, false); + } + + public RecipeGen_DustGeneration(final Material M, final boolean O){ + this.toGenerate = M; + this.disableOptional = O; + mRecipeGenMap.add(this); } @Override public void run() { - generateRecipes(this.toGenerate); - } - - public static void generateRecipes(final Material material){ - generateRecipes(material, false); + generateRecipes(this.toGenerate, this.disableOptional); } - public static void generateRecipes(final Material material, final boolean disableOptional){ + private void generateRecipes(final Material material, final boolean disableOptional){ final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java index 2b4a837c93..3b518c06d9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import net.minecraft.item.ItemStack; import gregtech.api.GregTech_API; @@ -11,10 +14,12 @@ import gtPlusPlus.core.material.Material; public class RecipeGen_Extruder implements Runnable{ + public static final Set<Runnable> mRecipeGenMap = new HashSet<Runnable>(); final Material toGenerate; public RecipeGen_Extruder(final Material M){ this.toGenerate = M; + mRecipeGenMap.add(this); } @Override @@ -22,7 +27,7 @@ public class RecipeGen_Extruder implements Runnable{ generateRecipes(this.toGenerate); } - public static void generateRecipes(final Material material){ + private void generateRecipes(final Material material){ final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; final ItemStack itemIngot = material.getIngot(1); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java index 0d4d293bd8..a3bb3fb080 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -8,22 +11,27 @@ import gtPlusPlus.core.material.Material; public class RecipeGen_Fluids implements Runnable{ + public static final Set<Runnable> mRecipeGenMap = new HashSet<Runnable>(); + final Material toGenerate; + final boolean disableOptional; public RecipeGen_Fluids(final Material M){ + this(M, false); + } + + public RecipeGen_Fluids(final Material M, final boolean dO){ this.toGenerate = M; + this.disableOptional = dO; + mRecipeGenMap.add(this); } @Override public void run() { - generateRecipes(this.toGenerate); - } - - public static void generateRecipes(final Material material){ - generateRecipes(material, false); + generateRecipes(this.toGenerate, this.disableOptional); } - public static void generateRecipes(final Material material, final boolean disableOptional){ + private void generateRecipes(final Material material, final boolean dO){ //Melting Shapes to fluid if (!material.getFluid(1).getUnlocalizedName().toLowerCase().contains("plasma")){ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java index 4a5d136372..ecf98351c3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import net.minecraft.item.ItemStack; import gregtech.api.GregTech_API; @@ -18,10 +21,13 @@ import net.minecraftforge.fluids.FluidStack; public class RecipeGen_MaterialProcessing implements Runnable{ + public static final Set<Runnable> mRecipeGenMap = new HashSet<Runnable>(); + final Material toGenerate; public RecipeGen_MaterialProcessing(final Material M){ this.toGenerate = M; + mRecipeGenMap.add(this); } @Override @@ -29,7 +35,7 @@ public class RecipeGen_MaterialProcessing implements Runnable{ generateRecipes(this.toGenerate); } - public static void generateRecipes(final Material material){ + private void generateRecipes(final Material material){ if (material.getMaterialComposites().length > 1){ Logger.MATERIALS("[Recipe Generator Debug] ["+material.getLocalizedName()+"]"); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java index 85b87b1d13..69afb4dec0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import net.minecraft.item.ItemStack; import gregtech.api.GregTech_API; @@ -12,10 +15,12 @@ import gtPlusPlus.core.material.Material; public class RecipeGen_Plates implements Runnable{ + public static final Set<Runnable> mRecipeGenMap = new HashSet<Runnable>(); final Material toGenerate; public RecipeGen_Plates(final Material M){ this.toGenerate = M; + mRecipeGenMap.add(this); } @Override @@ -23,7 +28,7 @@ public class RecipeGen_Plates implements Runnable{ generateRecipes(this.toGenerate); } - public static void generateRecipes(final Material material){ + private void generateRecipes(final Material material){ final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; final ItemStack ingotStackOne = material.getIngot(1); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java index ec015b2690..4f2a4ff43d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import net.minecraft.item.ItemStack; import gregtech.api.util.GT_ModHandler; @@ -12,10 +15,12 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; public class RecipeGen_ShapedCrafting implements Runnable{ + public static final Set<Runnable> mRecipeGenMap = new HashSet<Runnable>(); final Material toGenerate; public RecipeGen_ShapedCrafting(final Material M){ this.toGenerate = M; + mRecipeGenMap.add(this); } @Override @@ -23,7 +28,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ generateRecipes(this.toGenerate); } - public static void generateRecipes(final Material material){ + private void generateRecipes(final Material material){ Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO if (!CORE.GTNH) { |