% Refactored the entire project to stop using MiscUtils everywhere possible, now it's gtPlusPlus.

4 files changed, 361 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java
new file mode 100644
index 0000000000..56a48602c9
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java
@@ -0,0 +1,27 @@
+package gtPlusPlus.xmod.gregtech.api.objects;
+
+import gregtech.api.GregTech_API;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraftforge.fluids.Fluid;
+
+public class GregtechFluid extends Fluid implements Runnable {
+    public final String mTextureName;
+    private final short[] mRGBa;
+
+    public GregtechFluid(String aName, String aTextureName, short[] aRGBa) {
+        super(aName);
+        mRGBa = aRGBa;
+        mTextureName = aTextureName;
+        GregTech_API.sGTBlockIconload.add(this);
+    }
+
+    @Override
+    public int getColor() {
+        return (Math.max(0, Math.min(255, mRGBa[0])) << 16) | (Math.max(0, Math.min(255, mRGBa[1])) << 8) | Math.max(0, Math.min(255, mRGBa[2]));
+    }
+
+    @Override
+    public void run() {
+        setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID+ ":" + "fluids/fluid." + mTextureName));
+    }
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
new file mode 100644
index 0000000000..2994bb1b71
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
@@ -0,0 +1,130 @@
+package gtPlusPlus.xmod.gregtech.api.objects;
+
+import gregtech.api.objects.GT_ArrayList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+
+public class GregtechItemData {
+    private static final GregtechMaterialStack[] EMPTY_GT_MaterialStack_ARRAY = new GregtechMaterialStack[0];
+
+    public final List<Object> mExtraData = new GT_ArrayList<Object>(false, 1);
+    public final GregtechOrePrefixes mPrefix;
+    public final GregtechMaterialStack mMaterial;
+    public final GregtechMaterialStack[] mByProducts;
+    public boolean mBlackListed = false;
+    public ItemStack mUnificationTarget = null;
+
+    public GregtechItemData(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, boolean aBlackListed) {
+        mPrefix = aPrefix;
+        mMaterial = aMaterial == null ? null : new GregtechMaterialStack(aMaterial, aPrefix.mMaterialAmount);
+        mBlackListed = aBlackListed;
+        mByProducts = aPrefix.mSecondaryMaterial == null || aPrefix.mSecondaryMaterial.mMaterial == null ? EMPTY_GT_MaterialStack_ARRAY : new GregtechMaterialStack[]{aPrefix.mSecondaryMaterial.clone()};
+    }
+
+    public GregtechItemData(GregtechOrePrefixes aPrefix, GT_Materials aMaterial) {
+        this(aPrefix, aMaterial, false);
+    }
+
+    public GregtechItemData(GregtechMaterialStack aMaterial, GregtechMaterialStack... aByProducts) {
+        mPrefix = null;
+        mMaterial = aMaterial.mMaterial == null ? null : aMaterial.clone();
+        mBlackListed = true;
+        if (aByProducts == null) {
+            mByProducts = EMPTY_GT_MaterialStack_ARRAY;
+        } else {
+            GregtechMaterialStack[] tByProducts = aByProducts.length < 1 ? EMPTY_GT_MaterialStack_ARRAY : new GregtechMaterialStack[aByProducts.length];
+            int j = 0;
+            for (int i = 0; i < aByProducts.length; i++)
+                if (aByProducts[i] != null && aByProducts[i].mMaterial != null)
+                    tByProducts[j++] = aByProducts[i].clone();
+            mByProducts = j > 0 ? new GregtechMaterialStack[j] : EMPTY_GT_MaterialStack_ARRAY;
+            for (int i = 0; i < mByProducts.length; i++) mByProducts[i] = tByProducts[i];
+        }
+    }
+
+    public GregtechItemData(GT_Materials aMaterial, long aAmount, GregtechMaterialStack... aByProducts) {
+        this(new GregtechMaterialStack(aMaterial, aAmount), aByProducts);
+    }
+
+    public GregtechItemData(GT_Materials aMaterial, long aAmount, GT_Materials aByProduct, long aByProductAmount) {
+        this(new GregtechMaterialStack(aMaterial, aAmount), new GregtechMaterialStack(aByProduct, aByProductAmount));
+    }
+
+    public GregtechItemData(GregtechItemData... aData) {
+        mPrefix = null;
+        mBlackListed = true;
+
+        ArrayList<GregtechMaterialStack> aList = new ArrayList<GregtechMaterialStack>(), rList = new ArrayList<GregtechMaterialStack>();
+
+        for (GregtechItemData tData : aData)
+            if (tData != null) {
+                if (tData.hasValidMaterialData() && tData.mMaterial.mAmount > 0) aList.add(tData.mMaterial.clone());
+                for (GregtechMaterialStack tMaterial : tData.mByProducts)
+                    if (tMaterial.mAmount > 0) aList.add(tMaterial.clone());
+            }
+
+        for (GregtechMaterialStack aMaterial : aList) {
+            boolean temp = true;
+            for (GregtechMaterialStack tMaterial : rList)
+                if (aMaterial.mMaterial == tMaterial.mMaterial) {
+                    tMaterial.mAmount += aMaterial.mAmount;
+                    temp = false;
+                    break;
+                }
+            if (temp) rList.add(aMaterial.clone());
+        }
+
+        Collections.sort(rList, new Comparator<GregtechMaterialStack>() {
+            @Override
+            public int compare(GregtechMaterialStack a, GregtechMaterialStack b) {
+                return a.mAmount == b.mAmount ? 0 : a.mAmount > b.mAmount ? -1 : +1;
+            }
+        });
+
+        if (rList.isEmpty()) {
+            mMaterial = null;
+        } else {
+            mMaterial = rList.get(0);
+            rList.remove(0);
+        }
+
+        mByProducts = rList.toArray(new GregtechMaterialStack[rList.size()]);
+    }
+
+    public boolean hasValidPrefixMaterialData() {
+        return mPrefix != null && mMaterial != null && mMaterial.mMaterial != null;
+    }
+
+    public boolean hasValidPrefixData() {
+        return mPrefix != null;
+    }
+
+    public boolean hasValidMaterialData() {
+        return mMaterial != null && mMaterial.mMaterial != null;
+    }
+
+    public ArrayList<GregtechMaterialStack> getAllGT_MaterialStacks() {
+        ArrayList<GregtechMaterialStack> rList = new ArrayList();
+        if (hasValidMaterialData()) rList.add(mMaterial);
+        rList.addAll(Arrays.asList(mByProducts));
+        return rList;
+    }
+
+    public GregtechMaterialStack getByProduct(int aIndex) {
+        return aIndex >= 0 && aIndex < mByProducts.length ? mByProducts[aIndex] : null;
+    }
+
+    @Override
+    public String toString() {
+        if (mPrefix == null || mMaterial == null || mMaterial.mMaterial == null) return "";
+        return mPrefix.name() + mMaterial.mMaterial.name();
+    }
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
new file mode 100644
index 0000000000..245db1745f
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
@@ -0,0 +1,42 @@
+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(GT_Materials aMaterial, long aAmount) {
+        mMaterial = aMaterial == null ? GT_Materials._NULL : aMaterial;
+        mAmount = aAmount;
+    }
+
+    public GregtechMaterialStack copy(long aAmount) {
+        return new GregtechMaterialStack(mMaterial, aAmount);
+    }
+
+    @Override
+    public GregtechMaterialStack clone() {
+        return new GregtechMaterialStack(mMaterial, mAmount);
+    }
+
+    @Override
+    public boolean equals(Object aObject) {
+        if (aObject == this) return true;
+        if (aObject == null) return false;
+        if (aObject instanceof GT_Materials) return aObject == mMaterial;
+        if (aObject instanceof GregtechMaterialStack)
+            return ((GregtechMaterialStack) aObject).mMaterial == mMaterial && (mAmount < 0 || ((GregtechMaterialStack) aObject).mAmount < 0 || ((GregtechMaterialStack) aObject).mAmount == mAmount);
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return (mMaterial.mMaterialList.size() > 1 && mAmount > 1 ? "(" : "") + mMaterial.getToolTip(true) + (mMaterial.mMaterialList.size() > 1 && mAmount > 1 ? ")" : "") + (mAmount > 1 ? mAmount : "");
+    }
+
+    @Override
+    public int hashCode() {
+        return mMaterial.hashCode();
+    }
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechRenderedTexture.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechRenderedTexture.java
new file mode 100644
index 0000000000..03c59c7ac6
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechRenderedTexture.java
@@ -0,0 +1,162 @@
+package gtPlusPlus.xmod.gregtech.api.objects;
+
+import gregtech.api.enums.Dyes;
+import gregtech.api.interfaces.IColorModulationContainer;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.interfaces.ITexture;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.IIcon;
+
+public class GregtechRenderedTexture implements ITexture, IColorModulationContainer {
+    private final IIconContainer mIconContainer;
+    private final boolean mAllowAlpha;
+    /**
+     * DO NOT MANIPULATE THE VALUES INSIDE THIS ARRAY!!!
+     * <p/>
+     * Just set this variable to another different Array instead.
+     * Otherwise some colored things will get Problems.
+     */
+    public short[] mRGBa;
+
+    public GregtechRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
+        if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture");
+        mIconContainer = aIcon;
+        mAllowAlpha = aAllowAlpha;
+        mRGBa = aRGBa;
+    }
+
+    public GregtechRenderedTexture(IIconContainer aIcon, short[] aRGBa) {
+        this(aIcon, aRGBa, true);
+    }
+
+    public GregtechRenderedTexture(IIconContainer aIcon) {
+        this(aIcon, Dyes._NULL.mRGBa);
+    }
+
+    @Override
+    public void renderXPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) {
+        Tessellator.instance.setColorRGBA((int) (mRGBa[0] * 0.6F), (int) (mRGBa[1] * 0.6F), (int) (mRGBa[2] * 0.6F), mAllowAlpha ? 255 - mRGBa[3] : 255);
+        aRenderer.renderFaceXPos(aBlock, aX, aY, aZ, mIconContainer.getIcon());
+        if (mIconContainer.getOverlayIcon() != null) {
+            Tessellator.instance.setColorRGBA(153, 153, 153, 255);
+            aRenderer.renderFaceXPos(aBlock, aX, aY, aZ, mIconContainer.getOverlayIcon());
+        }
+    }
+
+    @Override
+    public void renderXNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) {
+        Tessellator.instance.setColorRGBA((int) (mRGBa[0] * 0.6F), (int) (mRGBa[1] * 0.6F), (int) (mRGBa[2] * 0.6F), mAllowAlpha ? 255 - mRGBa[3] : 255);
+        aRenderer.renderFaceXNeg(aBlock, aX, aY, aZ, mIconContainer.getIcon());
+        if (mIconContainer.getOverlayIcon() != null) {
+            Tessellator.instance.setColorRGBA(153, 153, 153, 255);
+            aRenderer.renderFaceXNeg(aBlock, aX, aY, aZ, mIconContainer.getOverlayIcon());
+        }
+    }
+
+    @Override
+    public void renderYPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) {
+        Tessellator.instance.setColorRGBA((int) (mRGBa[0] * 1.0F), (int) (mRGBa[1] * 1.0F), (int) (mRGBa[2] * 1.0F), mAllowAlpha ? 255 - mRGBa[3] : 255);
+        aRenderer.renderFaceYPos(aBlock, aX, aY, aZ, mIconContainer.getIcon());
+        if (mIconContainer.getOverlayIcon() != null) {
+            Tessellator.instance.setColorRGBA(255, 255, 255, 255);
+            aRenderer.renderFaceYPos(aBlock, aX, aY, aZ, mIconContainer.getOverlayIcon());
+        }
+    }
+
+    @Override
+    public void renderYNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) {
+        Tessellator.instance.setColorRGBA((int) (mRGBa[0] * 0.5F), (int) (mRGBa[1] * 0.5F), (int) (mRGBa[2] * 0.5F), mAllowAlpha ? 255 - mRGBa[3] : 255);
+        IIcon aIcon = mIconContainer.getIcon();
+
+        double d3 = aIcon.getInterpolatedU(aRenderer.renderMaxX * 16.0D);
+        double d4 = aIcon.getInterpolatedU(aRenderer.renderMinX * 16.0D);
+        double d5 = aIcon.getInterpolatedV(aRenderer.renderMinZ * 16.0D);
+        double d6 = aIcon.getInterpolatedV(aRenderer.renderMaxZ * 16.0D);
+
+        if (aRenderer.renderMinX < 0.0D || aRenderer.renderMaxX > 1.0D) {
+            d3 = aIcon.getMaxU();
+            d4 = aIcon.getMinU();
+        }
+
+        if (aRenderer.renderMinZ < 0.0D || aRenderer.renderMaxZ > 1.0D) {
+            d5 = aIcon.getMinV();
+            d6 = aIcon.getMaxV();
+        }
+
+        double d11 = aX + aRenderer.renderMinX;
+        double d12 = aX + aRenderer.renderMaxX;
+        double d13 = aY + aRenderer.renderMinY;
+        double d14 = aZ + aRenderer.renderMinZ;
+        double d15 = aZ + aRenderer.renderMaxZ;
+
+        Tessellator.instance.addVertexWithUV(d11, d13, d15, d3, d6);
+        Tessellator.instance.addVertexWithUV(d11, d13, d14, d3, d5);
+        Tessellator.instance.addVertexWithUV(d12, d13, d14, d4, d5);
+        Tessellator.instance.addVertexWithUV(d12, d13, d15, d4, d6);
+
+        if ((aIcon = mIconContainer.getOverlayIcon()) != null) {
+            Tessellator.instance.setColorRGBA(128, 128, 128, 255);
+
+            Tessellator.instance.addVertexWithUV(d11, d13, d15, d3, d6);
+            Tessellator.instance.addVertexWithUV(d11, d13, d14, d3, d5);
+            Tessellator.instance.addVertexWithUV(d12, d13, d14, d4, d5);
+            Tessellator.instance.addVertexWithUV(d12, d13, d15, d4, d6);
+        }
+    }
+
+    @Override
+    public void renderZPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) {
+    	try {
+        Tessellator.instance.setColorRGBA((int) (mRGBa[0] * 0.8F), (int) (mRGBa[1] * 0.8F), (int) (mRGBa[2] * 0.8F), mAllowAlpha ? 255 - mRGBa[3] : 255);
+        aRenderer.renderFaceZPos(aBlock, aX, aY, aZ, mIconContainer.getIcon());
+        if (mIconContainer.getOverlayIcon() != null) {
+            Tessellator.instance.setColorRGBA(204, 204, 204, 255);
+            aRenderer.renderFaceZPos(aBlock, aX, aY, aZ, mIconContainer.getOverlayIcon());
+        }
+    	} catch (NullPointerException e){
+    		Utils.LOG_WARNING("renderZPos failed.");
+    	}
+    }
+
+    @Override
+    public void renderZNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) {
+    	try {
+    	Utils.LOG_WARNING("renderZNeg Method();.");
+    	Utils.LOG_WARNING("Setting RGBA of instance.");
+        Tessellator.instance.setColorRGBA((int) (mRGBa[0] * 0.8F), (int) (mRGBa[1] * 0.8F), (int) (mRGBa[2] * 0.8F), mAllowAlpha ? 255 - mRGBa[3] : 255);
+        aRenderer.renderFaceZNeg(aBlock, aX, aY, aZ, mIconContainer.getIcon());
+        Utils.LOG_WARNING("Is mIconContainer null? "+mIconContainer.toString());
+        Utils.LOG_WARNING("mIconContainer.getIcon.getIconName(): "+mIconContainer.getIcon().getIconName());
+        Utils.LOG_WARNING("mIconContainer.getTextureFile().getResourceDomain()"+mIconContainer.getTextureFile().getResourceDomain());
+        Utils.LOG_WARNING("mIconContainer.getTextureFile().getResourcePath()"+mIconContainer.getTextureFile().getResourcePath());
+        if (mIconContainer.getOverlayIcon() != null) {
+            Tessellator.instance.setColorRGBA(204, 204, 204, 255);
+            aRenderer.renderFaceZNeg(aBlock, aX, aY, aZ, mIconContainer.getOverlayIcon());
+            Utils.LOG_WARNING("Is miconContainer.getOverlayIcon null? "+mIconContainer.getOverlayIcon().toString());
+            Utils.LOG_WARNING("mIconContainer.getIcon.getIconName(): "+mIconContainer.getOverlayIcon().getIconName());
+            Utils.LOG_WARNING("mIconContainer.getTextureFile().getResourceDomain()"+mIconContainer.getTextureFile().getResourceDomain());
+            Utils.LOG_WARNING("mIconContainer.getTextureFile().getResourcePath()"+mIconContainer.getTextureFile().getResourcePath());
+        }
+    	} catch (NullPointerException e){
+    		
+    		
+    		e.printStackTrace();
+    		Utils.LOG_WARNING("renderZNeg failed."+e.getMessage()+"|"+e.getClass()+"|"+e.getLocalizedMessage());
+    		Minecraft.getMinecraft().shutdown();
+    	}
+    }
+
+    @Override
+    public short[] getRGBA() {
+        return mRGBa;
+    }
+
+    @Override
+    public boolean isValidTexture() {
+        return mIconContainer != null;
+    }
+}
\ No newline at end of file