diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-08-01 16:24:52 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-08-01 16:24:52 +1000 |
| commit | 14d8c3cd7cc73caed9c073f76307be6be5fa4f0f (patch) | |
| tree | 9facc5ac6b88e32a5519fc1db4c201e804d5f040 /src/Java/miscutil/core/item/base | |
| parent | 3c9a1f5c0748bd4cb66a28320c7880416a9da1e9 (diff) | |
| download | GT5-Unofficial-14d8c3cd7cc73caed9c073f76307be6be5fa4f0f.tar.gz GT5-Unofficial-14d8c3cd7cc73caed9c073f76307be6be5fa4f0f.tar.bz2 GT5-Unofficial-14d8c3cd7cc73caed9c073f76307be6be5fa4f0f.zip | |
+ Initial work on the Sinter Furnace and Multiblock debugging tools.
% Changed some of the logging for GT machine registration.
Diffstat (limited to 'src/Java/miscutil/core/item/base')
| -rw-r--r-- | src/Java/miscutil/core/item/base/dusts/BaseItemDust.java | 16 |
1 files changed, 5 insertions, 11 deletions
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, |