diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-14 03:06:05 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-14 03:06:05 +1000 |
| commit | 2d5bc4bf0e324979c58ed8b35283a2a78b50ad01 (patch) | |
| tree | d9a685da893beab58ab6438162ac13af08e1feab /src/Java/gtPlusPlus/core/item/base | |
| parent | a871ac6e7b14239481899e9c5430c114bc75ba4a (diff) | |
| download | GT5-Unofficial-2d5bc4bf0e324979c58ed8b35283a2a78b50ad01.tar.gz GT5-Unofficial-2d5bc4bf0e324979c58ed8b35283a2a78b50ad01.tar.bz2 GT5-Unofficial-2d5bc4bf0e324979c58ed8b35283a2a78b50ad01.zip | |
More Work clearing up Nulls.
Making more things final and accessible to others.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/base')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index 8138e14cf2..b5e303ff7a 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java @@ -218,12 +218,19 @@ public class BaseItemDust extends Item{ } } - GT_Values.RA.addMixerRecipe( - inputStacks[0], inputStacks[1], - inputStacks[2], inputStacks[3], - null, null, - tempOutput, - 8*mTier*20, 8*mTier*2); + if (inputStacks.length != 0){ + GT_Values.RA.addMixerRecipe( + inputStacks[0], inputStacks[1], + inputStacks[2], inputStacks[3], + null, null, + tempOutput, + 8*mTier*20, 8*mTier*2); + } + else { + return; + } + + /*GT_Values.RA.addMixerRecipe( GT_Utility.copyAmount(inputStacks[0].stackSize, new Object[]{inputStacks[0]}), GT_Utility.copyAmount(inputStacks[1].stackSize, new Object[]{inputStacks[1]}), @@ -264,11 +271,21 @@ public class BaseItemDust extends Item{ if (tempIngot != null && tempIngot != ""){ tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1); - ItemStack tempStackOutput2; + ItemStack tempStackOutput2 = null; int chance = mTier*10/MathUtils.randInt(10, 20); - if (outputStacks[1] != null && !outputStacks[1].getUnlocalizedName().toLowerCase().contains("aaa_broken")){ - tempStackOutput2 = outputStacks[1]; - tempOutputStack = outputStacks[0]; + if (outputStacks.length != 0){ + if (outputStacks.length == 1){ + tempStackOutput2 = null; + } + else { + if (!outputStacks[1].getUnlocalizedName().toLowerCase().contains("aaa_broken")){ + tempStackOutput2 = outputStacks[1]; + tempOutputStack = outputStacks[0]; + } + else { + tempStackOutput2 = null; + } + } } else { tempStackOutput2 = null; |