From 01ba9286c5974ddbfb0b7399abeacb45d04c01cc Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Fri, 5 Aug 2016 18:21:36 +1000 Subject: + Added Several new Materials. (Hastelloy (W, X & C276), Incoloy (020, DS, MA956), Zirconium, Zirconium Carbide, Tantalum Carbide & Niobium Carbide.) + Added chemical bath recipe for Zirconium. % Changed material backend to be more flexible. % Made some minor changes to the Staballoy Axe, which need fixing before a new release. @Draknyte1 --- .../miscutil/core/item/base/dusts/BaseItemDust.java | 18 +++++++++++++++--- .../miscutil/core/item/base/rings/BaseItemRing.java | 4 ++-- 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'src/Java/miscutil/core/item/base') diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java index 6402037997..c1311f0c7b 100644 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java @@ -180,18 +180,30 @@ public class BaseItemDust extends Item{ null, null, null); } else { - Utils.LOG_INFO("Generating a Dust recipe for "+materialName+" in the mixer."); + Utils.LOG_WARNING("Generating a Dust recipe for "+materialName+" in the mixer."); int i = 0; + if (inputStacks.length >= 2){ for (ItemStack is : inputStacks){ - i++; if (is != null){ - Utils.LOG_INFO("Found "+is.getDisplayName()+" as an input for mixer recipe."); + Utils.LOG_INFO("Found "+is.getDisplayName()+" as an input for mixer recipe."); + if (is.getDisplayName().toLowerCase().contains("tell alkalus")){ + ItemStack tempStackForAName = inputStacks[i]; + String[] inputList = dustInfo.getInputItemsAsList(); + int[] inputSizes = dustInfo.getInputStackSizesAsList(); + inputStacks[i] = UtilsItems.getItemStackOfAmountFromOreDict(inputList[i], inputSizes[i]); + Utils.LOG_INFO("Swapping input slot "+i+" which contains "+tempStackForAName.getDisplayName()+" with "+inputStacks[i].getDisplayName()+"."); + } + } + else { Utils.LOG_INFO("Input "+i+" was null."); } + + i++; + } } GT_Values.RA.addMixerRecipe( diff --git a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java index 0ec02b0299..dbbb233098 100644 --- a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java +++ b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java @@ -74,8 +74,8 @@ public class BaseItemRing extends Item{ GT_Values.RA.addExtruderRecipe(tempOutputStack, ItemList.Shape_Extruder_Ring.get(1), UtilsItems.getSimpleStack(this, 4), - 160*mTier, - 32*mTier); + 12*mTier*20, + 24*mTier); } } -- cgit