Merge addon sources

4 files changed, 257 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
new file mode 100644
index 0000000000..6a780d227c
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
@@ -0,0 +1,28 @@
+package gtPlusPlus.xmod.gregtech.api.objects;
+
+import net.minecraft.block.Block;
+
+import gregtech.api.enums.Dyes;
+import gregtech.api.objects.GT_CopiedBlockTexture;
+
+/**
+ * Made this to get rid of deprecation warnings <i>everywhere</i>.
+ * 
+ * @author Alkalus
+ *
+ */
+@SuppressWarnings("deprecation")
+public class GTPP_CopiedBlockTexture extends GT_CopiedBlockTexture {
+
+    public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) {
+        super(aBlock, aMeta, aMeta, aRGBa, aAllowAlpha);
+    }
+
+    public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa) {
+        this(aBlock, aSide, aMeta, aRGBa, true);
+    }
+
+    public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta) {
+        this(aBlock, aSide, aMeta, Dyes._NULL.mRGBa);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
new file mode 100644
index 0000000000..0da0136193
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
@@ -0,0 +1,27 @@
+package gtPlusPlus.xmod.gregtech.api.objects;
+
+import gregtech.api.enums.Dyes;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.objects.GT_RenderedTexture;
+
+/**
+ * Made this to get rid of deprecation warnings <i>everywhere</i>.
+ * 
+ * @author Alkalus
+ *
+ */
+@SuppressWarnings("deprecation")
+public class GTPP_RenderedTexture extends GT_RenderedTexture {
+
+    public GTPP_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
+        super(aIcon, aRGBa, aAllowAlpha);
+    }
+
+    public GTPP_RenderedTexture(IIconContainer aIcon, short[] aRGBa) {
+        this(aIcon, aRGBa, true);
+    }
+
+    public GTPP_RenderedTexture(IIconContainer aIcon) {
+        this(aIcon, Dyes._NULL.mRGBa);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
new file mode 100644
index 0000000000..967d3ae916
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
@@ -0,0 +1,147 @@
+package gtPlusPlus.xmod.gregtech.api.objects;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.objects.GT_ArrayList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+
+public class GregtechItemData {
+
+    private static final GregtechMaterialStack[] EMPTY_GT_MaterialStack_ARRAY = new GregtechMaterialStack[0];
+
+    public final List<Object> mExtraData = new GT_ArrayList<>(false, 1);
+    public final GregtechOrePrefixes mPrefix;
+    public final GregtechMaterialStack mMaterial;
+    public final GregtechMaterialStack[] mByProducts;
+    public boolean mBlackListed = false;
+    public ItemStack mUnificationTarget = null;
+
+    public GregtechItemData(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial,
+        final boolean aBlackListed) {
+        this.mPrefix = aPrefix;
+        this.mMaterial = aMaterial == null ? null : new GregtechMaterialStack(aMaterial, aPrefix.mMaterialAmount);
+        this.mBlackListed = aBlackListed;
+        this.mByProducts = (aPrefix.mSecondaryMaterial == null) || (aPrefix.mSecondaryMaterial.mMaterial == null)
+            ? EMPTY_GT_MaterialStack_ARRAY
+            : new GregtechMaterialStack[] { aPrefix.mSecondaryMaterial.clone() };
+    }
+
+    public GregtechItemData(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial) {
+        this(aPrefix, aMaterial, false);
+    }
+
+    public GregtechItemData(final GregtechMaterialStack aMaterial, final GregtechMaterialStack... aByProducts) {
+        this.mPrefix = null;
+        this.mMaterial = aMaterial.mMaterial == null ? null : aMaterial.clone();
+        this.mBlackListed = true;
+        if (aByProducts == null) {
+            this.mByProducts = EMPTY_GT_MaterialStack_ARRAY;
+        } else {
+            final GregtechMaterialStack[] tByProducts = aByProducts.length < 1 ? EMPTY_GT_MaterialStack_ARRAY
+                : new GregtechMaterialStack[aByProducts.length];
+            int j = 0;
+            for (GregtechMaterialStack aByProduct : aByProducts) {
+                if ((aByProduct != null) && (aByProduct.mMaterial != null)) {
+                    tByProducts[j++] = aByProduct.clone();
+                }
+            }
+            this.mByProducts = j > 0 ? new GregtechMaterialStack[j] : EMPTY_GT_MaterialStack_ARRAY;
+            for (int i = 0; i < this.mByProducts.length; i++) {
+                this.mByProducts[i] = tByProducts[i];
+            }
+        }
+    }
+
+    public GregtechItemData(final GT_Materials aMaterial, final long aAmount,
+        final GregtechMaterialStack... aByProducts) {
+        this(new GregtechMaterialStack(aMaterial, aAmount), aByProducts);
+    }
+
+    public GregtechItemData(final GT_Materials aMaterial, final long aAmount, final GT_Materials aByProduct,
+        final long aByProductAmount) {
+        this(new GregtechMaterialStack(aMaterial, aAmount), new GregtechMaterialStack(aByProduct, aByProductAmount));
+    }
+
+    public GregtechItemData(final GregtechItemData... aData) {
+        this.mPrefix = null;
+        this.mBlackListed = true;
+
+        final ArrayList<GregtechMaterialStack> aList = new ArrayList<>(), rList = new ArrayList<>();
+
+        for (final GregtechItemData tData : aData) {
+            if (tData != null) {
+                if (tData.hasValidMaterialData() && (tData.mMaterial.mAmount > 0)) {
+                    aList.add(tData.mMaterial.clone());
+                }
+                for (final GregtechMaterialStack tMaterial : tData.mByProducts) {
+                    if (tMaterial.mAmount > 0) {
+                        aList.add(tMaterial.clone());
+                    }
+                }
+            }
+        }
+
+        for (final GregtechMaterialStack aMaterial : aList) {
+            boolean temp = true;
+            for (final GregtechMaterialStack tMaterial : rList) {
+                if (aMaterial.mMaterial == tMaterial.mMaterial) {
+                    tMaterial.mAmount += aMaterial.mAmount;
+                    temp = false;
+                    break;
+                }
+            }
+            if (temp) {
+                rList.add(aMaterial.clone());
+            }
+        }
+
+        rList.sort((a, b) -> Long.compare(b.mAmount, a.mAmount));
+
+        if (rList.isEmpty()) {
+            this.mMaterial = null;
+        } else {
+            this.mMaterial = rList.get(0);
+            rList.remove(0);
+        }
+
+        this.mByProducts = rList.toArray(new GregtechMaterialStack[0]);
+    }
+
+    public boolean hasValidPrefixMaterialData() {
+        return (this.mPrefix != null) && (this.mMaterial != null) && (this.mMaterial.mMaterial != null);
+    }
+
+    public boolean hasValidPrefixData() {
+        return this.mPrefix != null;
+    }
+
+    public boolean hasValidMaterialData() {
+        return (this.mMaterial != null) && (this.mMaterial.mMaterial != null);
+    }
+
+    public ArrayList<GregtechMaterialStack> getAllGT_MaterialStacks() {
+        final ArrayList<GregtechMaterialStack> rList = new ArrayList<>();
+        if (this.hasValidMaterialData()) {
+            rList.add(this.mMaterial);
+        }
+        rList.addAll(Arrays.asList(this.mByProducts));
+        return rList;
+    }
+
+    public GregtechMaterialStack getByProduct(final int aIndex) {
+        return (aIndex >= 0) && (aIndex < this.mByProducts.length) ? this.mByProducts[aIndex] : null;
+    }
+
+    @Override
+    public String toString() {
+        if ((this.mPrefix == null) || (this.mMaterial == null) || (this.mMaterial.mMaterial == null)) {
+            return "";
+        }
+        return this.mPrefix.name() + this.mMaterial.mMaterial.name();
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
new file mode 100644
index 0000000000..d1ee02f480
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
@@ -0,0 +1,55 @@
+package gtPlusPlus.xmod.gregtech.api.objects;
+
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+
+public class GregtechMaterialStack implements Cloneable {
+
+    public long mAmount;
+    public GT_Materials mMaterial;
+
+    public GregtechMaterialStack(final GT_Materials aMaterial, final long aAmount) {
+        this.mMaterial = aMaterial == null ? GT_Materials._NULL : aMaterial;
+        this.mAmount = aAmount;
+    }
+
+    public GregtechMaterialStack copy(final long aAmount) {
+        return new GregtechMaterialStack(this.mMaterial, aAmount);
+    }
+
+    @Override
+    public GregtechMaterialStack clone() {
+        return new GregtechMaterialStack(this.mMaterial, this.mAmount);
+    }
+
+    @Override
+    public boolean equals(final Object aObject) {
+        if (aObject == this) {
+            return true;
+        }
+        if (aObject == null) {
+            return false;
+        }
+        if (aObject instanceof GT_Materials) {
+            return aObject == this.mMaterial;
+        }
+        if (aObject instanceof GregtechMaterialStack) {
+            return (((GregtechMaterialStack) aObject).mMaterial == this.mMaterial)
+                && ((this.mAmount < 0) || (((GregtechMaterialStack) aObject).mAmount < 0)
+                    || (((GregtechMaterialStack) aObject).mAmount == this.mAmount));
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return ((this.mMaterial.mMaterialList.size() > 1) && (this.mAmount > 1) ? "(" : "")
+            + this.mMaterial.getToolTip(true)
+            + ((this.mMaterial.mMaterialList.size() > 1) && (this.mAmount > 1) ? ")" : "")
+            + (this.mAmount > 1 ? this.mAmount : "");
+    }
+
+    @Override
+    public int hashCode() {
+        return this.mMaterial.hashCode();
+    }
+}