From 943116768eab1f30696d4c0e6bc5f119c8765ac2 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 5 Jul 2017 18:58:45 +1000 Subject: $ Fixed issue #105. % Buffed Alloy Blast Smelter to be 20% faster than the Electric Blast Furnace. % Revised times for all GT++ Alloys during smelting. + Added 'Alkalus' to the tooltips of many things hidden within Gregtech. Re:#106. + Added some automatic calculations to the Materials Class. --- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 37 ++++++++++++---------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index efc5c10551..fee6fbc63c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -58,13 +58,20 @@ public class RecipeGen_BlastSmelter implements Runnable{ ItemStack circuitGT = ItemUtils.getGregtechCircuit(0); - //Set a duration - int duration = 0; + //Set a duration - OLD + /*int duration = 0; if (M.getMeltingPointK() > 150){ duration = (int) Math.max(M.getMass() / 50L, 1L) * M.getMeltingPointK(); } else { duration = (int) Math.max(M.getMass() / 50L, 1L) * 150; + }*/ + + //Set a duration - NEW + int duration = 200*M.vTier*20; + + if (M.vTier <= 4){ + duration = 40*M.vTier*20; } @@ -102,21 +109,19 @@ public class RecipeGen_BlastSmelter implements Runnable{ if (M.requiresBlastFurnace()) { if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, 240)){ Utils.LOG_WARNING("Success."); - if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration, 120)){ - Utils.LOG_WARNING("Success, Also added a Fluid solidifier recipe."); - if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){ - Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); - } - if (GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1), null, M.getFluid(16), 100, duration/9, 120)){ - Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); - } - if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){ - Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); - } - if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/9, 120)){ - Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); - } + Utils.LOG_WARNING("Success, Also added a Fluid solidifier recipe."); + if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){ + Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); + } + if (GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1), null, M.getFluid(16), 100, duration/9, 120)){ + Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); + } + if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){ + Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); } + if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/9, 120)){ + Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); + } } } else { -- cgit