diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
7 files changed, 36 insertions, 35 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java index 66941849f8..d7244919d8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java @@ -39,7 +39,7 @@ public class RecipeGen_Assembler extends RecipeGen_Base { ItemUtils.getGregtechCircuit(4), material.getFrameBox(1), 60, - 8); + material.vVoltageMultiplier); //Rotor if (ItemUtils.checkForInvalidItems(new ItemStack[] {material.getPlate(1), material.getRing(1), material.getRotor(1)})) @@ -48,7 +48,7 @@ public class RecipeGen_Assembler extends RecipeGen_Base { material.getRing(1), material.getRotor(1), 240, - 24); + material.vVoltageMultiplier); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index ecdc3af1db..461ac256f4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -47,7 +47,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { } private void generateRecipes(final Material material, final boolean disableOptional){ - final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; + final int tVoltageMultiplier = material.vVoltageMultiplier; Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO @@ -212,7 +212,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { null, outputStacks, (int) Math.max(material.getMass() * 2L * 1, 1), - 2 * material.vVoltageMultiplier)) //Was 6, but let's try 2. This makes Potin LV, for example. + material.vVoltageMultiplier)) //Was 6, but let's try 2. This makes Potin LV, for example. { Logger.WARNING("Dust Mixer Recipe: "+material.getLocalizedName()+" - Success"); } @@ -318,7 +318,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { null, outputStacks, (int) Math.max(material.getMass() * 2L * 1, 1), - 2 * material.vVoltageMultiplier)) //Was 6, but let's try 2. This makes Potin LV, for example. + material.vVoltageMultiplier)) //Was 6, but let's try 2. This makes Potin LV, for example. { Logger.WARNING("Dust Mixer Recipe: "+material.getLocalizedName()+" - Success"); return true; @@ -421,7 +421,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { if (aSlot < 2) { aSlot = 2; } - long aVoltage = MaterialUtils.getVoltageForTier(aSlot); + long aVoltage = aMatInfo.vVoltageMultiplier; return GT_Values.RA.addBlastRecipe( input1, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java index 9315826495..56f65670a8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java @@ -57,7 +57,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { shape_Ingot, material.getIngot(9), (int) Math.max(material.getMass() * 2L * 1, 1), - 4 * material.vVoltageMultiplier)){ + material.vVoltageMultiplier)){ Logger.WARNING("Extruder Ingot Recipe: "+material.getLocalizedName()+" - Success"); } else { @@ -70,7 +70,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { shape_Block, material.getBlock(1), (int) Math.max(material.getMass() * 2L * 1, 1), - 8 * material.vVoltageMultiplier)){ + material.vVoltageMultiplier)){ Logger.WARNING("Extruder Block Recipe: "+material.getLocalizedName()+" - Success"); } else { @@ -85,7 +85,8 @@ public class RecipeGen_Extruder extends RecipeGen_Base { itemIngot, shape_Plate, itemPlate, - 10, 4 * tVoltageMultiplier)){ + 10, + material.vVoltageMultiplier)){ Logger.WARNING("Extruder Plate Recipe: "+material.getLocalizedName()+" - Success"); } else { @@ -100,7 +101,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { shape_Ring, material.getRing(4), (int) Math.max(material.getMass() * 2L * 1, 1), - 6 * material.vVoltageMultiplier)){ + material.vVoltageMultiplier)){ Logger.WARNING("Extruder Ring Recipe: "+material.getLocalizedName()+" - Success"); } else { @@ -117,7 +118,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { shape_Gear, itemGear, (int) Math.max(material.getMass() * 5L, 1), - 8 * material.vVoltageMultiplier)){ + material.vVoltageMultiplier)){ Logger.WARNING("Extruder Gear Recipe: "+material.getLocalizedName()+" - Success"); } else { @@ -133,7 +134,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { shape_Rod, material.getRod(2), (int) Math.max(material.getMass() * 2L * 1, 1), - 6 * material.vVoltageMultiplier)){ + material.vVoltageMultiplier)){ Logger.WARNING("Extruder Rod Recipe: "+material.getLocalizedName()+" - Success"); } else { @@ -149,7 +150,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { shape_Bolt, material.getBolt(8), (int) Math.max(material.getMass() * 2L * 1, 1), - 6 * material.vVoltageMultiplier)){ + material.vVoltageMultiplier)){ Logger.WARNING("Extruder Bolt Recipe: "+material.getLocalizedName()+" - Success"); } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java index 9fe2aeb12e..b2236fdd6c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java @@ -53,7 +53,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(144), // Fluid Output 0, // Chance 1 * 20, // Duration - 16 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING("144l fluid extractor from 1 ingot Recipe: " + material.getLocalizedName() + " - Success"); @@ -69,7 +69,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(144), // Fluid Output 0, // Chance 1 * 20, // Duration - 16 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING("144l fluid extractor from 1 plate Recipe: " + material.getLocalizedName() + " - Success"); @@ -85,7 +85,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(288), // Fluid Output 0, // Chance 1 * 20, // Duration - 16 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING("144l fluid extractor from 1 double plate Recipe: " + material.getLocalizedName() + " - Success"); @@ -101,7 +101,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(16), // Fluid Output 0, // Chance 16, // Duration - 8 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING("16l fluid extractor from 1 nugget Recipe: " + material.getLocalizedName() + " - Success"); @@ -117,7 +117,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(144 * 9), // Fluid Output 0, // Chance 288, // Duration - 16 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING((144 * 9) + "l fluid extractor from 1 block Recipe: " + material.getLocalizedName() + " - Success"); @@ -136,7 +136,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(144), // Fluid Input material.getIngot(1), // output 32, // Duration - 8 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING( "144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Success"); @@ -151,7 +151,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(144), // Fluid Input material.getPlate(1), // output 32, // Duration - 8 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING( "144l fluid molder for 1 plate Recipe: " + material.getLocalizedName() + " - Success"); @@ -166,7 +166,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(16), // Fluid Input material.getNugget(1), // output 16, // Duration - 4 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING( "16l fluid molder for 1 nugget Recipe: " + material.getLocalizedName() + " - Success"); @@ -181,7 +181,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(576), // Fluid Input material.getGear(1), // output 128, // Duration - 8 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING( "576l fluid molder for 1 gear Recipe: " + material.getLocalizedName() + " - Success"); @@ -195,7 +195,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(144 * 9), // Fluid Input material.getBlock(1), // output 288, // Duration - 16 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING((144 * 9) + "l fluid molder from 1 block Recipe: " + material.getLocalizedName() + " - Success"); @@ -227,7 +227,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(72), // Fluid Input material.getRod(1), // output 150, // Duration - 24 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING((144 * 9) + "l fluid molder from 1 rod Recipe: " + material.getLocalizedName() + " - Success"); @@ -243,7 +243,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(144), // Fluid Input material.getLongRod(1), // output 300, // Duration - 24 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING((144 * 9) + "l fluid molder from 1 rod long Recipe: " + material.getLocalizedName() + " - Success"); @@ -258,7 +258,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(18), // Fluid Input material.getBolt(1), // output 50, // Duration - 6 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING((144 * 9) + "l fluid molder from 1 bolt Recipe: " + material.getLocalizedName() + " - Success"); @@ -273,7 +273,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(18), // Fluid Input material.getScrew(1), // output 50, // Duration - 6 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING((144 * 9) + "l fluid molder from 1 screw Recipe: " + material.getLocalizedName() + " - Success"); @@ -288,7 +288,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { material.getFluid(36), // Fluid Input material.getRing(1), // output 100, // Duration - 12 // Eu Tick + material.vVoltageMultiplier // Eu Tick )) { Logger.WARNING((144 * 9) + "l fluid molder from 1 ring Recipe: " + material.getLocalizedName() + " - Success"); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java index 07f806c9c9..90bd1d8f1a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java @@ -42,7 +42,7 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { if (material.getMaterialComposites().length > 1){ Logger.MATERIALS("[Recipe Generator Debug] ["+material.getLocalizedName()+"]"); - final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; + final int tVoltageMultiplier = material.vVoltageMultiplier; int[] partSizes = new int[99]; if (material.vSmallestRatio != null) { partSizes = new int[material.vSmallestRatio.length]; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java index 15e64534f9..f705ac9673 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java @@ -51,7 +51,7 @@ public class RecipeGen_Plates extends RecipeGen_Base { ingotStackTwo, plate_Single, (int) Math.max(material.getMass(), 1L), - 16)){ + material.vVoltageMultiplier)){ Logger.WARNING("Forge Hammer Recipe: "+material.getLocalizedName()+" - Success"); } else { @@ -63,7 +63,7 @@ public class RecipeGen_Plates extends RecipeGen_Base { ingotStackOne, plate_Single, (int) Math.max(material.getMass() * 1L, 1L), - 24)){ + material.vVoltageMultiplier)){ Logger.WARNING("Bender Recipe: "+material.getLocalizedName()+" - Success"); } else { @@ -76,7 +76,7 @@ public class RecipeGen_Plates extends RecipeGen_Base { shape_Mold, plate_Single, (int) Math.max(material.getMass() * 2L, 1L), - 2 * tVoltageMultiplier)){ + material.vVoltageMultiplier)){ Logger.WARNING("Alloy Smelter Recipe: "+material.getLocalizedName()+" - Success"); } else { @@ -90,7 +90,7 @@ public class RecipeGen_Plates extends RecipeGen_Base { ingotStackTwo, plate_Double, (int) Math.max(material.getMass() * 2L, 1L), - 96)){ + material.vVoltageMultiplier)){ Logger.WARNING("Bender Recipe: "+material.getLocalizedName()+" - Success"); } else { @@ -102,7 +102,7 @@ public class RecipeGen_Plates extends RecipeGen_Base { plate_SingleTwo, plate_Double, (int) Math.max(material.getMass() * 2L, 1L), - 96)){ + material.vVoltageMultiplier)){ Logger.WARNING("Bender Recipe: "+material.getLocalizedName()+" - Success"); } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java index 180a684fb8..f0c2785e1b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java @@ -139,7 +139,7 @@ public class RecipeGen_Recycling implements Runnable { //Fluid Extractor if (ItemUtils.checkForInvalidItems(tempStack)) { // mValidItems[mSlotIndex++] = tempStack; - if ((mDust != null) && GT_Values.RA.addFluidExtractionRecipe(tempStack, null, material.getFluid(mFluidAmount), 0, 30, 8)) { + if ((mDust != null) && GT_Values.RA.addFluidExtractionRecipe(tempStack, null, material.getFluid(mFluidAmount), 0, 30, material.vVoltageMultiplier)) { Logger.WARNING("Fluid Recycle Recipe: " + material.getLocalizedName() + " - Success - Recycle " + tempStack.getDisplayName() + " and obtain " + mFluidAmount+"mb of "+material.getFluid(1).getLocalizedName()+"."); } |