diff options
Diffstat (limited to 'src/Java/miscutil/core')
19 files changed, 25 insertions, 164 deletions
diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index 8361be5a39..6ffb6c543b 100644 --- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -27,6 +27,7 @@ import miscutil.core.handler.registration.gregtech.GregtechIndustrialElectrolyze import miscutil.core.handler.registration.gregtech.GregtechIndustrialMacerator; import miscutil.core.handler.registration.gregtech.GregtechIndustrialMassFabricator; import miscutil.core.handler.registration.gregtech.GregtechIndustrialPlatePress; +import miscutil.core.handler.registration.gregtech.GregtechIndustrialSinter; import miscutil.core.handler.registration.gregtech.GregtechIndustrialWiremill; import miscutil.core.handler.registration.gregtech.GregtechIronBlastFurnace; import miscutil.core.handler.registration.gregtech.GregtechRocketFuelGenerator; @@ -93,6 +94,7 @@ public class COMPAT_HANDLER { GregtechIndustrialMacerator.run(); GregtechIndustrialWiremill.run(); GregtechIndustrialMassFabricator.run(); + GregtechIndustrialSinter.run(); GregtechSolarGenerators.run(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java index c68c3dc831..eae786f4aa 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java @@ -14,7 +14,7 @@ public class GregtechCobbleGenerator public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - FMLLog.info("MiscUtils: Registering Cobblestone Powered Engines."); + FMLLog.info("Registering Cobblestone Powered Engines."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java index 6844e707f4..9c10df196c 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java @@ -21,7 +21,7 @@ public class GregtechConduits { public static void run() { if (Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Custom Cables/Wire."); + Utils.LOG_INFO("Gregtech5u Content | Registering Custom Cables/Wire."); run1(); } @@ -84,7 +84,7 @@ public class GregtechConduits { private static void makeWires(Materials aMaterial, int aStartID, long aLossInsulated, long aLoss, long aAmperage, long aVoltage, boolean aInsulatable, boolean aAutoInsulated) { - Utils.LOG_WARNING("MiscUtils: Gregtech5u Content | Registered "+aMaterial.name() +" as a new material for Wire & Cable."); + Utils.LOG_WARNING("Gregtech5u Content | Registered "+aMaterial.name() +" as a new material for Wire & Cable."); GT_OreDictUnificator.registerOre(OrePrefixes.wireGt01, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 0, "wire." + aMaterial.name().toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Wire", 0.125F, aMaterial, aLoss, 1L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L)); GT_OreDictUnificator.registerOre(OrePrefixes.wireGt02, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 1, "wire." + aMaterial.name().toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Wire", 0.25F, aMaterial, aLoss, 2L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L)); GT_OreDictUnificator.registerOre(OrePrefixes.wireGt04, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 2, "wire." + aMaterial.name().toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Wire", 0.375F, aMaterial, aLoss, 4L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L)); diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java index e36a11748e..8766afc097 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java @@ -19,7 +19,7 @@ public class GregtechEnergyBuffer public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Energy Buffer Blocks."); + Utils.LOG_INFO("Gregtech5u Content | Registering Energy Buffer Blocks."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java index 096b0e7b69..9475b213f2 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -12,7 +12,7 @@ public class GregtechIndustrialCentrifuge public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); + Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java index dd589a61a1..208fb7883f 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java @@ -12,7 +12,7 @@ public class GregtechIndustrialCokeOven public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Coke Oven Multiblock."); + Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java index 7cd9628769..98386cf4b0 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -12,7 +12,7 @@ public class GregtechIndustrialElectrolyzer public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Electrolyzer Multiblock."); + Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java index b9bd99a7d5..ccd81e6dd2 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java @@ -12,7 +12,7 @@ public class GregtechIndustrialMacerator public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); + Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java index b7e77e5e6c..72bf99b6b5 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -12,7 +12,7 @@ public class GregtechIndustrialMassFabricator public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Mass Fabricator Multiblock."); + Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Mass Fabricator Multiblock."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java index dcd2715e61..87364565ea 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java @@ -12,7 +12,7 @@ public class GregtechIndustrialPlatePress public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Press Multiblock."); + Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Press Multiblock."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java index 1a4fe5c75a..d5ba679edb 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java @@ -12,7 +12,7 @@ public class GregtechIndustrialWiremill public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); + Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java index 43df1fad1d..8dea539053 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java @@ -12,7 +12,7 @@ public class GregtechIronBlastFurnace public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Iron Blast Furnace."); + Utils.LOG_INFO("Gregtech5u Content | Registering Iron Blast Furnace."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java index f1a8620208..01cf22e8b1 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java @@ -10,7 +10,7 @@ public class GregtechRocketFuelGenerator { public static void run() { if (LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Rocket Engines."); + Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Rocket Engines."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java index 6149a4f39d..99bb28e8c7 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java @@ -14,7 +14,7 @@ public class GregtechSafeBlock public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Lockable Safe Blocks."); + Utils.LOG_INFO("Gregtech5u Content | Registering Lockable Safe Blocks."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java index d9320646f7..e4d9a36fe1 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java @@ -11,7 +11,7 @@ public class GregtechSolarGenerators public static void run() { if (LoadedMods.Gregtech && configSwitches.enableSolarGenerators){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Solar Generator Blocks."); + Utils.LOG_INFO("Gregtech5u Content | Registering Solar Generator Blocks."); run1(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java index 746cce0ff8..64c386dec0 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java @@ -12,7 +12,7 @@ public class GregtechSteamCondenser public static void run() { if (miscutil.core.lib.LoadedMods.Gregtech){ - Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Steam Condensor."); + Utils.LOG_INFO("Gregtech5u Content | Registering Steam Condensor."); run1(); } diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java index 0435bd4f10..b0064b0b11 100644 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java @@ -214,26 +214,20 @@ public class BaseItemDust extends Item{ tempIngot = tempIngot.replace("itemDust", "ingot"); Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot); ItemStack[] outputStacks = dustInfo.getOutputs(); - if (tempIngot != null && tempIngot != "" && outputStacks[1] != null){ + if (tempIngot != null && tempIngot != ""){ tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1); ItemStack tempStackOutput2; int chance = mTier*10/Utils.randInt(10, 20); if (outputStacks[1] != null && !outputStacks[1].getUnlocalizedName().toLowerCase().contains("aaa_broken")){ tempStackOutput2 = outputStacks[1]; + tempOutputStack = outputStacks[0]; } else { tempStackOutput2 = null; } if (null != tempOutputStack && null != tempInputStack){ - GT_ModHandler.addPulverisationRecipe(tempInputStack, outputStacks[0], tempStackOutput2, chance); - } - } - if (tempIngot != null && tempIngot != ""){ - tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); - tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1); - if (null != tempOutputStack && null != tempInputStack){ - GT_ModHandler.addPulverisationRecipe(tempInputStack, tempOutputStack); + GT_ModHandler.addPulverisationRecipe(tempInputStack, tempOutputStack.splitStack(1), tempStackOutput2, chance); } } } @@ -290,7 +284,7 @@ public class BaseItemDust extends Item{ private void addBlastFurnaceRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, int tempRequired){ //Special Cases - if (input1.getUnlocalizedName().toLowerCase().contains("tantalloy61")){ + /*if (input1.getUnlocalizedName().toLowerCase().contains("tantalloy61")){ Utils.LOG_INFO("Adding Special handler for Staballoy-61 in the Blast Furnace"); input2 = UtilsItems.getItemStackOfAmountFromOreDict("dustTantalloy60", 2); if (input2 == null){ @@ -299,7 +293,7 @@ public class BaseItemDust extends Item{ else { Utils.LOG_INFO("Found "+input2.getDisplayName()); } - } + }*/ GT_Values.RA.addBlastRecipe( input1, input2, diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java index 0bb7d421a8..ffe214c0cc 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java @@ -6,14 +6,11 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; -import miscutil.core.lib.CORE.configSwitches; import miscutil.core.util.Utils; import miscutil.core.util.fluid.FluidUtils; import miscutil.core.util.item.UtilsItems; import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; public class RECIPES_GREGTECH { @@ -27,12 +24,8 @@ public class RECIPES_GREGTECH { matterFabRecipes(); assemblerRecipes(); distilleryRecipes(); - mixerRecipes(); extractorRecipes(); addFuels(); - blastFurnaceRecipes(); - vacuumFreezerRecipes(); - benderRecipes(); } private static void cokeOvenRecipes(){ @@ -134,13 +127,6 @@ public class RECIPES_GREGTECH { //System.exit(1); } - private static void mixerRecipes(){ - Utils.LOG_INFO("Registering Mixer Recipes."); - GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 8L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(ModItems.itemDustStaballoy, 2), 32, 8); - GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 8L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(ModItems.itemDustSmallStaballoy, 2), 32, 8); - GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 8L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(ModItems.itemDustTinyStaballoy, 2), 32, 8); - } - private static void extractorRecipes(){ Utils.LOG_INFO("Registering Extractor Recipes."); GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Sodium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); @@ -152,127 +138,5 @@ public class RECIPES_GREGTECH { //GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), tBits, new Object[]{"fX", Character.valueOf('X'), OrePrefixes.toolHeadShovel.get(aMaterial)}); } - private static void blastFurnaceRecipes(){ - Utils.LOG_INFO("Registering Blast Furnace Recipes."); - - if (!configSwitches.disableStaballoyBlastFurnaceRecipe){ - - //Staballoy - GT_Values.RA.addBlastRecipe( - UtilsItems.getItemStackOfAmountFromOreDict("ingotUranium", 8), - UtilsItems.getItemStackOfAmountFromOreDict("ingotTitanium", 1), - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotStaballoy, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), - (int) Math.max(GT_Materials.Staballoy.getMass() / 80L, 1L) * GT_Materials.Staballoy.mBlastFurnaceTemp, - 1000, GT_Materials.Staballoy.mBlastFurnaceTemp); - GT_Values.RA.addBlastRecipe( - UtilsItems.getSimpleStack(ModItems.itemDustStaballoy, 1), - null, - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotStaballoy, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), - (int) Math.max(GT_Materials.Staballoy.getMass() / 80L, 1L) * GT_Materials.Staballoy.mBlastFurnaceTemp, - 2000, GT_Materials.Staballoy.mBlastFurnaceTemp); - GT_Values.RA.addBlastRecipe( - UtilsItems.getSimpleStack(ModItems.itemDustSmallStaballoy, 4), - null, - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotStaballoy, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), - (int) Math.max(GT_Materials.Staballoy.getMass() / 80L, 1L) * GT_Materials.Staballoy.mBlastFurnaceTemp, - 2000, GT_Materials.Staballoy.mBlastFurnaceTemp); - GT_Values.RA.addBlastRecipe( - UtilsItems.getSimpleStack(ModItems.itemDustTinyStaballoy, 9), - null, - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotStaballoy, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), - (int) Math.max(GT_Materials.Staballoy.getMass() / 80L, 1L) * GT_Materials.Staballoy.mBlastFurnaceTemp, - 2000, GT_Materials.Staballoy.mBlastFurnaceTemp); - - //Tantalloy 60 - GT_Values.RA.addBlastRecipe( - UtilsItems.getItemStackOfAmountFromOreDict("ingotTungsten", 1), - UtilsItems.getItemStackOfAmountFromOreDict("ingotTantalum", 8), - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy60), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tungsten, 1L), - (int) Math.max(GT_Materials.Tantalloy60.getMass() / 80L, 1L) * GT_Materials.Tantalloy60.mBlastFurnaceTemp, - 480, - GT_Materials.Tantalloy60.mBlastFurnaceTemp); - GT_Values.RA.addBlastRecipe( - UtilsItems.getSimpleStack(ModItems.itemDustTantalloy60, 1), - null, - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy60, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tungsten, 1L), - (int) Math.max(GT_Materials.Tantalloy60.getMass() / 80L, 1L) * GT_Materials.Tantalloy60.mBlastFurnaceTemp, - 2000, GT_Materials.Tantalloy60.mBlastFurnaceTemp); - GT_Values.RA.addBlastRecipe( - UtilsItems.getSimpleStack(ModItems.itemDustSmallTantalloy60, 4), - null, - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy60, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tungsten, 1L), - (int) Math.max(GT_Materials.Tantalloy60.getMass() / 80L, 1L) * GT_Materials.Tantalloy60.mBlastFurnaceTemp, - 2000, GT_Materials.Tantalloy60.mBlastFurnaceTemp); - GT_Values.RA.addBlastRecipe( - UtilsItems.getSimpleStack(ModItems.itemDustTinyTantalloy60, 9), - null, - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy60, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tungsten, 1L), - (int) Math.max(GT_Materials.Tantalloy60.getMass() / 80L, 1L) * GT_Materials.Tantalloy60.mBlastFurnaceTemp, - 2000, GT_Materials.Tantalloy60.mBlastFurnaceTemp); - - //Tantalloy 61 - GT_Values.RA.addBlastRecipe( - UtilsItems.getItemStackOfAmountFromOreDict("ingotTitanium", 1), - UtilsItems.getItemStackOfAmountFromOreDict("ingotTantalloy60", 1), - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy61), - UtilsItems.getItemStackOfAmountFromOreDict("dustTinyTantalloy60", 1), - (int) Math.max(GT_Materials.Tantalloy61.getMass() / 80L, 1L) * GT_Materials.Tantalloy61.mBlastFurnaceTemp, - 480, - GT_Materials.Tantalloy61.mBlastFurnaceTemp); - GT_Values.RA.addBlastRecipe( - UtilsItems.getSimpleStack(ModItems.itemDustTantalloy61, 1), - null, - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy61, 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustTinyTantalloy60", 1), - (int) Math.max(GT_Materials.Tantalloy61.getMass() / 80L, 1L) * GT_Materials.Tantalloy61.mBlastFurnaceTemp, - 2000, GT_Materials.Tantalloy61.mBlastFurnaceTemp); - GT_Values.RA.addBlastRecipe( - UtilsItems.getSimpleStack(ModItems.itemDustSmallTantalloy61, 4), - null, - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy61, 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustTinyTantalloy60", 1), - (int) Math.max(GT_Materials.Tantalloy61.getMass() / 80L, 1L) * GT_Materials.Tantalloy61.mBlastFurnaceTemp, - 2000, GT_Materials.Tantalloy61.mBlastFurnaceTemp); - GT_Values.RA.addBlastRecipe( - UtilsItems.getSimpleStack(ModItems.itemDustTinyTantalloy61, 9), - null, - GT_Values.NF, GT_Values.NF, - UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy61, 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustTinyTantalloy60", 1), - (int) Math.max(GT_Materials.Tantalloy61.getMass() / 80L, 1L) * GT_Materials.Tantalloy61.mBlastFurnaceTemp, - 2000, GT_Materials.Tantalloy61.mBlastFurnaceTemp); - } - } - private static void vacuumFreezerRecipes(){ - - - } - - private static void benderRecipes(){ - GT_Values.RA.addBenderRecipe( - UtilsItems.getSimpleStack(ModItems.itemIngotStaballoy, 1), - UtilsItems.getSimpleStack(ModItems.itemPlateStaballoy, 1), - 400, - 48); - } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java index b3dbccd129..2000a1df34 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java @@ -96,7 +96,8 @@ public enum GregtechItemList implements GregtechItemContainer { - Food_Baked_Raisin_Bread; + Food_Baked_Raisin_Bread, + Industrial_SinterFurnace; public static final GregtechItemList[] DYE_ONLY_ITEMS = { |