From 9aad5dc59183de585f4e86efdf79750179ade8c7 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 14 Sep 2016 01:45:29 +1000 Subject: Finished Material Re-write, I hope. --- src/Java/gtPlusPlus/core/material/Material.java | 36 +++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'src/Java/gtPlusPlus/core/material') diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 4ce496bb22..ef9f3274ee 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -10,9 +10,9 @@ public class Material { final String unlocalizedName; final String localizedName; - final public MaterialStack[] materialInput = null; + final MaterialStack[] materialInput = null; - final public short[] RGBA; + final short[] RGBA; final boolean usesBlastFurnace; @@ -49,6 +49,18 @@ public class Material { } + public String getLocalizedName(){ + return localizedName; + } + + public String getUnlocalizedName(){ + return unlocalizedName; + } + + public short[] getRGBA(){ + return RGBA; + } + public long getProtons() { return vProtons; } @@ -68,6 +80,10 @@ public class Material { public int getBoilingPoint_C() { return boilingPointC; } + + public boolean requiresBlastFurnace(){ + return usesBlastFurnace; + } public ItemStack getDust(){ return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dust"+unlocalizedName, 1); @@ -77,4 +93,20 @@ public class Material { return UtilsItems.validItemsForOreDict(unlocalizedName); } + public ItemStack[] getMaterialComposites(){ + ItemStack[] temp = {}; + for (int i=0;i