diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/material')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/material/Material.java | 6 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/material/MaterialStack.java | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index 64b705629e..748db12590 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -88,6 +88,8 @@ public class Material { public BaseTinkersMaterial vTiConHandler; + public short werkstoffID; + public static AutoMap<Materials> invalidMaterials = new AutoMap<Materials>(); @@ -1527,4 +1529,8 @@ public class Material { } } + public void setWerkstoffID(short werkstoffID) { + this.werkstoffID = werkstoffID; + } + }
\ No newline at end of file diff --git a/src/main/java/gtPlusPlus/core/material/MaterialStack.java b/src/main/java/gtPlusPlus/core/material/MaterialStack.java index 63a9ccce9c..145b217d6e 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialStack.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialStack.java @@ -3,6 +3,8 @@ package gtPlusPlus.core.material; import java.math.BigDecimal; import java.math.RoundingMode; +import gregtech.api.enums.OrePrefixes; +import gtPlusPlus.xmod.bartworks.BW_Utils; import net.minecraft.item.ItemStack; import gtPlusPlus.api.objects.Logger; @@ -53,6 +55,16 @@ public class MaterialStack { return this.stackMaterial.getDust(amount); } + public ItemStack getUnificatedDustStack(final int amount) { + if (this.stackMaterial.werkstoffID != 0) { + ItemStack stack = BW_Utils.getCorrespondingItemStack(OrePrefixes.dust, this.stackMaterial.werkstoffID, amount); + if (stack != null) { + return stack; + } + } + return getDustStack(amount); + } + public Material getStackMaterial(){ if (this.stackMaterial == null){ Logger.MATERIALS("Tried getStackMaterial, got an invalid material."); |
