diff options
Diffstat (limited to 'src/Java')
3 files changed, 67 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java index 43edc18bc8..84c46a36e8 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java @@ -98,11 +98,14 @@ public class MaterialGenerator { //Add A jillion Recipes - old code - RecipeGen_Plates.generateRecipes(matInfo); + RecipeGen_AlloySmelter.generateRecipes(matInfo); + RecipeGen_Assembler.generateRecipes(matInfo); + RecipeGen_BlastSmelter.generateARecipe(matInfo); + RecipeGen_DustGeneration.generateRecipes(matInfo); RecipeGen_Extruder.generateRecipes(matInfo); + RecipeGen_Fluids.generateRecipes(matInfo); + RecipeGen_Plates.generateRecipes(matInfo); RecipeGen_ShapedCrafting.generateRecipes(matInfo); - RecipeGen_DustGeneration.generateRecipes(matInfo); - RecipeGen_BlastSmelter.generateARecipe(matInfo); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java new file mode 100644 index 0000000000..36817d8621 --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java @@ -0,0 +1,42 @@ +package gtPlusPlus.xmod.gregtech.loaders; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gtPlusPlus.core.material.Material; + +public class RecipeGen_AlloySmelter implements Runnable{ + + final Material toGenerate; + + public RecipeGen_AlloySmelter(final Material M){ + this.toGenerate = M; + } + + @Override + public void run() { + generateRecipes(toGenerate); + } + + public static void generateRecipes(final Material material){ + final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16; + + //Nuggets + GT_Values.RA.addAlloySmelterRecipe( + material.getIngot(1), + ItemList.Shape_Mold_Nugget.get(1), + material.getNugget(9), + (int) Math.max(material.getMass() * 2L, 1L), + 2 * tVoltageMultiplier); + + //Gears + GT_Values.RA.addAlloySmelterRecipe( + material.getIngot(8), + ItemList.Shape_Mold_Gear.get(1), + material.getGear(1), + (int) Math.max(material.getMass() * 2L, 1L), + 2 * tVoltageMultiplier); + + } + +} + diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java index 6eaa164342..dee90df9ba 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java @@ -9,16 +9,16 @@ import net.minecraft.item.ItemStack; public class RecipeGen_ShapedCrafting implements Runnable{ final Material toGenerate; - + public RecipeGen_ShapedCrafting(final Material M){ this.toGenerate = M; } - + @Override public void run() { generateRecipes(toGenerate); } - + public static void generateRecipes(final Material material){ Utils.LOG_WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO @@ -90,7 +90,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ //Add a shapeless recipe for each dust this way - Compat mode. /*ItemStack[] inputStacks = material.getMaterialComposites(); ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing); - + if (inputStacks.length > 0){ Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks)); long[] inputStackSize = material.vSmallestRatio; @@ -111,7 +111,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ } } }*/ - + //Shaped Recipe - Bolts if (!material.isRadioactive){ @@ -179,6 +179,20 @@ public class RecipeGen_ShapedCrafting implements Runnable{ } } + //Gear Recipe + if (!material.isRadioactive){ + if (RecipeUtils.recipeBuilder( + material.getRod(1), material.getPlate(1), material.getRod(1), + material.getPlate(1), "craftingToolWrench", material.getPlate(1), + material.getRod(1), material.getPlate(1), material.getRod(1), + material.getGear(1))){ + Utils.LOG_WARNING("Gear Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Utils.LOG_WARNING("Gear Recipe: "+material.getLocalizedName()+" - Failed"); + } + } + //Screws if (!material.isRadioactive){ if (RecipeUtils.recipeBuilder( |