diff options
| author | draknyte1 <draknyte1@hotmail.com> | 2017-02-24 19:01:15 +1000 |
|---|---|---|
| committer | draknyte1 <draknyte1@hotmail.com> | 2017-02-24 19:01:15 +1000 |
| commit | a28373b1977ed51fba9557232472af9ba23a0146 (patch) | |
| tree | ab25aca226de915cb098123d15a664d3525655aa /src/Java/gtPlusPlus/xmod/gregtech/loaders | |
| parent | 753dfac294b530de403c85eb931f4989868a4203 (diff) | |
| download | GT5-Unofficial-a28373b1977ed51fba9557232472af9ba23a0146.tar.gz GT5-Unofficial-a28373b1977ed51fba9557232472af9ba23a0146.tar.bz2 GT5-Unofficial-a28373b1977ed51fba9557232472af9ba23a0146.zip | |
% Tweaked recipe generation to use 30/120/500 eu/t as opposed to 32/128/512 eu/t to account for cable loss.
+ Re-enabled shapeless crafting recipes for lower tier alloys, as opposed to enforcing mixer only recipes.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
5 files changed, 11 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java index 36817d8621..d2bee058e1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java @@ -18,7 +18,7 @@ public class RecipeGen_AlloySmelter implements Runnable{ } public static void generateRecipes(final Material material){ - final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16; + final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; //Nuggets GT_Values.RA.addAlloySmelterRecipe( diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index 27ec8d4111..d3525cedb3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -26,7 +26,7 @@ public class RecipeGen_DustGeneration implements Runnable{ } public static void generateRecipes(final Material material, boolean disableOptional){ - final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16; + final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; Utils.LOG_WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO //Ring Recipe diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java index ced26598af..caaf0f9b47 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java @@ -22,7 +22,7 @@ public class RecipeGen_Extruder implements Runnable{ public static void generateRecipes(final Material material){ - final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16; + final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; final ItemStack itemIngot = material.getIngot(1); final ItemStack plate_Single = material.getPlate(1); final ItemStack itemGear = material.getGear(1); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java index 0502156525..c48a41b496 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java @@ -23,7 +23,7 @@ public class RecipeGen_Plates implements Runnable{ public static void generateRecipes(final Material material){ - final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16; + final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; final ItemStack ingotStackOne = material.getIngot(1); final ItemStack ingotStackTwo = material.getIngot(2); final ItemStack shape_Mold = ItemList.Shape_Mold_Plate.get(0); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java index dee90df9ba..6982ee8157 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java @@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.loaders; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; import net.minecraft.item.ItemStack; @@ -87,11 +88,14 @@ public class RecipeGen_ShapedCrafting implements Runnable{ } + final int tVoltageMultiplier = material.getMeltingPointK() >= 1600 ? 60 : 15; + + //Add a shapeless recipe for each dust this way - Compat mode. - /*ItemStack[] inputStacks = material.getMaterialComposites(); + ItemStack[] inputStacks = material.getMaterialComposites(); ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing); - if (inputStacks.length > 0){ + if (inputStacks.length > 0 && tVoltageMultiplier == 15){ Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks)); long[] inputStackSize = material.vSmallestRatio; if (inputStackSize != null){ @@ -110,7 +114,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("Shapeless Crafting Recipe: "+material.getLocalizedName()+" - Failed"); } } - }*/ + } //Shaped Recipe - Bolts |