diff options
author | Jason Mitchell <mitchej@gmail.com> | 2022-02-04 14:50:55 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-04 23:50:55 +0100 |
commit | 2f85ea82f372efd8fae5ebff6c9f0bb81f2f63aa (patch) | |
tree | fbe5420120647fdad382f8b63a1515bff82576e8 /src/main/java/gregtech/api/objects/GT_SidedTexture.java | |
parent | f77315eb88b266bfa4079cad2f60fbc533b83617 (diff) | |
download | GT5-Unofficial-2f85ea82f372efd8fae5ebff6c9f0bb81f2f63aa.tar.gz GT5-Unofficial-2f85ea82f372efd8fae5ebff6c9f0bb81f2f63aa.tar.bz2 GT5-Unofficial-2f85ea82f372efd8fae5ebff6c9f0bb81f2f63aa.zip |
Texture Shenanigans (#915)
* Texture Shenanigans
- Get rid of all the TODOs and run everything through the new Texture API in a backwards compatible way.
* allow bw runclient to run
* Add obf name
Co-authored-by: bombcar <github@bombcar.com>
Diffstat (limited to 'src/main/java/gregtech/api/objects/GT_SidedTexture.java')
-rw-r--r-- | src/main/java/gregtech/api/objects/GT_SidedTexture.java | 67 |
1 files changed, 7 insertions, 60 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_SidedTexture.java b/src/main/java/gregtech/api/objects/GT_SidedTexture.java index c6ed003be9..3c699a3f4b 100644 --- a/src/main/java/gregtech/api/objects/GT_SidedTexture.java +++ b/src/main/java/gregtech/api/objects/GT_SidedTexture.java @@ -4,34 +4,19 @@ import gregtech.api.enums.Dyes; import gregtech.api.interfaces.IColorModulationContainer; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; /** * @deprecated Replaced by the {@link gregtech.api.render.TextureFactory} API. */ @Deprecated -public class GT_SidedTexture implements ITexture, IColorModulationContainer { - private final ITexture[] mTextures; - /** - * 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 class GT_SidedTexture extends gregtech.common.render.GT_SidedTexture implements ITexture, IColorModulationContainer { + @Deprecated public short[] mRGBa; public GT_SidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3, IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa, boolean aAllowAlpha) { - if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture"); - mTextures = new ITexture[]{ - new GT_RenderedTexture(aIcon0, aRGBa, aAllowAlpha), - new GT_RenderedTexture(aIcon1, aRGBa, aAllowAlpha), - new GT_RenderedTexture(aIcon2, aRGBa, aAllowAlpha), - new GT_RenderedTexture(aIcon3, aRGBa, aAllowAlpha), - new GT_RenderedTexture(aIcon4, aRGBa, aAllowAlpha), - new GT_RenderedTexture(aIcon5, aRGBa, aAllowAlpha) - }; - mRGBa = aRGBa; + super(aIcon0, aIcon1, aIcon2, aIcon3, aIcon4, aIcon5, aRGBa, aAllowAlpha); + + // Backwards Compat + GT_SidedTexture.this.mRGBa = aRGBa; } public GT_SidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3, IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa) { @@ -51,45 +36,7 @@ public class GT_SidedTexture implements ITexture, IColorModulationContainer { } @Override - public void renderXPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { - mTextures[5].renderXPos(aRenderer, aBlock, aX ,aY, aZ); - } - - @Override - public void renderXNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { - mTextures[4].renderXNeg(aRenderer, aBlock, aX ,aY, aZ); - } - - @Override - public void renderYPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { - mTextures[1].renderYPos(aRenderer, aBlock, aX ,aY, aZ); - } - - @Override - public void renderYNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { - mTextures[0].renderYNeg(aRenderer, aBlock, aX ,aY, aZ); - } - - @Override - public void renderZPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { - mTextures[3].renderZPos(aRenderer, aBlock, aX ,aY, aZ); - } - - @Override - public void renderZNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { - mTextures[2].renderZNeg(aRenderer, aBlock, aX ,aY, aZ); - } - - @Override - public short[] getRGBA() { - return mRGBa; - } - - @Override - public boolean isValidTexture() { - for (ITexture renderedTexture : mTextures) { - if (!renderedTexture.isValidTexture()) return false; - } + public boolean isOldTexture() { return true; } } |