From 2f85ea82f372efd8fae5ebff6c9f0bb81f2f63aa Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Fri, 4 Feb 2022 14:50:55 -0800 Subject: 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 --- src/main/java/gregtech/api/interfaces/ITexture.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech/api/interfaces') diff --git a/src/main/java/gregtech/api/interfaces/ITexture.java b/src/main/java/gregtech/api/interfaces/ITexture.java index 4c0b1984ca..b05f31d14f 100644 --- a/src/main/java/gregtech/api/interfaces/ITexture.java +++ b/src/main/java/gregtech/api/interfaces/ITexture.java @@ -18,12 +18,12 @@ public interface ITexture { void renderZNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ); boolean isValidTexture(); - + /** * @return {@code true} if this texture is from the old package */ default boolean isOldTexture() { - return getClass().toString().startsWith("gregtech.api.objects"); + return true; } /** @@ -34,7 +34,7 @@ public interface ITexture { * @param aNormalZ The Z Normal for current Quad Face */ default void startDrawingQuads(RenderBlocks aRenderer, float aNormalX, float aNormalY, float aNormalZ) { - if (aRenderer.useInventoryTint) { + if (aRenderer.useInventoryTint && !isOldTexture()) { Tessellator.instance.startDrawingQuads(); Tessellator.instance.setNormal(aNormalX, aNormalY, aNormalZ); } @@ -45,7 +45,7 @@ public interface ITexture { * @param aRenderer The {@link RenderBlocks} Renderer */ default void draw(RenderBlocks aRenderer) { - if (aRenderer.useInventoryTint) { + if (aRenderer.useInventoryTint && !isOldTexture()) { Tessellator.instance.draw(); } } -- cgit