diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-14 01:45:29 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-14 01:45:29 +1000 |
| commit | 9aad5dc59183de585f4e86efdf79750179ade8c7 (patch) | |
| tree | 50934a2325ec3c0fdba827110410a8a5130c3511 /src/Java/gtPlusPlus/core/item/base | |
| parent | 91e18f54e4733c695ac023d87adfcef9e8dbbb4a (diff) | |
| download | GT5-Unofficial-9aad5dc59183de585f4e86efdf79750179ade8c7.tar.gz GT5-Unofficial-9aad5dc59183de585f4e86efdf79750179ade8c7.tar.bz2 GT5-Unofficial-9aad5dc59183de585f4e86efdf79750179ade8c7.zip | |
Finished Material Re-write, I hope.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/base')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index 6d12624487..8138e14cf2 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java @@ -5,7 +5,7 @@ import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.MaterialInfo; +import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.UtilsItems; import gtPlusPlus.core.util.math.MathUtils; @@ -29,9 +29,9 @@ public class BaseItemDust extends Item{ protected boolean useBlastFurnace; String name = ""; private int mTier; - private MaterialInfo dustInfo; + private Material dustInfo; - public BaseItemDust(String unlocalizedName, String materialName, MaterialInfo matInfo, int colour, String pileSize, boolean blastFurnaceRequired, int tier, int sRadioactivity) { + public BaseItemDust(String unlocalizedName, String materialName, Material matInfo, int colour, String pileSize, boolean blastFurnaceRequired, int tier, int sRadioactivity) { setUnlocalizedName(unlocalizedName); this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); @@ -135,8 +135,8 @@ public class BaseItemDust extends Item{ private void addMixerRecipe(){ ItemStack tempStack = UtilsItems.getSimpleStack(this); ItemStack tempOutput = null; - ItemStack[] inputStacks = dustInfo.getInputs(); - ItemStack[] outputStacks = dustInfo.getOutputs(); + ItemStack[] inputStacks = dustInfo.getMaterialComposites(); + ItemStack[] outputStacks = {dustInfo.getDust()}; String temp = ""; Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); if (getUnlocalizedName().contains("item.")){ @@ -202,8 +202,8 @@ public class BaseItemDust extends Item{ Utils.LOG_WARNING("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(); + String[] inputList = UtilsItems.getArrayStackNamesAsArray(dustInfo.getMaterialComposites()); + int[] inputSizes = dustInfo.getMaterialCompositeStackSizes(); inputStacks[i] = UtilsItems.getItemStackOfAmountFromOreDict(inputList[i], inputSizes[i]); Utils.LOG_WARNING("Swapping input slot "+i+" which contains "+tempStackForAName.getDisplayName()+" with "+inputStacks[i].getDisplayName()+"."); } @@ -260,7 +260,7 @@ public class BaseItemDust extends Item{ tempIngot = tempIngot.replace("itemDust", "ingot"); Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot); - ItemStack[] outputStacks = dustInfo.getOutputs(); + ItemStack[] outputStacks = {dustInfo.getDust()}; if (tempIngot != null && tempIngot != ""){ tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1); |