diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java')
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index b3115bbab5..5a985c6151 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -19,6 +19,7 @@ import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; import net.minecraftforge.fluids.FluidStack; public class RecipeGen_BlastSmelter extends RecipeGen_Base { @@ -78,12 +79,8 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { else { duration = (int) Math.max(M.getMass() / 50L, 1L) * 150; }*/ - - int aSlot = M.vTier - 2; - if (aSlot < 2) { - aSlot = 2; - } - long aVoltage = GT_Values.V[aSlot >= 2 ? aSlot : 2]; + + long aVoltage = MaterialUtils.getVoltageForTier(M.vTier); //Set a duration - NEW @@ -94,10 +91,14 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { } int mMaterialListSize=0; + + int mTotalPartsCounter = M.smallestStackSizeWhenProcessing; + if (M.getComposites() != null){ for (final gtPlusPlus.core.material.MaterialStack ternkfsdf : M.getComposites()){ if (ternkfsdf != null) { mMaterialListSize++; + //mTotalPartsCounter += ternkfsdf.getSmallestStackSizes()[0]; } } } @@ -107,7 +108,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { if (duration <= 0){ final int second = 20; - duration = 14*second*mMaterialListSize; + duration = 14*second*mMaterialListSize*8; } Logger.WARNING("[BAS] Size: "+mMaterialListSize); @@ -130,7 +131,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { //Generate Recipes for all singular materials that can be made molten. if (hasMoreInputThanACircuit){ if (M.requiresBlastFurnace()) { - if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, (int) aVoltage)){ + if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, (duration/mTotalPartsCounter), (int) aVoltage)){ Logger.WARNING("[BAS] Success."); Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe."); if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){ @@ -152,7 +153,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { } } else { - if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/2, (int) aVoltage)){ + if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/mTotalPartsCounter/2, (int) aVoltage)){ Logger.WARNING("[BAS] Success."); if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration/2, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe."); @@ -207,7 +208,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { if (M.getComposites().get(irc) != null){ final int r = (int) M.vSmallestRatio[irc]; inputStackCount = inputStackCount+r; - if ((M.getComposites().get(irc).getStackMaterial().getState() != MaterialState.SOLID) && ((M.getComposites().get(irc).getDustStack(r) == null) || (M.getComposites().get(irc).getDustStack(r) == ItemUtils.getSimpleStack(ModItems.AAA_Broken)))){ + if ((M.getComposites().get(irc).getStackMaterial().getState() != MaterialState.SOLID) || ((M.getComposites().get(irc).getDustStack(r) == null) || (M.getComposites().get(irc).getDustStack(r) == ItemUtils.getSimpleStack(ModItems.AAA_Broken)))){ final int xr = r; if ((xr > 0) && (xr <= 100)){ final int mathmatics = (r*1000); |