From 307c563b6d88d93359865b683a5494e2799a1979 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 14 Jun 2026 14:20:19 -0700 Subject: [PATCH 01/11] Rework DH matrix handling (#1861) --- .../angelica/glsm/CompatUniformManager.java | 25 ++++++++-- .../angelica/glsm/GLStateManager.java | 16 +++++++ .../compat/dh/IrisGenericRenderProgram.java | 35 +------------- .../iris/compat/dh/IrisLodRenderProgram.java | 48 +------------------ .../iris/compat/dh/LodRendererEvents.java | 24 ++++++++++ 5 files changed, 64 insertions(+), 84 deletions(-) diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/CompatUniformManager.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/CompatUniformManager.java index fcd301ff2..99fad7693 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/CompatUniformManager.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/CompatUniformManager.java @@ -59,7 +59,10 @@ public class CompatUniformManager { static final int MAT_FIELDS = 5; static final int LOC_MAT_BASE = LOC_LIGHT_BASE + 2 * LIGHT_FIELDS; // 43 - static final int LOC_COUNT = LOC_MAT_BASE + MAT_FIELDS; // 48 + static final int LOC_IRIS_MODELVIEW_INVERSE = LOC_MAT_BASE + MAT_FIELDS; // 48 + static final int LOC_IRIS_PROJECTION_INVERSE = LOC_IRIS_MODELVIEW_INVERSE + 1; // 49 + + static final int LOC_COUNT = LOC_IRIS_PROJECTION_INVERSE + 1; // 50 private static final String[] LIGHT_FIELD_NAMES = { "ambient", "diffuse", "specular", "position", "halfVector", @@ -89,6 +92,8 @@ public class CompatUniformManager { UNIFORM_NAMES[LOC_IRIS_NORMAL] = "iris_NormalMatrix"; UNIFORM_NAMES[LOC_IRIS_LIGHTMAP_TEXTURE_MATRIX] = "iris_LightmapTextureMatrix"; UNIFORM_NAMES[LOC_IRIS_TEXTURE_MATRIX] = "iris_TextureMatrix"; + UNIFORM_NAMES[LOC_IRIS_MODELVIEW_INVERSE] = "iris_ModelViewMatrixInverse"; + UNIFORM_NAMES[LOC_IRIS_PROJECTION_INVERSE] = "iris_ProjectionMatrixInverse"; UNIFORM_NAMES[LOC_ALPHA_TEST_REF] = "angelica_currentAlphaTest"; UNIFORM_NAMES[LOC_SCENE_COLOR] = "angelica_SceneColor"; UNIFORM_NAMES[LOC_CLIP_PLANES] = "angelica_ClipPlane[0]"; @@ -229,10 +234,15 @@ public class CompatUniformManager { } // ModelView Inverse - if (locs[LOC_MODELVIEW_INVERSE] != -1) { + if (locs[LOC_MODELVIEW_INVERSE] != -1 || locs[LOC_IRIS_MODELVIEW_INVERSE] != -1) { mv.invert(scratchMatrix); scratchMatrix.get(mat4Buf); - RENDER_BACKEND.uniformMatrix4(locs[LOC_MODELVIEW_INVERSE], false, mat4Buf); + if (locs[LOC_MODELVIEW_INVERSE] != -1) { + RENDER_BACKEND.uniformMatrix4(locs[LOC_MODELVIEW_INVERSE], false, mat4Buf); + } + if (locs[LOC_IRIS_MODELVIEW_INVERSE] != -1) { + RENDER_BACKEND.uniformMatrix4(locs[LOC_IRIS_MODELVIEW_INVERSE], false, mat4Buf); + } } } @@ -266,10 +276,15 @@ public class CompatUniformManager { } // Projection Inverse - if (locs[LOC_PROJECTION_INVERSE] != -1) { + if (locs[LOC_PROJECTION_INVERSE] != -1 || locs[LOC_IRIS_PROJECTION_INVERSE] != -1) { proj.invert(scratchMatrix); scratchMatrix.get(mat4Buf); - RENDER_BACKEND.uniformMatrix4(locs[LOC_PROJECTION_INVERSE], false, mat4Buf); + if (locs[LOC_PROJECTION_INVERSE] != -1) { + RENDER_BACKEND.uniformMatrix4(locs[LOC_PROJECTION_INVERSE], false, mat4Buf); + } + if (locs[LOC_IRIS_PROJECTION_INVERSE] != -1) { + RENDER_BACKEND.uniformMatrix4(locs[LOC_IRIS_PROJECTION_INVERSE], false, mat4Buf); + } } } diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index e9bcd4828..94ad22368 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -56,6 +56,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.joml.Matrix4d; import org.joml.Matrix4f; +import org.joml.Matrix4fc; import org.joml.Matrix4fStack; import org.joml.Vector3d; import org.joml.Vector3f; @@ -3437,6 +3438,21 @@ public class GLStateManager { } } + public static void setModelViewMatrix(Matrix4fc m) { + if (isCachingEnabled()) { + modelViewMatrix.set(m); + mvGeneration++; + mvLinearGeneration++; + } + } + + public static void setProjectionMatrix(Matrix4fc m) { + if (isCachingEnabled()) { + projectionMatrix.set(m); + projGeneration++; + } + } + public static Matrix4fStack getMatrixStack() { switch (matrixMode.getMode()) { case GL11.GL_MODELVIEW -> { diff --git a/src/main/java/net/coderbot/iris/compat/dh/IrisGenericRenderProgram.java b/src/main/java/net/coderbot/iris/compat/dh/IrisGenericRenderProgram.java index 030574650..eadb43666 100644 --- a/src/main/java/net/coderbot/iris/compat/dh/IrisGenericRenderProgram.java +++ b/src/main/java/net/coderbot/iris/compat/dh/IrisGenericRenderProgram.java @@ -31,7 +31,6 @@ import net.coderbot.iris.uniforms.custom.CustomUniforms; import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.DynamicTexture; -import org.joml.Matrix3f; import org.joml.Matrix4f; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; @@ -46,12 +45,6 @@ import java.util.Map; public class IrisGenericRenderProgram implements IDhApiGenericObjectShaderProgram { // Uniforms - public final int modelViewUniform; - public final int modelViewInverseUniform; - public final int projectionUniform; - public final int projectionInverseUniform; - public final int normalMatrix3fUniform; - // Fog/Clip Uniforms private final int id; private final ProgramUniforms uniforms; private final CustomUniforms customUniforms; @@ -62,7 +55,6 @@ public class IrisGenericRenderProgram implements IDhApiGenericObjectShaderProgra private final Matrix4f tempModel = new Matrix4f(); private final Matrix4f tempProj = new Matrix4f(); private final Matrix4f tempMat4 = new Matrix4f(); - private final Matrix3f tempMat3 = new Matrix3f(); private final int instancedShaderOffsetChunkUniform; private final int instancedShaderOffsetSubChunkUniform; @@ -143,12 +135,6 @@ public class IrisGenericRenderProgram implements IDhApiGenericObjectShaderProgra GLStateManager.glVertexAttribPointer(0, 3, GL11.GL_FLOAT, false, 0, 0); GLStateManager.glEnableVertexAttribArray(0); - projectionUniform = tryGetUniformLocation2("iris_ProjectionMatrix"); - projectionInverseUniform = tryGetUniformLocation2("iris_ProjectionMatrixInverse"); - modelViewUniform = tryGetUniformLocation2("iris_ModelViewMatrix"); - modelViewInverseUniform = tryGetUniformLocation2("iris_ModelViewMatrixInverse"); - normalMatrix3fUniform = tryGetUniformLocation2("iris_NormalMatrix"); - this.instancedShaderOffsetChunkUniform = this.tryGetUniformLocation2("uOffsetChunk"); this.instancedShaderOffsetSubChunkUniform = this.tryGetUniformLocation2("uOffsetSubChunk"); this.instancedShaderCameraChunkPosUniform = this.tryGetUniformLocation2("uCameraPosChunk"); @@ -213,18 +199,6 @@ public class IrisGenericRenderProgram implements IDhApiGenericObjectShaderProgra } } - public void setUniform(int index, Matrix3f matrix) { - if (index == -1) return; - - try (MemoryStack stack = MemoryStack.stackPush()) { - FloatBuffer buffer = stack.callocFloat(9); - matrix.get(buffer); - buffer.rewind(); - - GLStateManager.glUniformMatrix3(index, false, buffer); - } - } - // Override ShaderProgram.bind() public void bind(DhApiRenderParam renderParam) { GLStateManager.glBindVertexArray(va); @@ -238,14 +212,8 @@ public class IrisGenericRenderProgram implements IDhApiGenericObjectShaderProgra toJOML(tempModel, renderParam.dhModelViewMatrix); toJOML(tempProj, renderParam.dhProjectionMatrix); - setUniform(modelViewUniform, tempModel); - setUniform(projectionUniform, tempProj); this.setUniform(this.instancedShaderProjectionModelViewMatrixUniform, tempMat4.set(tempProj).mul(tempModel)); - tempModel.invert(); - tempProj.invert(); - setUniform(modelViewInverseUniform, tempModel); - setUniform(projectionInverseUniform, tempProj); - setUniform(normalMatrix3fUniform, tempModel.transpose3x3(tempMat3)); + LodRendererEvents.pushDhMatrices(tempProj, tempModel); GLStateManager.glActiveTexture(GL13.GL_TEXTURE0 + IrisSamplers.LIGHTMAP_TEXTURE_UNIT); DynamicTexture lightmapTexture = ((EntityRendererAccessor) Minecraft.getMinecraft().entityRenderer).getLightmapTexture(); GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, lightmapTexture.getGlTextureId()); @@ -259,6 +227,7 @@ public class IrisGenericRenderProgram implements IDhApiGenericObjectShaderProgra } public void unbind() { + LodRendererEvents.popDhMatrices(); GLStateManager.glBindVertexArray(0); GLStateManager.glUseProgram(0); ProgramUniforms.clearActiveUniforms(); diff --git a/src/main/java/net/coderbot/iris/compat/dh/IrisLodRenderProgram.java b/src/main/java/net/coderbot/iris/compat/dh/IrisLodRenderProgram.java index 81c12fcec..07fc2bdad 100644 --- a/src/main/java/net/coderbot/iris/compat/dh/IrisLodRenderProgram.java +++ b/src/main/java/net/coderbot/iris/compat/dh/IrisLodRenderProgram.java @@ -3,7 +3,6 @@ package net.coderbot.iris.compat.dh; import com.google.common.primitives.Ints; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.mixins.interfaces.EntityRendererAccessor; -import com.mitchej123.lwjgl.MemoryStack; import com.seibel.distanthorizons.api.DhApi; import com.seibel.distanthorizons.api.objects.math.DhApiVec3f; import net.coderbot.iris.gl.blending.BlendModeOverride; @@ -26,15 +25,12 @@ import net.coderbot.iris.uniforms.builtin.BuiltinReplacementUniforms; import net.coderbot.iris.uniforms.custom.CustomUniforms; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.DynamicTexture; -import org.joml.Matrix3f; -import org.joml.Matrix4f; import org.joml.Matrix4fc; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL32; -import java.nio.FloatBuffer; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -44,11 +40,6 @@ public class IrisLodRenderProgram { public final int modelOffsetUniform; public final int worldYOffsetUniform; public final int mircoOffsetUniform; - public final int modelViewUniform; - public final int modelViewInverseUniform; - public final int projectionUniform; - public final int projectionInverseUniform; - public final int normalMatrix3fUniform; // Fog/Clip Uniforms public final int clipDistanceUniform; private final int id; @@ -58,9 +49,6 @@ public class IrisLodRenderProgram { private final ProgramImages images; private final BlendModeOverride blend; private final BufferBlendOverride[] bufferBlendOverrides; - private final Matrix4f tempMat4a = new Matrix4f(); - private final Matrix4f tempMat4b = new Matrix4f(); - private final Matrix3f tempMat3 = new Matrix3f(); // This will bind AbstractVertexAttribute private IrisLodRenderProgram(String name, boolean isShadowPass, boolean translucent, BlendModeOverride override, BufferBlendOverride[] bufferBlendOverrides, String vertex, String tessControl, String tessEval, String geometry, String fragment, CustomUniforms customUniforms, DeferredWorldRenderingPipeline pipeline) { @@ -132,11 +120,6 @@ public class IrisLodRenderProgram { modelOffsetUniform = tryGetUniformLocation2("modelOffset"); worldYOffsetUniform = tryGetUniformLocation2("worldYOffset"); mircoOffsetUniform = tryGetUniformLocation2("mircoOffset"); - projectionUniform = tryGetUniformLocation2("iris_ProjectionMatrix"); - projectionInverseUniform = tryGetUniformLocation2("iris_ProjectionMatrixInverse"); - modelViewUniform = tryGetUniformLocation2("iris_ModelViewMatrix"); - modelViewInverseUniform = tryGetUniformLocation2("iris_ModelViewMatrixInverse"); - normalMatrix3fUniform = tryGetUniformLocation2("iris_NormalMatrix"); // Fog/Clip Uniforms clipDistanceUniform = tryGetUniformLocation2("clipDistance"); @@ -176,30 +159,6 @@ public class IrisLodRenderProgram { return GLStateManager.glGetUniformLocation(this.id, name); } - public void setUniform(int index, Matrix4fc matrix) { - if (index == -1 || matrix == null) return; - - try (MemoryStack stack = MemoryStack.stackPush()) { - FloatBuffer buffer = stack.callocFloat(16); - matrix.get(buffer); - buffer.rewind(); - - GLStateManager.glUniformMatrix4(index, false, buffer); - } - } - - public void setUniform(int index, Matrix3f matrix) { - if (index == -1) return; - - try (MemoryStack stack = MemoryStack.stackPush()) { - FloatBuffer buffer = stack.callocFloat(9); - matrix.get(buffer); - buffer.rewind(); - - GLStateManager.glUniformMatrix3(index, false, buffer); - } - } - // Override ShaderProgram.bind() public void bind() { GLStateManager.glUseProgram(id); @@ -227,11 +186,8 @@ public class IrisLodRenderProgram { GLStateManager.glActiveTexture(GL13.GL_TEXTURE0 + IrisSamplers.LIGHTMAP_TEXTURE_UNIT); DynamicTexture lightmapTexture = ((EntityRendererAccessor) Minecraft.getMinecraft().entityRenderer).getLightmapTexture(); GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, lightmapTexture.getGlTextureId()); - setUniform(modelViewUniform, modelView); - setUniform(modelViewInverseUniform, modelView.invert(tempMat4a)); - setUniform(projectionUniform, projection); - setUniform(projectionInverseUniform, projection.invert(tempMat4b)); - setUniform(normalMatrix3fUniform, tempMat4a.set(modelView).invert().transpose3x3(tempMat3)); + + LodRendererEvents.pushDhMatrices(projection, modelView); setUniform(mircoOffsetUniform, 0.01f); // 0.01 block offset diff --git a/src/main/java/net/coderbot/iris/compat/dh/LodRendererEvents.java b/src/main/java/net/coderbot/iris/compat/dh/LodRendererEvents.java index 76651e487..7e09e295b 100644 --- a/src/main/java/net/coderbot/iris/compat/dh/LodRendererEvents.java +++ b/src/main/java/net/coderbot/iris/compat/dh/LodRendererEvents.java @@ -33,6 +33,7 @@ import net.coderbot.iris.shadows.ShadowRenderingState; import net.coderbot.iris.uniforms.CapturedRenderingState; import net.irisshaders.iris.api.v0.IrisApi; import org.joml.Matrix4f; +import org.joml.Matrix4fc; import org.lwjgl.opengl.GL11; public class LodRendererEvents { @@ -46,6 +47,28 @@ public class LodRendererEvents { private static int textureHeight; private static final Matrix4f tempMat4 = new Matrix4f(); + private static boolean dhMatricesActive = false; + private static final Matrix4f savedModelView = new Matrix4f(); + private static final Matrix4f savedProjection = new Matrix4f(); + + static void pushDhMatrices(Matrix4fc projection, Matrix4fc modelView) { + if (!dhMatricesActive) { + savedModelView.set(GLStateManager.getModelViewMatrix()); + savedProjection.set(GLStateManager.getProjectionMatrix()); + dhMatricesActive = true; + } + GLStateManager.setModelViewMatrix(modelView); + GLStateManager.setProjectionMatrix(projection); + } + + static void popDhMatrices() { + if (dhMatricesActive) { + GLStateManager.setModelViewMatrix(savedModelView); + GLStateManager.setProjectionMatrix(savedProjection); + dhMatricesActive = false; + } + } + // constructor // @@ -181,6 +204,7 @@ public class LodRendererEvents { DhApiBeforeRenderCleanupEvent beforeCleanupEvent = new DhApiBeforeRenderCleanupEvent() { @Override public void beforeCleanup(DhApiEventParam event) { + popDhMatrices(); if (getInstance().shouldOverride) { if (ShadowRenderingState.areShadowsCurrentlyBeingRendered()) { getInstance().getShadowShader().unbind(); From f3ed9aa82b7bb26bce7a49b88eda0e74b7daf52e Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 14 Jun 2026 14:59:01 -0700 Subject: [PATCH 02/11] Force invalidate dh depth tex when reconnecting DH Textures (#1862) --- src/main/java/net/coderbot/iris/compat/dh/DHCompatInternal.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/coderbot/iris/compat/dh/DHCompatInternal.java b/src/main/java/net/coderbot/iris/compat/dh/DHCompatInternal.java index 116ba4c09..4b14c70f3 100644 --- a/src/main/java/net/coderbot/iris/compat/dh/DHCompatInternal.java +++ b/src/main/java/net/coderbot/iris/compat/dh/DHCompatInternal.java @@ -161,6 +161,7 @@ public class DHCompatInternal { if (((IRenderTargetExt) Minecraft.getMinecraft().getFramebuffer()).iris$getDepthBufferVersion() != cachedVersion) { cachedVersion = ((IRenderTargetExt) Minecraft.getMinecraft().getFramebuffer()).iris$getDepthBufferVersion(); createDepthTex(Minecraft.getMinecraft().getFramebuffer().framebufferWidth, Minecraft.getMinecraft().getFramebuffer().framebufferHeight); + storedDepthTex = -1; } if (storedDepthTex != depthTex && dhTerrainFramebuffer != null) { storedDepthTex = depthTex; From 80413fb3de02b33ce7d129813e2c57d618b6202c Mon Sep 17 00:00:00 2001 From: MalTeeez <41554385+MalTeeez@users.noreply.github.com> Date: Mon, 15 Jun 2026 01:40:03 +0200 Subject: [PATCH 03/11] Add policy for AI contributions & a PR template (#1864) --- .github/PULL_REQUEST_TEMPLATE.md | 14 ++++++++ AI_POLICY.md | 55 ++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 AI_POLICY.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..fa199c1e4 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,14 @@ +# Description or your *PR* and other info + + + + + + +
Template + +### Before submitting a *pull request* make sure you have: +- [ ] Read the [AI Contribution Policy](https://github.com/GTNewHorizons/Angelica/blob/master/AI_POLICY.md) +- [ ] At least [skimmed](https://github.com/GTNewHorizons/Angelica/search?q=is%3Apr&type=Issues) the tracker for similar pull requests + +
diff --git a/AI_POLICY.md b/AI_POLICY.md new file mode 100644 index 000000000..87a92bd2d --- /dev/null +++ b/AI_POLICY.md @@ -0,0 +1,55 @@ +# AI Usage Policy + +This project has strict rules for AI usage: + +* **The human-in-the-loop must fully understand all code.** If you +can't explain what your changes do and how they interact with the +greater system without the aid of AI tools, do not contribute +those changes. + +* **Issues and discussions can use AI assistance but must have a full +human-in-the-loop.** This means that any content generated with AI +must have been reviewed *and edited* by a human before submission. +The author must do their research and trim this down. + +* **No AI-generated media is allowed (textures, videos, audio, etc.).** +Text and code are the only acceptable AI-generated content, per the +other rules in this policy. + +* **Commit messages, PR descriptions must read in your own voice.** +No AI-authored or AI co-authored commits, including Co-authored-by AI tags. + +* **Only contribute fixes for bugs you have personally hit in-game.** +If you haven’t experienced or reproduced a bug firsthand, and don’t +already know the relevant code well, don’t throw AI at it and forward it to us. +Patches written for problems the author never actually experienced themselves +tend to fix the wrong thing and/or produce another. + +* **The voice and intent of written content must be yours.** +For documentation and especially quests, the tone and the point you're trying to make +has to come from you, not an AI. Use AI to help with phrasing or cleanup if you like, +but if the substance and voice aren't yours, don't contribute it. + +* **Bad AI use may be blocked.** People who produce bad contributions +that are clearly AI (slop) may be blocked from making future contributions. +We love to help junior developers learn and grow, but if you're interested +in that, don't use AI and we'll help you. We're sorry that bad AI +users have ruined this for you. + + +## There are Humans Here + +Please remember that this project is maintained by humans. + +Every discussion, issue, and pull request is read and reviewed by +humans (and sometimes machines, too). It is a boundary point at which +people interact with each other and work is done. It is rude and +disrespectful to approach this boundary with low-effort, unqualified +work, since it puts the burden of validation on the maintainer. + +In a perfect world, AI would produce high-quality, accurate work +every time. But today, that reality depends on the user of the AI. +And today, many users of AI do not use it well. So, until that +changes, we need to have strict rules to protect maintainers. + +Based on https://github.com/ghostty-org/ghostty/blob/main/AI_POLICY.md From edccf63b66cddfdae78ab81b714ee78f70b8cdec Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 14 Jun 2026 18:09:05 -0700 Subject: [PATCH 04/11] Bump glsl-transformation-lib and buildscript (#1865) --- dependencies.gradle | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index bde4547d9..6bba63fb1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -83,7 +83,7 @@ dependencies { shadowImplementation("net.minecraftforge:eventbus:7.0-beta.15") shadowImplementation("org.anarres:jcpp:1.4.14") // Apache 2.0 - shadowImplementation("org.taumc:glsl-transformation-lib:0.2.0-32.g7dd88a4-GTNH") { + shadowImplementation("org.taumc:glsl-transformation-lib:0.2.0-33.g3ec381e") { exclude module: "antlr4" // we only want to shadow the runtime module } shadowImplementation("org.antlr:antlr4-runtime:4.13.2") diff --git a/settings.gradle.kts b/settings.gradle.kts index ca2bb729c..e3125b6a3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,7 @@ pluginManagement { } plugins { - id("com.gtnewhorizons.gtnhsettingsconvention") version ("2.0.25") + id("com.gtnewhorizons.gtnhsettingsconvention") version ("2.0.26") } include("glsm") From ab69eea65480455156c3701fee7fb261036ebc51 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 15 Jun 2026 14:50:47 -0700 Subject: [PATCH 05/11] Announce releases (#1867) --- .github/scripts/announce-release.sh | 40 +++++++++++++++++++++++++++++ .github/workflows/release-tags.yml | 19 ++++++++++++++ 2 files changed, 59 insertions(+) create mode 100755 .github/scripts/announce-release.sh diff --git a/.github/scripts/announce-release.sh b/.github/scripts/announce-release.sh new file mode 100755 index 000000000..748a8dbf9 --- /dev/null +++ b/.github/scripts/announce-release.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash +set -euo pipefail + +: "${REPO:?REPO required}" +: "${TAG:?TAG required}" + +if [ -z "${DISCORD_WEBHOOK_URL:-}" ]; then + echo "DISCORD_WEBHOOK_URL not set, skipping" + exit 0 +fi + +if ! release_json=$(gh release view "$TAG" --repo "$REPO" --json body,url,publishedAt 2>&1); then + echo "Could not read release $TAG in $REPO; skipping:" + printf '%s\n' "$release_json" + exit 0 +fi +body=$(jq -r '.body // ""' <<<"$release_json") +url=$(jq -r '.url' <<<"$release_json") +ts=$(jq -r '.publishedAt // ""' <<<"$release_json") +[ -n "$ts" ] || ts=$(date -u +%Y-%m-%dT%H:%M:%SZ) + +payload=$(jq -n \ + --arg title "$TAG" \ + --arg url "$url" \ + --arg desc "$body" \ + --arg ts "$ts" \ + '{ + embeds: [{ + title: ("Angelica " + $title + " released"), + url: $url, + description: (if ($desc | length) > 3900 + then $desc[0:3900] + "\n\n...[full changelog](" + $url + ")" + else $desc end), + color: 3066993, + footer: { text: "GitHub Releases" }, + timestamp: $ts + }] + }') + +curl -fsS -X POST -H "Content-Type: application/json" -d "$payload" "$DISCORD_WEBHOOK_URL" diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml index e4c0be6b0..4ae352fc4 100644 --- a/.github/workflows/release-tags.yml +++ b/.github/workflows/release-tags.yml @@ -12,3 +12,22 @@ jobs: release-tags: uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master secrets: inherit + + notify-discord: + needs: [release-tags] + runs-on: ubuntu-24.04 + if: >- + ${{ !endsWith(github.ref_name, '-snapshot') + && !contains(github.event.head_commit.message, '[snapshot]') + && !endsWith(github.ref_name, '-pre') }} + steps: + - name: Checkout + uses: actions/checkout@v5 + - name: Announce release to Discord + shell: bash + env: + DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_RELEASE_WEBHOOK_URL }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPO: ${{ github.repository }} + TAG: ${{ github.ref_name }} + run: bash .github/scripts/announce-release.sh From 87aa853f814c17a97cc9f4ea5252d47a43ffd98c Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Tue, 16 Jun 2026 22:16:26 -0700 Subject: [PATCH 06/11] Attempt to fix deferred particle batching (#1871) --- .../angelica/client/rendering/DeferredDrawBatcher.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/client/rendering/DeferredDrawBatcher.java b/src/main/java/com/gtnewhorizons/angelica/client/rendering/DeferredDrawBatcher.java index 69a9c7bee..74c812960 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/rendering/DeferredDrawBatcher.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/rendering/DeferredDrawBatcher.java @@ -25,6 +25,7 @@ public class DeferredDrawBatcher { @Getter private static boolean active = false; private static DeferredBatchTessellator batchTessellator; + private static long entryStateKey; private DeferredDrawBatcher() {} @@ -41,13 +42,14 @@ public class DeferredDrawBatcher { batchTessellator.clearRanges(); batchTessellator.setParentTessellator(Tessellator.instance); batchTessellator.snapshotDefaultModelview(); + entryStateKey = captureStateKey(); TessellatorManager.startCapturingDirect(batchTessellator); } /** * Exit deferred mode and flush all captured batches. Groups entries by state key - * and vertex format, issues one draw per unique group. Restores the GL state that - * was active for the last group so vanilla sees consistent state. + * and vertex format, issues one draw per unique group. Restores the bracket's entry + * state so the trailing vanilla Tessellator.draw() renders with the layer atlas. */ public static void exitAndFlush() { active = false; @@ -56,6 +58,7 @@ public class DeferredDrawBatcher { if (!ranges.isEmpty()) { ranges.sort(Comparator.comparingLong(DeferredBatchTessellator.DrawRange::stateKey)); flushSorted(ranges); + applyStateKey(entryStateKey); } TessellatorManager.stopCapturingDirect(); @@ -147,7 +150,8 @@ public class DeferredDrawBatcher { * - fog state (mode, color, start/end — constant for the frame) */ static long captureStateKey() { - final int textureId = GLStateManager.getTextures().getTextureUnitBindings(0).getBinding(); + final int activeUnit = GLStateManager.getActiveTextureUnit(); + final int textureId = GLStateManager.getTextures().getTextureUnitBindings(activeUnit).getBinding(); final int srcRgb = GLStateManager.getBlendState().getSrcRgb(); final int dstRgb = GLStateManager.getBlendState().getDstRgb(); final boolean blendEnabled = GLStateManager.getBlendMode().isEnabled(); From 07fd6d78a0b8937cea35805a11fcb7beb8e6fd4a Mon Sep 17 00:00:00 2001 From: MalTeeez <41554385+MalTeeez@users.noreply.github.com> Date: Wed, 17 Jun 2026 21:55:12 +0200 Subject: [PATCH 07/11] Separate out entity overlay render mixins (#1872) --- .../angelica/config/AngelicaConfig.java | 4 ++++ .../com/gtnewhorizons/angelica/mixins/Mixins.java | 12 ++++++++++-- .../gtnewhorizons/angelica/mixins/TargetedMod.java | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index 3d28e8e72..6d32181ca 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -350,4 +350,8 @@ public class AngelicaConfig { @Config.RequiresMcRestart public static boolean disableErrorChecks; + @Config.Comment("Fixes various issues with entity overlays, such as z-fighting, damage animations and eyes.") + @Config.DefaultBoolean(true) + @Config.RequiresMcRestart + public static boolean entityOverlayFixes; } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 334c3b395..8987a8ec2 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -47,9 +47,7 @@ public enum Mixins implements IMixins { , "angelica.bugfixes.MixinRenderGlobal_DestroyBlock" , "angelica.bugfixes.MixinRenderMooshroom_MushroomTint" , "angelica.bugfixes.MixinRendererLivingEntity_DeferredEntityOverlay" - , "angelica.bugfixes.MixinRendererLivingEntity_OverlayTint" , "angelica.bugfixes.MixinRenderWither_ArmorCentering" - , "angelica.bugfixes.MixinRendererLivingEntity_EyeDepth" , "angelica.debug.MixinMinecraft_FPSCap" , "angelica.ffp.MixinTessellator_CoreProfile" , "angelica.glsm.MixinSplashProgressCaching" @@ -60,6 +58,16 @@ public enum Mixins implements IMixins { ) ), + ANGELICA_ENTITY_OVERLAYS(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.entityOverlayFixes) + .addExcludedMod(TargetedMod.CUSTOM_PLAYER_MODELS) + .addClientMixins( + "angelica.bugfixes.MixinRendererLivingEntity_EyeDepth" + , "angelica.bugfixes.MixinRendererLivingEntity_OverlayTint" + ) + ), + ANGELICA_VBO_CLOUDS( new MixinBuilder() .setApplyIf(() -> AngelicaConfig.enableVBOClouds) diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java b/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java index 62cf09fcb..234358794 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java @@ -28,6 +28,7 @@ public enum TargetedMod implements ITargetMod { TINKERS_CONSTRUCT(null, "TConstruct"), TWILIGHT_FOREST(null, "TwilightForest"), BIOMES_O_PLENTY(null, "BiomesOPlenty"), + CUSTOM_PLAYER_MODELS("com.tom.cpmcore.CPMLoadingPlugin", "customplayermodels"), WITCHERY(null, "witchery"); private final TargetModBuilder builder; From 02fc95f239c43bfa4c1141b64c1424a8c38a63db Mon Sep 17 00:00:00 2001 From: Auynonymous Date: Wed, 17 Jun 2026 18:00:58 -0500 Subject: [PATCH 08/11] Make Glass CTM Compact, Add Stained Glass Compact CTM (#1873) --- .../assets/minecraft/mcpatcher/ctm/glass/1.png | Bin 595 -> 548 bytes .../assets/minecraft/mcpatcher/ctm/glass/10.png | Bin 554 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/11.png | Bin 551 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/12.png | Bin 597 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/13.png | Bin 586 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/14.png | Bin 561 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/15.png | Bin 595 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/16.png | Bin 591 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/17.png | Bin 594 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/18.png | Bin 577 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/19.png | Bin 591 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/2.png | Bin 587 -> 595 bytes .../assets/minecraft/mcpatcher/ctm/glass/20.png | Bin 554 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/21.png | Bin 553 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/22.png | Bin 551 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/23.png | Bin 549 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/24.png | Bin 595 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/25.png | Bin 579 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/26.png | Bin 548 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/27.png | Bin 590 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/28.png | Bin 580 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/29.png | Bin 564 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/3.png | Bin 596 -> 587 bytes .../assets/minecraft/mcpatcher/ctm/glass/30.png | Bin 580 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/31.png | Bin 562 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/32.png | Bin 550 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/33.png | Bin 548 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/34.png | Bin 550 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/35.png | Bin 552 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/36.png | Bin 598 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/37.png | Bin 590 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/38.png | Bin 574 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/39.png | Bin 592 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/4.png | Bin 586 -> 553 bytes .../assets/minecraft/mcpatcher/ctm/glass/40.png | Bin 574 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/41.png | Bin 590 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/42.png | Bin 577 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/43.png | Bin 591 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/44.png | Bin 551 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/45.png | Bin 548 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/46.png | Bin 553 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/5.png | Bin 593 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/6.png | Bin 582 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/7.png | Bin 564 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/8.png | Bin 551 -> 0 bytes .../assets/minecraft/mcpatcher/ctm/glass/9.png | Bin 552 -> 0 bytes .../mcpatcher/ctm/glass/glass.properties | 8 ++++---- .../mcpatcher/ctm/glass/glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_black/0.png | Bin 0 -> 203 bytes .../ctm/stained_glass/glass_black/1.png | Bin 0 -> 231 bytes .../ctm/stained_glass/glass_black/2.png | Bin 0 -> 255 bytes .../ctm/stained_glass/glass_black/3.png | Bin 0 -> 252 bytes .../ctm/stained_glass/glass_black/4.png | Bin 0 -> 254 bytes .../glass_black/black_stained_glass.properties | 6 ++++++ .../black_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_blue/0.png | Bin 0 -> 206 bytes .../ctm/stained_glass/glass_blue/1.png | Bin 0 -> 235 bytes .../ctm/stained_glass/glass_blue/2.png | Bin 0 -> 259 bytes .../ctm/stained_glass/glass_blue/3.png | Bin 0 -> 261 bytes .../ctm/stained_glass/glass_blue/4.png | Bin 0 -> 249 bytes .../glass_blue/blue_stained_glass.properties | 6 ++++++ .../blue_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_brown/0.png | Bin 0 -> 205 bytes .../ctm/stained_glass/glass_brown/1.png | Bin 0 -> 234 bytes .../ctm/stained_glass/glass_brown/2.png | Bin 0 -> 259 bytes .../ctm/stained_glass/glass_brown/3.png | Bin 0 -> 260 bytes .../ctm/stained_glass/glass_brown/4.png | Bin 0 -> 258 bytes .../glass_brown/brown_stained_glass.properties | 6 ++++++ .../brown_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_cyan/0.png | Bin 0 -> 205 bytes .../ctm/stained_glass/glass_cyan/1.png | Bin 0 -> 236 bytes .../ctm/stained_glass/glass_cyan/2.png | Bin 0 -> 259 bytes .../ctm/stained_glass/glass_cyan/3.png | Bin 0 -> 261 bytes .../ctm/stained_glass/glass_cyan/4.png | Bin 0 -> 249 bytes .../glass_cyan/cyan_stained_glass.properties | 6 ++++++ .../cyan_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_gray/0.png | Bin 0 -> 203 bytes .../ctm/stained_glass/glass_gray/1.png | Bin 0 -> 232 bytes .../ctm/stained_glass/glass_gray/2.png | Bin 0 -> 256 bytes .../ctm/stained_glass/glass_gray/3.png | Bin 0 -> 258 bytes .../ctm/stained_glass/glass_gray/4.png | Bin 0 -> 255 bytes .../glass_gray/gray_stained_glass.properties | 6 ++++++ .../gray_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_green/0.png | Bin 0 -> 204 bytes .../ctm/stained_glass/glass_green/1.png | Bin 0 -> 234 bytes .../ctm/stained_glass/glass_green/2.png | Bin 0 -> 259 bytes .../ctm/stained_glass/glass_green/3.png | Bin 0 -> 260 bytes .../ctm/stained_glass/glass_green/4.png | Bin 0 -> 249 bytes .../glass_green/green_stained_glass.properties | 6 ++++++ .../green_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_light_blue/0.png | Bin 0 -> 204 bytes .../ctm/stained_glass/glass_light_blue/1.png | Bin 0 -> 233 bytes .../ctm/stained_glass/glass_light_blue/2.png | Bin 0 -> 257 bytes .../ctm/stained_glass/glass_light_blue/3.png | Bin 0 -> 259 bytes .../ctm/stained_glass/glass_light_blue/4.png | Bin 0 -> 247 bytes .../light_blue_stained_glass.properties | 6 ++++++ .../light_blue_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_light_gray/0.png | Bin 0 -> 202 bytes .../ctm/stained_glass/glass_light_gray/1.png | Bin 0 -> 232 bytes .../ctm/stained_glass/glass_light_gray/2.png | Bin 0 -> 256 bytes .../ctm/stained_glass/glass_light_gray/3.png | Bin 0 -> 258 bytes .../ctm/stained_glass/glass_light_gray/4.png | Bin 0 -> 246 bytes .../light_gray_stained_glass.properties | 6 ++++++ .../light_gray_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_lime/0.png | Bin 0 -> 206 bytes .../ctm/stained_glass/glass_lime/1.png | Bin 0 -> 234 bytes .../ctm/stained_glass/glass_lime/2.png | Bin 0 -> 258 bytes .../ctm/stained_glass/glass_lime/3.png | Bin 0 -> 259 bytes .../ctm/stained_glass/glass_lime/4.png | Bin 0 -> 247 bytes .../glass_lime/lime_stained_glass.properties | 6 ++++++ .../lime_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_magenta/0.png | Bin 0 -> 206 bytes .../ctm/stained_glass/glass_magenta/1.png | Bin 0 -> 234 bytes .../ctm/stained_glass/glass_magenta/2.png | Bin 0 -> 258 bytes .../ctm/stained_glass/glass_magenta/3.png | Bin 0 -> 260 bytes .../ctm/stained_glass/glass_magenta/4.png | Bin 0 -> 248 bytes .../magenta_stained_glass.properties | 6 ++++++ .../magenta_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_orange/0.png | Bin 0 -> 206 bytes .../ctm/stained_glass/glass_orange/1.png | Bin 0 -> 234 bytes .../ctm/stained_glass/glass_orange/2.png | Bin 0 -> 258 bytes .../ctm/stained_glass/glass_orange/3.png | Bin 0 -> 259 bytes .../ctm/stained_glass/glass_orange/4.png | Bin 0 -> 247 bytes .../orange_stained_glass.properties | 6 ++++++ .../orange_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_pink/0.png | Bin 0 -> 206 bytes .../ctm/stained_glass/glass_pink/1.png | Bin 0 -> 234 bytes .../ctm/stained_glass/glass_pink/2.png | Bin 0 -> 257 bytes .../ctm/stained_glass/glass_pink/3.png | Bin 0 -> 259 bytes .../ctm/stained_glass/glass_pink/4.png | Bin 0 -> 247 bytes .../glass_pink/pink_stained_glass.properties | 6 ++++++ .../pink_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_purple/0.png | Bin 0 -> 206 bytes .../ctm/stained_glass/glass_purple/1.png | Bin 0 -> 236 bytes .../ctm/stained_glass/glass_purple/2.png | Bin 0 -> 260 bytes .../ctm/stained_glass/glass_purple/3.png | Bin 0 -> 262 bytes .../ctm/stained_glass/glass_purple/4.png | Bin 0 -> 249 bytes .../purple_stained_glass.properties | 6 ++++++ .../purple_stained_glasspane.properties | 6 ++++++ .../mcpatcher/ctm/stained_glass/glass_red/0.png | Bin 0 -> 204 bytes .../mcpatcher/ctm/stained_glass/glass_red/1.png | Bin 0 -> 234 bytes .../mcpatcher/ctm/stained_glass/glass_red/2.png | Bin 0 -> 257 bytes .../mcpatcher/ctm/stained_glass/glass_red/3.png | Bin 0 -> 259 bytes .../mcpatcher/ctm/stained_glass/glass_red/4.png | Bin 0 -> 258 bytes .../glass_red/red_stained_glass.properties | 6 ++++++ .../glass_red/red_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_white/0.png | Bin 0 -> 322 bytes .../ctm/stained_glass/glass_white/1.png | Bin 0 -> 230 bytes .../ctm/stained_glass/glass_white/2.png | Bin 0 -> 254 bytes .../ctm/stained_glass/glass_white/3.png | Bin 0 -> 247 bytes .../ctm/stained_glass/glass_white/4.png | Bin 0 -> 245 bytes .../glass_white/white_stained_glass.properties | 6 ++++++ .../white_stained_glasspane.properties | 6 ++++++ .../ctm/stained_glass/glass_yellow/0.png | Bin 0 -> 205 bytes .../ctm/stained_glass/glass_yellow/1.png | Bin 0 -> 232 bytes .../ctm/stained_glass/glass_yellow/2.png | Bin 0 -> 256 bytes .../ctm/stained_glass/glass_yellow/3.png | Bin 0 -> 258 bytes .../ctm/stained_glass/glass_yellow/4.png | Bin 0 -> 246 bytes .../yellow_stained_glass.properties | 6 ++++++ .../yellow_stained_glasspane.properties | 6 ++++++ 160 files changed, 202 insertions(+), 4 deletions(-) delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/10.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/11.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/12.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/13.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/14.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/15.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/16.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/17.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/18.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/19.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/20.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/21.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/22.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/23.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/24.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/25.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/26.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/27.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/28.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/29.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/30.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/31.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/32.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/33.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/34.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/35.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/36.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/37.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/38.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/39.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/40.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/41.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/42.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/43.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/44.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/45.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/46.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/5.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/6.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/7.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/8.png delete mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/9.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/glass/glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/black_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/black_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/blue_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/blue_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/brown_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/brown_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/cyan_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/cyan_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/gray_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/gray_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/green_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/green_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/light_blue_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/light_blue_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/light_gray_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/light_gray_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/lime_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/lime_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/magenta_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/magenta_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/orange_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/orange_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/pink_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/pink_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/purple_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/purple_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/red_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/red_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/white_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/white_stained_glasspane.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/0.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/1.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/2.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/3.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/4.png create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/yellow_stained_glass.properties create mode 100644 src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/yellow_stained_glasspane.properties diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/1.png index 3a0d2393d492e2195c36f46560bc7c6e9c392b2c..c99b6a87a6b1ab26ada4337a6ff0cbe493851908 100644 GIT binary patch delta 504 zcmVE4-aES2q)g~!HgVPnnK!d5BeQL?kMA~w?XKX;~PQlp$YonPNM-`6?c0qrnt*1Wumyv%4c8lmF&yrW93w>>J0|Ba@2!n2@C7ap-PZhuyI zS$J?gn^C+g9I{r7xbT^9w<{MEeo(qu;8(?|fHjpFa%W;=!XaTjRmNr+TPvQWItTN-xm0z z;xfgxiY1P5*03=GKk5&Dck3nl`+o{ajbW&L_Wk!xsN06`yzhS<`TqAYR6oI`Q}VAJ z!qA84`I6Rg0L`0lepS-U9k|$n*2j$D8i7;7Pd+$kCL686|s@7|GA@PQlp$YonPNM-`6?c0qr1b*nyYbBr()Av6QegEqSsvqIPDfw3p zVBlT!&63u(4~^?^c3INQZ8+b6=7*f&8i7@02m(v}|DOj!R<~Ya(TXfm zdIC5$uoRc9G3z6q20BkKrSU(%{u!!%hMvCpWZcR(4&SMFrs>_tjLRp7g)ORB)Qtx? W!vb*m+MZPa0000TWQ diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/10.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/10.png deleted file mode 100644 index 73293d8fe9451ac458986df359671a6c19788cb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 554 zcmV+_0@eMAP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002%&L_t(I zPh+429QgY0Ka`0b5LAE;{{2H}phz<@0L21An$hJ+avepQDN;;3n@9zu#tsU=rI{#0 sad``?W@5vDBJa>NpveXYzW)0U0IOD8ckVe*SO5S307*qoM6N<$g4dhzF#rGn diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/11.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/11.png deleted file mode 100644 index 0069435f2edfd69ba45b9513f8aecffb18b1aaed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 551 zcmV+?0@(eDP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002u#L_t(I zPh+4dIPmq~e<+hU@b4c&14WvN0Voy_(u^)olItkaOp#*R*+eQJHFi({F3m(4ipyJA pH4_^K6nTes0Zoa?2fqIM4*+#tTX(j%dO`pI002ovPDHLkV1m&X?l=Gd diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/12.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/12.png deleted file mode 100644 index 45d7e66146ed39e8128c39c1acf3226fc8b9a7be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 597 zcmV-b0;>IqP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7L*&{=oJAv)0=H0014{;JTU^G)@9=yq3-o00000NkvXXu0mjf{JaH! diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/13.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/13.png deleted file mode 100644 index 7dca2abc5a849ec26c6308ecba03cb8fbae0e602..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmV-Q0=4~#P)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc00~e`R7L*&{=oJA0002=auzuN000AYQchF< z{{Yv@4M6|^010qNS#tmY3ljhU3ljkVnw%H_002r!L_t(2Q)P_-4geqs0@MFLIuMpt zx0RSk3nVWSXp2xu3~@%!2YZU(x-~0|Z-4wVlzN7?F0PEf;4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_0031n+5l%cr1g;g`LVL*|0Xd2KI00ssCF?(Ic;$hy)00000NkvXXu0mjf2)*@B diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/15.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/15.png deleted file mode 100644 index 15de4aea8bf3d0bbd76bddf7ae2592b71887e94e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 595 zcmV-Z0<8UsP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7L*&{=oJAv)0=H00144Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7L*&{=oJAv)0=H0014baJldEn~!S?_dY&U1Dq#$V~2u8bT6 dnnCJ{8#-Xx0+;jh{}TWJ002ovPDHLkV1i4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7L*&{=oJAv)0=H00141r;P)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_003o4L_t(I zPh2)7HjxTQjU5z#OEXc1 z;_?<&&BTTQMc$!VKr@0&{`~MRl#2kqTB?j7dh@m0V4FdF7#jw7<&_x#44Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7L*&{=oJAv)0=H0014J`ey{y^Lrf8{+VyvI77Y4nyy=BRe)1kbO94_svem+cPv QFaQ7m07*qoM6N<$f~sLe2LJ#7 delta 174 zcmV;f08#(b1j_`F83+ad001BJ|6#EqkpX`Ra7bBm000XU000XU0RWnu7ytkOZ%IT! zR5(v#{P*wQe+DREVq!w!69R|6Lm9Zhfv?0H1_sEsQ>2*~fMNk5&FJzZxsD>u6e*^i zO{4-+V+RG`(oB@0xV(i`GqGVnk#}eo(2O9HKR>(+4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002%&L_t(I zPh+429QgY0Ka`0b5LAE;{{2H}phz<@0L21An$hJ+avepQDN;;3n@9zu#tsU=rI{#0 sad``?W@5vDBJa>HpeZr=z}J8O0g?A#DL9>84Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002!%L_t(I zPqmRr5&$p+1pWV2KIKZTp`t8P=__p|RW(||Qn+P8wG=*8Wyz!#pYjd1_FMT00000NkvXXu0mjfGWGJ$ diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/22.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/22.png deleted file mode 100644 index ad5855d020bd99204fbf8bbf53abb83fd20d1462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 551 zcmV+?0@(eDP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002u#L_t(I zPh2)7HjxTQjU5z#OEXc1 p;_?<&&BTTQMc$!lKvMu17y!KtTfT%7s0si8002ovPDHLkV1hF^?#}=K diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/23.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/23.png deleted file mode 100644 index 77ae599b68c50e57cb3f94fd8b90f0d4407c6a40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 549 zcmV+=0^0qFP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002ozL_t(I zPh4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7L*&{=oJAv)0=H00144Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_003u6L_t(I zPh4Tx04UFukxM8a6Ow* zyek~CR*bmtnQ*r&7ZiR_x>?{?#i@Wbl^JqpVq?M~VLesGW*J*6t}Q$u+!41O$=Buz z99O)d*iPrH;yu+18xzj#w9;j^Gr=TNMA0$Hu}YdOJ+eBYc*JBsT*2QK_@m-7#kGnh zj&atoF#_4@4WAS9r^zEF;qXnrBm{+9m3Fu==qY? zaRAMmaDG+N%pJJcg4V~3;TnNdEmKP-;q6quX&zc`pkcAlTXCP0dzg`~BG<6D4_ztA zUaIi!`tsiXJQMUs_y@Z7a>P1&q`UwC010qNS#tmY3ljhU3ljkVnw%H_002lyL_t(I zPh+4dIPmq~e<+hU@b4c&14WvN0Voy_(u^)olItkaOp#*R*+eQJHFi({F3m(4ipyJA mH4_^K6nTfH0Zjp5U;qGx;#3pbpiRvH00004Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7Jq`{|001>6yFUN`00eYW zPE-H?{{TQLsq_E<010qNS#tmY3ljhU3ljkVnw%H_002r!L_t(2Q&o>q4geqsLMiWm z=R`&GeS|P{3$}p*>EUq4$K<|&H{_|vl_32rOWF8y20aJ+22qgS-wIOPuN!R5jcWZt c(7!DV4{?G5xL1jb6951J07*qoM6N<$g7Z`Xa{vGU diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/28.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/28.png deleted file mode 100644 index 8818d434d05a3411eea3487b54d2aae5b978e7e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmV-K0=xZ*P)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_003x7L_t(I zPhA6lun(4wn~*1x$y&Ls?`21_l6Wsfgv> S#-j}Y00004Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_003A?L_t(I zPhn+5l%cr1g;g`LVL*|0Xd2LDg9Bgx{RaR#RbhCbP9%5$00002*~fMNk5&FJzZxsD>u6e*^i zO{4-+V+RG`(oB@0xV(i`GqGVnk#}eo(2O9HKR>(+OV delta 163 zcmV;U09^me1k?nO83+Ra001a04^y!rkpU$PP)t-s{{H^J_5QQg+W-In9oBb*00004 zbW%=J|Ns90Kq{&9ldl07Wl%{(K~yMHWlaeV03Zkw`~RNOAO9Vy_X(vi9|&*8-&sq@J(4Fw!^tSuEd*e2fg|T}#|B4M0)=A6 RPe}j(002ovPDHLkV1nGIK8FAR diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/30.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/30.png deleted file mode 100644 index 640eb79abd90e63ed4fe10c55987601a462f4c87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmV-K0=xZ*P)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_003x7L_t(I zPo!|nMAY_I*w1SuXv=RNFROv58KZNcM SL=QCp00004Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_0034=L_t(I zPhn+5l%cr1g;g`LVL*|0Xcy3wnascd02mx$c>i-{qW}N^07*qoM6N<$f+7v} AvH$=8 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/32.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/32.png deleted file mode 100644 index e729c1ed6cbf628c2573fe0d6c5818a25898d636..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 550 zcmV+>0@?kEP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002r!L_t(I zPh+4dIPmq~e<+hU@b4c&14WvN0Voy_(u^)olItkaOp#*R*+eQJHFi({F3m(4ipyJA oH4_^K6nTfH0ZleI@b%w+0FJy@#oxpKA^-pY07*qoM6N<$g8O6dRR910 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/33.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/33.png deleted file mode 100644 index ae04ee53a7acdaaa882dcc8f837116834ed09839..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 548 zcmV+<0^9wGP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002lyL_t(I zPh+4dIPmq~e<+hU@b4c&14WvN0Voy_(u^)olItkaOp#*R*+eQJHFi({F3m(4ipyJA mH4_^K6nTes0Zp073=9BlgIC4hcnQq_00000@?kEP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002r!L_t(I zPh4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002x$L_t(I zPh+429QgY0Ka`0b5LAE;{{2H}phz<@0L21An$hJ+avepQDN;;3n@9zu#tsU=rI{#0 qad``?W@5vDBJa>HpeZw%fdK%C9b0z--}`X@0000XzwQg diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/36.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/36.png deleted file mode 100644 index ec37179cef88b394e60c766b08f94bf13e65fcc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 598 zcmV-c0;&CpP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7L*&{=oJAv)0=H0014b=iydM9ocWvZOHRBmP k4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7L*&{=oJAv)0=H0014S->P)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_003f1L_t(I zPh+4dIPmq~e<+hU@b4c&14WvN0Voy_(u^)olItkaOp#*R*+eQJHFi({F3m(4ipyJA zH4_^K6nTec0nG?9`SZiOP%Z-aYN;}U=*`z|gKY-!VQd)Sl~-l}0N3YY#viCwRsaA1 M07*qoM6N<$f-f!l2LJ#7 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/39.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/39.png deleted file mode 100644 index 9c876ecc62c9bd70eb720b2acc3321d7f65234db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 592 zcmV-W04Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7Jq`{|001>6yFUN`00eYW zPE-H?{{TQLsq_E<010qNS#tmY3ljhU3ljkVnw%H_002x$L_t(2Q&o%s4geqs0-^r@ z=Rh;_)b-RAbo!>b>q(+yg8UVOa~O1h+}0li e0BH0?9TEp{mI9wF)jR|M0000z-e|+Le q*u|W+%kS)E+;Z;T!ilGJve?(OCo8d@zCIslFoUP7pUXO@geCye^)(0p delta 152 zcmV;J0B8TH1j+=E83+Ra001a04^y!rk^vx4OjJew{{F!A{r~^~^l}zC00003bW%=J z|Nj8j$_+u2uK^feN=ZaPR47wrjR6h-AP54}|35kqmR7fwm`DpGFB52sP)Q7NM$ZR( zir~66D~xY{{4S->P)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY4!{5a4!{9w)`4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7Jq`{|001>6yFUN`00eYW zPE-H?{{TQLsq_E<010qNS#tmY3ljhU3ljkVnw%H_002r!L_t(2Q&o>q4geqsLaFY5 z=R`vDeS|P{3ugic*2Q7B&nbL?XxLMsl|;Umt!(@`gPN0hgE)|n_XU#h;|5!OOV diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/42.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/42.png deleted file mode 100644 index f0f2624b3acbceab1ad05350b2b4177572be28fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 577 zcmV-H0>1r;P)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_003o4L_t(I zPh+429QgY0Ka`0b5LAE;{{2H}phz<@0L21An$hJ+avepQDN;;3n@9zu#tsU=rI{#0 zad``?W@5vDBJa>Fpcz3Xe|~ru%0&QQEmcMkz4_X0u+1Poj12?4^2!VV^nqr0nt0=Z P00000NkvXXu0mjf3PJl7 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/43.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/43.png deleted file mode 100644 index 3225df4135123836d11dcc92cbd44944e191f70b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 591 zcmV-V04Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7L*&{=oJAv)0=H0014&_=v%E<$I~luarhTAk2=RxrgC%6r)3z)e)&~ d7~XFK2N!Sa0=ct{nt1>K002ovPDHLkV1hyy0^|Sy diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/44.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/44.png deleted file mode 100644 index 11bb6b847afbe9234940d2023ea22f6d4bf183f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 551 zcmV+?0@(eDP)4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002u#L_t(I zPh+429QgY0Ka`0b5LAE;{{2H}phz<@0L21An$hJ+avepQDN;;3n@9zu#tsU=rI{#0 pad``?W@5vDBJa>NpeX4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002lyL_t(I zPh4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002!%L_t(I zPqmTD5dbg*1@&K*rd-K2ObqhIURhsKRijT>3b#y%+|xjE2iKsIV|+9nBtyx2ou*8` r4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc01Qw}R7L*&{=oJAv)0=H00144Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_003%9L_t(I zPo4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_003A?L_t(I zPhn+5l%cr1g;g`LVL*|0Xcy3wn0(;tzyAOr_GK!WMo9_)00004Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002u#L_t(I zPh4Tx04UFukxM8I;| zydxa3mW-6}sc@$&7Zko%x>@8G#hHLLl^Jo9iDBW0u%0Pnvy81J*B0&*ZcEvY2<){Bd!a;#$TM z#|SIf7=a)42fw@Z(!D*!q;L#spM3wV9qP8=Yt#2X4}JgZ2&y09!YTPz4q)J2^v#mi zwhxW#aCTYJ%xyT|faZss;TnNdEmKRU;q^qmX$G3Ep?#;;&^4>~fE zJzwG7q4M7TJQMUs>>D|1a*zbtYh?fc010qNS#tmY3ljhU3ljkVnw%H_002x$L_t(I zPh2)7HjxTQjU5z#OEXc1 q;_?<&&BTTQMc$!ZKvQNi0|Nk~tzU53h+S_00000}foqU#;K~SJ|>%xP& z34E6uHoNd&ZsH2rwkeV`xz1vb%LlvU3dLhLcD+(D3Yi)8gZ+GCkobn3S&R)c18*#5 z>MAap#rR}~rHy~`qlQOc8rSPLyqU37ZbAv`%94-;N($1?-Y|B3oT3r3li|an%Ey_R zf0%ceEdDm}!J$2j2Qr_9id{-PVCNv5w92)*`!jdZ#$(2>7RJ2*x{krq)z4*}Q$iB} DS~gQi literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/1.png new file mode 100644 index 0000000000000000000000000000000000000000..f89157f7b0188b11bc7bdfbf3bbdd1160b625043 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>pWc?Lo9liPB!FoQWS8Re{53I zw5C}t&6O#_+58`T|FCa3#B)0D%kkWqm2Wm3UOA=cX}^{Hg)jwK#uYo5^b`JzUT}?R zZOM)=|3Ipz=KN*AQb6o+qSHA&t!b#F1N#!ji&v^r+-1#>fAXXV{zC_AR| z>`m!PhWuk2Po3L!%$Kn zF%E)26hxndk`O2(0Q5|LRx( z^N-*jsO)YoJ`fb#0}o(v(4N33;2xNOy9okNu1zOj1bDOl09@DeCg5+Zgxo|fRUmp}TII-gjZ+e6ZIYL7Mnlym2WgT= zb&vcWR!XxXkE*XV+0Npu0*isOz_1M!@cM%~xDUZW)lWaGE=B#OXwv`y002ovPDHLk FV1nQKY$gBz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/3.png new file mode 100644 index 0000000000000000000000000000000000000000..8f57ddc28a3de77d1645271a44decf418bdbcb01 GIT binary patch literal 252 zcmV4N(+TDMe0a7Hz(l&bdjhzKoH~r6v!|hf7mYZzVWViwj0Os0zCP}MmKRjC4{9^)t%@-c2I5UBJ>KAFT+Q6S!=?rXu{ z%hX7L)T%z#SaxD(71%8~F$}q>0O$(qtl_Jjt@9h!OE1f3-qY&<0000 zI}XAy5JVrp&X&@qNF6C>%JDc!jzED#%>jZ$Dhfn_jK=GAKx}ExJnwpE)3)sd9Qm)t zU5xSYqqqZ}z(dYX+Z97F<~y)hQ4KJNxC3V3W`F?fE9SEZujal7F0~HSjAI_uYyrJ7 z+iJXf1t_^Qx`zA@T!40>t*g2J2Cy>*F*jb93h-u3s~jlTI4dAfnUQicS*Q{qy`EdT%j07*qoM6N<$ Eg4|$b<^TWy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/black_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/black_stained_glass.properties new file mode 100644 index 000000000..1aac5c707 --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/black_stained_glass.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass +metadata=15 +method=compact +faces=all +tiles=0-4 +connect=block diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/black_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/black_stained_glasspane.properties new file mode 100644 index 000000000..addb8d8b1 --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/black_stained_glasspane.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass_pane +metadata=15 +method=compact +faces=all +tiles=0-4 +connect=sides diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/0.png new file mode 100644 index 0000000000000000000000000000000000000000..38885de79ea11da277fe7f04b546db9f7f752a76 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Q$1ZALn>}foqUkIY16SIGY+!{{x^2}Ul`}V^3>dng=a$g>I?EULKtVC)@Cp; z=Bf^HF!JNGZQwC(Kc43!Goi=s!&gQD-pyB-C#_SM+Q${ba-`KVs$olom&hs^h8G!e z)lpgh8Rn#2u@ka5Bh1i~wri7s8S^*BE`ea(TfuYUH}S1;dR%yQ2hf2Gp00i_>zopr E0I3&D761SM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/1.png new file mode 100644 index 0000000000000000000000000000000000000000..9eb238fce3b0f77db479d187b07d324f4c85bd35 GIT binary patch literal 235 zcmVv zEdUi4;0>(*0-A^mumCRu1mF~y?;?Df^9nqo4%CceZfdrGYRtB>cdh^>7o*FJZ{Py7 z6K!41^%ua-n8cjDE*0R-*jL$@*SIJk5zNTEnITji&~LI)jm+Q6G)Rdts&=it?IF$z lSdDlH40EV}_%FC(uRiRhDbE_GqX+;1002ovPDHLkV1h>3TTcK0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/2.png new file mode 100644 index 0000000000000000000000000000000000000000..48e9e4544aac0308a4e0790fa9b44a52ac903e26 GIT binary patch literal 259 zcmV+e0sQ`nP) z!3}~y6hxnfBOy=#XA-WqVF{LJ1(skDCY~(-gB0LF*31qcHU86P|IGZ^{j=HaPiNrB ze|6XbfZPii z$e+*|*{hEFDxk`(;cD_f2nE!MT32%SO~Bt+3b~G4szCI{w92048iyp%*d#CCjE1U7 z4$>r#>KgeytdM3&9#vm!vYo|Q1ttS$fngac;PnSpa36w$s-ENRFDrrYhz|e&002ov JPDHLkV1hBIZP)++ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/3.png new file mode 100644 index 0000000000000000000000000000000000000000..b4df44ac399b7131b17e2fcf7ac9eb674fc56087 GIT binary patch literal 261 zcmV+g0s8)lP)(6xua0Y%`xF--L+4F7dX#@cn8t_dLALcv&_f`c8Q-Pzx zRv;MI##lR70af-UZzO+%s(@Car7Il%3D_Q;z+G9H|x zdzrntOZWqWnYI+;rVil^Oy$fh3HAo@E)~Y#jSFN;7o^D)hizs(b1X-@>N{6Jk}foqUk@fC7i>?%?Y$ zWcUs=vf51E!K`i3IQgoHX&}qR!~Q+L=6C$lwkcnEYHr0sosf0)0%jts9nL%zWoVI{ zYOAJTseWAUKwspcmC~D8RF?A>)iO*-zE*YMmgtsC7aLYFM9nzKyyR%`qM)Y?2b!O4 zUHgKOtX(YKoC^sjOxIN4_Fe+Igb!PC{xWt~$( F696qiP*DH? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/1.png new file mode 100644 index 0000000000000000000000000000000000000000..e1a508c6c1172ce1cc06acb561af8126d8e498c3 GIT binary patch literal 234 zcmV zP;mj?!1gboiMRkO@G?LEE`j+j!lyZ}z$5BF%{b7jO5dZ)H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/2.png new file mode 100644 index 0000000000000000000000000000000000000000..3952717553df0e7e22edea3c5b8b9c7dd3f04e82 GIT binary patch literal 259 zcmV+e0sQ`nP) zu?@mN6hj{hx9H5h@K$(V#8kf<3TC}aQ%a>(cW0OD7t`?kODzBkAH?hKsx zuMS&a{1My&rQMC&4+I6bzyp{Zv?kCCxCI8_Zh`<5bJNKe0p6_N0oVCFxC12q_pv3HTdJA=i;h6^P!LR@t*$#a00qkN;{4$5F8*HZ_<40Y>@UEJ zUre-PYrZ!FaP9ya9=HOt{#RyTMi79Z0pBF?Va@|^Z&jc$6*wwv z1%iQXjJ0zWP-SoOM)EhP3TP!-y29a~fbG!vx2@N$_N$&p*tjy08?*;xf?l{eSmzHUEHCJC#%i$u0000< KMNUMnLSTaa3}nCn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/4.png new file mode 100644 index 0000000000000000000000000000000000000000..8c074b98dc2c44f05d756ce9b8f7dc9b554c07e5 GIT binary patch literal 258 zcmV+d0sa1oP) zI}XAy5JVrp&P8gZv_wjqYj6bDoQ#uj1PUZ-4iF?#Q6LKBXuMem#FqBV^R9OmhkbVf zj{H|~)$O*MAH_BB0-kbqUd|YTF+YI8ib{Z1#5K?ZcLM}qT`*rncr*76a4mJ9W*l>? zW(#PH*;eJ}foxGd(fC7(;al*3` z40?B#EpS`p`&M*D!^x&a3XLDxyCw@1@F(whyk~yURO^Wg&xG{V7wBq)FwQO8lWOFq>4?p=IzZg3DB406jhEMQvXVqd_l-MVyAnD)fG?kgbeAe}O z({9-}_!?))bDEtIW|)(fm#V14_J&zRaaq)sOjpn=B8!~sK#t7d*=#JaxuEh_y#UO zJJHtFTz>)Vj7iMd>rw&UjD3}jd5wz#62Xkjn;AmY0sST$)yVw4OoNmdqiWaM+aBVq mfYpeHz%Yjji2s5s_UZ$>uqpz-JJi$w0000 z!3}~y6hxnfBOy=#XA)|$1beX#?^a?FCY~(-gB0LF*31qcHU86P|IGZ^{j=E}j%VP+ zf3@ENfZPii z$e+*|*{hEFDxk`(;cD_f2nE!MT32%SO~Bt+3b~G4szCI{w92048iyp%*d#CCjE1U7 z4$>r#>KgeytdM3&9#vm!vYo|Q1ttS$fngac;PnSpa36w$s-Cj=FJ7;$UmpMf002ov JPDHLkV1gwHZKD7H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/3.png new file mode 100644 index 0000000000000000000000000000000000000000..b0c20f3cd3894d3e16bcd3a78f2bf181f678a812 GIT binary patch literal 261 zcmV+g0s8)lP)u{GbD0XTO64G&y_S%0oOfHUyh!aac~$)0apPa_Dx(134}_%P=IxVI`$m zu?+$-5Cn%8p#wMI*ph3Z1ouK60G?heP(8JPL6 z>hyy-0l}Qj(+7i!6Yv05D;fcch!d~?cLM}qKQLcJcr*7IxQ;qdGmg2a*#fdL+lt=3 z0+gJLF4F&j3(!uqbv5U206Sw4bM(4YfHz}XWnsI}foqU#;K~SJobVZ+T z0^j9^%`W_xo47)@ZHnYfuCv(V^1&{-Lh;y*U9VJ(LS{z&U_aj&B)(y17GuNAz#EI1 zx{8ZtF+Q1LY2%;#sNvC<#`XFQZ)Pl&n^3~KvLs}Il7jTJH;i2$r)Y%iWcaYC@^NP7 zALbn(iyE8gkb+?GC|>li#;{an^LB{Ts5 D*7Q-> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/1.png new file mode 100644 index 0000000000000000000000000000000000000000..f71006fe26df677113a5f744e8d94a3ab01b1162 GIT binary patch literal 232 zcmVP)zO{{dWKhSElV?3S5FONUeM{mLJ8KAOjpn=B8!~sK#t7d*=#JaxuEh{01&SJJHtF zT)zSAj7iMd>rw&UjANCJb&Z<>62XkDo0&p20OKYb)yVw0OoNn|qiWYW+MeR9fZd3v iz_5l2i2s5s_Ua9^-zkFmz*5Qp0000 z!3}~y6hxndBOy=#XA)|m1k1A$i!kwQ0T`qJ53*)<_^9!pHv4Dh&+ebYIF4uF#D8@x zfcZyo2UK=97as@;?tlldIA~8`5O4=fz}*A^DA%TwF9N(-zXz`Cd2$CzCLj+&2J$EL zM)qo=z6z*vXSjy^4?+QTqSlq%e-rRGRzhwfmnsmwF|Bf7yT&OAv^L4hH>06ylY=zL zqq;|a4=bfvkw?|nnrvrrR)NL9Szy?P3V8iN9o&cDpz0^ACobOSkBveA0000^t1y=pJ?*PugZwvPXq9l91Z9R=307C=5N#ett2jJeSKw&CyRM-jx z1KSvD=PIDe-sFwsZ%`G`O0;x^!#@GrqZ4?nRjC5C9@8iz@W z_x0fIGBuJTx2hd$Dm$~Y3alnMGYqAvHi0wwI;S{Mu6D7`A0O*4=P#{DegFUf07*qo IM6N<$f>d#3yZ`_I literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/4.png new file mode 100644 index 0000000000000000000000000000000000000000..ba96016c692e2b2a8a09d7722f3b6dc1411d6ee9 GIT binary patch literal 255 zcmV zI}XAy5JVrp&V?_KHj#3c93jW!Bsl^F5;X@15~(N<1u`11*8#DmJ@dTloy{-|6L93e z8h35m9)1)zz!P}L*=f6C2*!K|7AvX&dJ#9k4BQM5fPKY$7U9+0cfh6Aftqp5y_zkc zGiF=SyH|jc8>5Tlf8YYN6K!41-8X=pF^D;OT`ItvF|D$vT;r^OKxIbC&19iUfb^24 zZ_WI9OoJ52qiWZh+RoyvfW?Tjz)*$?c#kkT=dReP@depnF3iF8dO!dG002ovPDHLk FV1f!FYRdos literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/gray_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/gray_stained_glass.properties new file mode 100644 index 000000000..235de81ff --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/gray_stained_glass.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass +metadata=7 +method=compact +faces=all +tiles=0-4 +connect=block diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/gray_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/gray_stained_glasspane.properties new file mode 100644 index 000000000..b75eb7183 --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/gray_stained_glasspane.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass_pane +metadata=7 +method=compact +faces=all +tiles=0-4 +connect=sides diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/0.png new file mode 100644 index 0000000000000000000000000000000000000000..7c1f4e60bf759f022913ad3e2368097213f6a996 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`lRaG=Ln>}foqUk@fC7i>-Idm* z416)wA95b?t$D!W7k2rIi=ZQ)z2U2RrC*2t#%x{5qvYDUvaP;AUc-!Wwzd?*49Qm8 zXa_UDKIH}; zP;mj?!1gboiMRkO@G?LEE`j+j!lyZ}z$5BF%{b zu?@mN6hj{hx9b*Nc`WtfB^kf<3TC}aQ%a>(cW0OD7t`?kODzBh;C?hKsx zul8GD{1My&rQMC&4+I6bzyp{Zv?kCCxCI8_Zh`<5bJNKe0p6_N0oVCFxC12q_pv3HTdJA=i;h6^P!LR@t*$so@OS|X#BN*0?1i#Y@9sgIBTJb0(~FYe8c%2J!R`Ukq>eYPZL?=xpE zc*h_mw}WZ(znF4{^atBptC<2P+1}qa&rP6VA>)0OkBR4)3-Uu37>HVE<*+t2=JsqY z77a+v|K#?`d<9pAYSgYn59c?$y~t^EZBzopr07fEZlmGw# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/4.png new file mode 100644 index 0000000000000000000000000000000000000000..b62f2b8340564462b5a792cb8ec9517e8141cac1 GIT binary patch literal 249 zcmV zu?+$-5Cn%8p#wMI*pgG)aZDRD^OaBp5-|ll5?=rTGFsoCL2#kHJHGSn?sz(!ftmlR zPCu9v5X{*;eK4pv0S{ocq7k5oH~|ZAH$VXP1M@|MH*=qX>!<@YsLr`7cB(!Byss@1GR*w>00000NkvXXu0mjf{*+%D literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/green_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/green_stained_glass.properties new file mode 100644 index 000000000..12937dc37 --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/green_stained_glass.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass +metadata=13 +method=compact +faces=all +tiles=0-4 +connect=block diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/green_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/green_stained_glasspane.properties new file mode 100644 index 000000000..2c528441b --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/green_stained_glasspane.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass_pane +metadata=13 +method=compact +faces=all +tiles=0-4 +connect=sides diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/0.png new file mode 100644 index 0000000000000000000000000000000000000000..b62703d4d0914ce4188ab9599fb09ecc97c3dd62 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`lRaG=Ln>}foqUk@fC7i>+-r;$ z8yeDu*V}Gx61H$Xo_YC-i=ZQ)z2U2RrC-i_-hErer{p?yWox|v|CBh!*{h`(W=OW$ zMmre#`6)N>7`H!9^pOeZvHS3qa{}+?E6kJDDNOB?Ucqsq%QCuQk&P->s2@X#$$ER; zuk{Rm#_#NeEY5H<^rY?DG=Y!#8{;g2%duOgTiA!*2@14b*f$mEJO)o!KbLh*2~7Z& C@zmS!@6R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/2.png new file mode 100644 index 0000000000000000000000000000000000000000..5ef0a45e57e2b4c722743a89a7ce1f7c2471049c GIT binary patch literal 257 zcmV+c0sj7pP) zu?@mN6hj{hxCsM(30Nf-h_%>Y3m15l7dKIaDzzdGHw{eAbn*&i+^;K+Zq z+XCZ{;1($DZrpw#D7Xb4z~rDcfnLBZFaUQG1fZCkPCg6pX8jJh&ga1$D4BrV3mM3t z&>7jQj`}K~%B|sQ@;?X#)QMVGa`#QZ-&hK{j$Eoh^v1Nxp5+>cB+%F-FW-!Ys!0yg zB#-JE`8}+VW=S4ZUu&|R#aRU=180F@87koQ2UTz%f`h7_g*z|N&2EtC00000NkvXX Hu0mjfv;Jy; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/3.png new file mode 100644 index 0000000000000000000000000000000000000000..b1a13655d79e4debbe96ab697b7524ca0ccea542 GIT binary patch literal 259 zcmV+e0sQ`nP)lU1Yl^uS4n)B^8nmi6(~#vjtX0W zU|<_#?OX*^*_*tP{0*uCT8WmfaQG)+dvpSiwJKGh)?*rFq#Wa<0**$Hl#|I!l?2jF z>b@SlT&6~H?+{FL@002ov JPDHLkV1f`cX#4;G literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/4.png new file mode 100644 index 0000000000000000000000000000000000000000..57dbc8a7445eb3927d356f96dd14caa3f135875b GIT binary patch literal 247 zcmV zu?+$-5Cn%8p#wMI*ph2(Uoo{!C}fo$SlUAjs1?w~X(C ztA2v+#;xx}=Nvfcrl!2`*WpL1P2X33a?)H{det*!h0)dz{PUQP>LnCkWnwU1yuqC{ z<@pl}<`ag+6|;^VVZ8a0IX<4@q@lO1!b`58mn$4x9gNPLWKMak8MvZ|@qz2-W0x=e zU@ypYd#ik~wUW8v@|o2-M-DgCHmDs5>Ha46Ts)z~EpTc}<9VRt7(8A5T-G@yGywpX C8c?(V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/1.png new file mode 100644 index 0000000000000000000000000000000000000000..4e3bbd00d0a42bac0f8f7875a3ccb64476505bef GIT binary patch literal 232 zcmVP)zO{{dWKhSElV?3S5FONUeM{mLJ8KAOjpn=B8!~sK#t7d*=#JaxuEh{01&SJJHtF zT)zSAj7iMd>rw&UjANCJb&Z<>62XkDo0&p20OKYb)yVw0OoNn|qiWYW+MeR9fZd3v iz_5l2i2s5s_Ua8?y((!O$ z!3}~y6hxndBOy=#XA)|%G457k5hk830D~0ZLDtL;A2t5dX8+9m+5K}E$MFoD_^*xy zF#ibdfXeRX;sZg!9q<4a2ki+A0`7nbxSJpV<=S-eMSwT!_rP^MPwqg;1mr=;K>mc@ z$X-pS-4A+qVK`5Y3)Vh-UZvy_tO2|#*QU#(nrd1AX*El7C)+TxRW;9f7a*!r@ zRQJg5VWl)H@~HY+lkF_dDzF$h3k=&(0k1!(gZmI1RQ&{11uw<5_fBB|0000dF2*uCf57#i?R5+CN=1NT-13R8iD!dAc= z*v42pR{>R?Ox{TT22}yAL`zrL{}Zr1I)TSpl`2r{F^w`%j&V@|N25o|$z-NV0_i4o zUk~0cQzJQYtJ<-qvNJoYz-p2+!%&)P6F8HvbBYt?Y8UJL0m!;A&b{uD-2eap07*qo IM6N<$f;ntxBLDyZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/4.png new file mode 100644 index 0000000000000000000000000000000000000000..b8c31845ce977f7b340ef3d9cb504ea784bc4ca4 GIT binary patch literal 246 zcmV zu?@m75Jevmr3)|MI+ADdV(v2uLm*LSfFO|pD3H7I1GiBJYQ`~VHCw=J%(kL;uK*<{ zql@%^-~zN0ZC%atH-Mcnh&g&)D!`kutuk|5}foxG9vfC3N8W;d}j z40?B#EpSU>Uw?q*ilmkXmyksA<43A2e-e4>@0^cZRiqv?W#*}m{OfpIwGxUWnHh{1 zZ%F6#ICgR&`-H@2A8zz^GEch5zR!+fQR1{JhfAVME)_D0G6ovDb5EGE+-2b@#)iIU zTbD2W#(yC5*j0C?_DZIPi$39Ehtdw%IS3~0>iQ<~T--x&0QsVxD<|`goY#vP5!5+YxD-&H{wf*MY8y}w)?47IsX2oN+T*gac4PD$H*sj$x z`W|78Xqe8(RKRtnT+r@pC97N@d)6^SbJJ)C)3oTD*5M74x-X_4GcRDg)wylmvtQf^ z={`y4;-+(bNPDw7=S+5t$OMkGlzV3cR`IHtHp25@A&t;ucLK6UjNm+sb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/2.png new file mode 100644 index 0000000000000000000000000000000000000000..10173f81135ac3270968cf2f865a8ca81a175a57 GIT binary patch literal 258 zcmV+d0sa1oP) zF%E)26hxnfk`O2@s7W}Jckwcw#M;`#+5=#a16atK+2NzcUv2i!%%9yqo5Oi`0*?Gw z`z&)m>Ew$5Z`SXC>wF&EfszTxy^w+Y z37wI>>Zq>*s@xi`CjWy_K%J;{C3oKh{EelM>&T@FL~l&1>{+gHNCJ&b^774SsG8&; zP4cL&k>A4#X_n+s^|dD3S)5g1GH@0cmZ1V(e^3SYAvmb&3A3v&Uac&!Jo0g9jpU_dD^&JW(&_L+8XBC)Da%LDxQ!N4q@^wzJr(Eq~oj)gUFlXJo(QE(!002ov JPDHLkV1j%VY+?Wa literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/4.png new file mode 100644 index 0000000000000000000000000000000000000000..a510721a0cd1f67ed0ef639121b836543d0040f1 GIT binary patch literal 247 zcmV zF%AMD5JjIGOA1;G>PDRa_ATXGbelty|Dxkh(qdGFbAJZTO x+Nj#K*0!5CD_}F?CNT7&0$w8&=iC)LRi5z~EnY$B?DhZv002ovPDHLkV1hmXVH*Gd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/lime_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/lime_stained_glass.properties new file mode 100644 index 000000000..b62d1f88a --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/lime_stained_glass.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass +metadata=5 +method=compact +faces=all +tiles=0-4 +connect=block diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/lime_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/lime_stained_glasspane.properties new file mode 100644 index 000000000..a64b01bd2 --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/lime_stained_glasspane.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass_pane +metadata=5 +method=compact +faces=all +tiles=0-4 +connect=sides diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/0.png new file mode 100644 index 0000000000000000000000000000000000000000..5cd99450dc0b841c519a48e8d8d0fee6a190ba45 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Q$1ZALn>}foqU$_fC5jeb;9!( z43;U3=bNlknjf+FT`bgE+H~yCi-(OX-W$8!FP!hc^3>cD0cl#t?RSWYtZF!$%FS@5 z=a8J}ggKL)`4x_zdALzpm|bN#e@!ie%W<8r4NJ5=mM&%zWxQzM&Of1Nxy!;+j1AIf zv;Do_${$!JxwW4~`WYvKpYirh0%FYH7`p_5b#DdFiJxf~7|1O2T@vU(22WQ%mvv4F FO#qngOjiH^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/1.png new file mode 100644 index 0000000000000000000000000000000000000000..667af6d17e0c2b4fb77a049d022039866c914c75 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8$DedLo9liPCm%XWXQw9e#E%n zWJ39pD^9W^9)=wEL<&4&822=p_32v7-G6iLjgQX?Z13y8S@D=Hm+_KVLl^f4wrll_ zzDHOi8m2Qc6>yy~7qmND$toAfo^{O7+%($3G%fn3b$G+1?u)6%%nKNAb#7bt>=$=J zx=+%%xanLU(%!7jIg=eDGJzv4<=z>AReUeZZ?15A_C8f=$q|Xr-Pi7Y6G&%W<7UIs iW*Oq}M?7X@xO|tPR>`d2kL-YsXYh3Ob6Mw<&;$U*Sy^KM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/2.png new file mode 100644 index 0000000000000000000000000000000000000000..b929d212107f6b0768a479d3f84bed7d441fdc0b GIT binary patch literal 258 zcmV+d0sa1oP) z!3}~y6hxnfBOy=#XA)|$1k1AmORxx|XA8g}1$dA(v%^P?|FqdZGkvCj2{`ay z?YF@ABe(@hyBoJ32nue22QWEkO`sQW3k<;B1OX`KrjySCyji~kuJd_t2TCR&_d*8p zCv-;ks-wONsB&w#n*0w!0d=C*mE3(3@Hdu1t|ON!5WO+2vS+!*Aqg}#$;&sRp=y$Y zG|8j7Mt%<~q*;_pK!I|+I6t_%i@z5;eqNpSw=?kK z7ZdH+n(xg396Nx92QI*@Ki3_=8Tf7Cogpz*k9pnDYSKTNNlw1&#_^ zfnZ=8W9?i8RN0%nk^Bv+0$Pcdu5kD#V0&}|kF_dQpw?p=WuzSAqymmckCc z!3_c-5JjIGj~r-#GYPd=0_AN5mS7P^&la#IZUG()<}*8JbdK= z{a{W&FlY1h!Jy&uUl4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/magenta_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/magenta_stained_glass.properties new file mode 100644 index 000000000..4ad51aa8a --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/magenta_stained_glass.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass +metadata=2 +method=compact +faces=all +tiles=0-4 +connect=block diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/magenta_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/magenta_stained_glasspane.properties new file mode 100644 index 000000000..304c36f58 --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/magenta_stained_glasspane.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass_pane +metadata=2 +method=compact +faces=all +tiles=0-4 +connect=sides diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/0.png new file mode 100644 index 0000000000000000000000000000000000000000..3a29e31b7c2fe068dc333000f8f2149836cf6986 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Q$1ZALn>}foqUk@fC7i>?%?uQ z3^F^uJ-B&9HsT=XoJEhXn3x8-OgQY{^J{*`zsEbz2Tiq}xadqsUwuKYMhN5V(^3pG zBwKC09gO_=Y#Vrt+mGk@$V}+5`|y=ffOqp1=1J=mruK2K;OOYGjA~e7qskS^$53Lj z-d1;OJ%gX|Iy)hYGr|l#X}dNFm@$82>=L*fx@Eb={;L+OftS<2uLU}g!PC{xWt~$( F698l&Onv|W literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/1.png new file mode 100644 index 0000000000000000000000000000000000000000..833541a77638b344cf914ea3cbe76f78019447ef GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8$DedLo9liPB!FYGUQ=lcbTaq z?;)$HTmMMm9hR_SgHnJ`+o_)7dHlOeN>z{}Etnx01DdaM)*ujvW@K^kT zOH2c6g`@(*@&h%(4=>LNe;`=8AWfz?cr$BA^0ujai&-^xO2nqsFpDpkoAEkp-F}9$ zV=B+yl&)mRKeq4Gu|3CJ89Ni)o}J}c_^P39a&K13zqn z!3}~y6hxnfBOy=#XA-WqV=p#iB^F`yYylXg01vWecKE3ApEmnv=Fje*&E>E=0Z0C; z{T3L11h+tGcjNX0LBTEX044{m3G@PPfdROiAOOYObn;n%H|ux6bv_U7K*Dvb7qBo{h_AJ*pB!R{zdHH5ER84Y_ zCV5oX$nRl=G)wZR`dX9iEY2!088{0J%TNKYKd6HH5FAwX1WpYvgdpUttN;K207*qo IM6N<$f*6r$O8@`> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/3.png new file mode 100644 index 0000000000000000000000000000000000000000..b8748915a165036c98d7339a2ee830f9e6b032c8 GIT binary patch literal 259 zcmV+e0sQ`nP) zu?+$-5Cn%8p#wMI*pgG)aW6FUl~4qNm;xS&FMt3Ut?$nuxX|7m-}!cTIUY{H%zss< zAIu2|=4_rm7*w2q2e4Yv2v9_vfCac4AOQP;`7FYlxzE6L)Pb6D%tg%>kd4_^^zId) z}foqUk!^V}2*Ft5Mh@NIgSS)Wj{BPu}J4d5OOd?bd(NGJn*%DS-3;gBt-gtVw$785GW} zcr%k}QejaJW6liKIkODC9gKb{T(@SBOk2yoCe~3~Ry{z}f!jE;VM~Qq$f`FCFEZk4 zqt^Xrn3FcAR;6GDJA=g8l2pY!wl~Zos>?QK@E6uG7{8tvI8j<=9?*ddp00i_>zopr E0BtHrO8@`> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/1.png new file mode 100644 index 0000000000000000000000000000000000000000..c9f0164aa24db1b429d097d3d48ebf2da33d823d GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8$DedLo9liPCm%XWXQw9e#E%n zWJ3885jW`&XK#-^nhykG822=p_32v7-G6iLjgQYh?20-6X2oN+T*gac4PD$H*sj$x z`W|78Xjsn3RKRt{T+r@JCF{FD_N-%u=BCjOrfJbPt-~88bze+9W?sN}t8?4BXTP`; z(tVQ7#ZBk>koIPE&YA2OkqI1WDfi9@tm1oNeshJ}v-hb|OO8l{?!I>Kn?O428aEr3 iHp>u)KjJYP!{z&owYF@EKI;T@JcFmJpUXO@geCyPnp+D1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/2.png new file mode 100644 index 0000000000000000000000000000000000000000..ef4fc0ec20908ae0dad6ad1b80df0e13f5cdc6e1 GIT binary patch literal 257 zcmV+c0sj7pP) z!3}~y6hxndBOy=#XA)|%7n{*WEW*UI1z?Z@Jjj~a;iJZX+U%d1Kf8Z+)8TXmj{H~q z0+@aTcR*!#Q}KbI;0|~IvxBw-1_5`#2;5B&fO2U%`69rZ^?TsDoJV({WCHRaWFUV+ zZ)C3~>Z^b%cZO@o{~#1lCu&{E{Wk%BVn{d@~xVHaSR> zJgQsd_pnl$6?s&Bt;u#4XBC(YoCSt;sDRfW)WLlS4yt|vg?lg%0eXXV00000NkvXX Hu0mjfkvL`7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/3.png new file mode 100644 index 0000000000000000000000000000000000000000..54bdb04ddb5bb356c995a646758b9e8114e8fcd2 GIT binary patch literal 259 zcmV+e0sQ`nP)$aT@s(>JOGbY1qxGvqrz4o z7}&;GJ68c!_9ky6e}k%kR-&aV9R3N|9-Y8rtx6TB^_WH(DaSaefTPhP z!3_c-5JjIGj~r-#GYK`(i_NT!ScHjZ3s|FDfCq#5%nllzBmDoEVgBxZIG%u+|Ef+u zm=h4p**twPs5k)+V6~zVpolmD3ve?)0QLj(S%g<}pMlG$12yBAi<&JU8?&wG-77%J z$><{eAGiSRL|a#L{syo!1~EskO9gl{wpA9kYg`l%7|h6aGhL_}puJ?HIx@c>(;x-< xsM@u*w!1hhU^U_{Fl<8wyhf7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/pink_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/pink_stained_glass.properties new file mode 100644 index 000000000..0b814e5d0 --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/pink_stained_glass.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass +metadata=6 +method=compact +faces=all +tiles=0-4 +connect=block diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/pink_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/pink_stained_glasspane.properties new file mode 100644 index 000000000..fb6a05fa1 --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/pink_stained_glasspane.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass_pane +metadata=6 +method=compact +faces=all +tiles=0-4 +connect=sides diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/0.png new file mode 100644 index 0000000000000000000000000000000000000000..fcae3d262a722f6dcace9c6b6e56df17c72c3459 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Q$1ZALn>}foxGd(fC7)p=E!X) z8T9TfTi}+&o-bg?IGNSek?AqNh`Qnfxnl*#Yweb5l`A>VTq*PaK~%sBCbQ|f3lCK;afPtB9G0RNbXR_W_ zcWXVv?6fO(LOCFVdQ&MBb@ E0E9q9cmMzZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/1.png new file mode 100644 index 0000000000000000000000000000000000000000..387adff7f09c198f9d766eb581ff8150ca0ae212 GIT binary patch literal 236 zcmVOjpn=B8!~sK#t7d*=#JaxuEh_y#UO zJJHtFTz>)Vj7iMd>rw&UjD3}jd5wz#62Xkjn;AmY0sST$)yVw4OoNmdqiWaM+aBVq mfYpeHz%Yjji2s5s_UZ%daw-l+W-18)0000 z!3}~y6hxnfBOy=#XA+vQ5qq&2E3gEMF!5{w7^DCXvSxPpsPUgR`)B6Q?w`$JcRB+{ z{;T~K7=Hw}Kxud5_5(q|E${#)2dxS80&al;xSJpV#oToAMSwT!cffT%5AHz81ms@G zK>mcz$X<2SR{>RS4Of%@K`5Y3)Vh+pZvy_tQpk1WQU#(nrd9SV*El4B#wL0BW;9ey za*!r@RM*JwVTCkH@~HY+lkF_dDli#13k=Ip0k1!(g8L90RP_Yox-V)V2sf7i0000< KMNUMnLSTY|dTB}k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/3.png new file mode 100644 index 0000000000000000000000000000000000000000..3e694c39163ad79ce870201c649ba36443c0e0a0 GIT binary patch literal 262 zcmV+h0r~!kP)}Y-6mQtAHwdlQ)vTK~+F2(b5$T{{(E0PT;Xtr3%z~OrwmHW1LjL(ddzKGMTB8 zK)OlY*MpbK)JTrps&=fY?99$8Fq`DeFqEcR1P z!3_c-5JjIGj~r-#GYL)D2))?MR$vJhVdB{W*2FEqgTZ`e2aV1V{(sCce|J2b&cMun zRi_`!2?*wFo<0~t*beI1K1gZn4{OF0=ya9Dht~+E(!sQBUb0agnct6T zkOF;F?OI#gU7QuL8gUmGwxI%EBUI}foqUk@fC7i>?#b4r z4178dW**5tzvcmpU)bdX#V$h!K1e2uWi8K=bwoWbiZY-y~qp{Ee|o=yK?mWahXFbRL7JtDnm{r-UW| D6+lf- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/1.png new file mode 100644 index 0000000000000000000000000000000000000000..b861c3db58ea55d40a7d8edd4cf6bb68f4c793eb GIT binary patch literal 234 zcmV zP;mj?!1gboiMRkO@G?LEE`j+j!lyZ}z$5BF%{b z!3}~y6hxnfBOy=#XA-WoV`JW}#3D>QTL1O`$8x%(#IZ!CpeM=n($dShB;&w7nx5@>9amv2Tx)g%XL zl1Fum{2o?Fvm}qIuQl1u;;aI*fwRD{4i)hFgDSWW!9i6|8Wt}3Awhb?00000NkvXX Hu0mjfOfY53 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/3.png new file mode 100644 index 0000000000000000000000000000000000000000..b9977cb868a369eff71ecf286394b0cdce635204 GIT binary patch literal 259 zcmV+e0sQ`nP)#^*UUPos)0@HY8>aPy{^y14?;ue(=`D--{hTZ%)&60bcxK zrX73py&HgY2hi}q6zv|1x!T1#e*lfkFapRRg$Muu002ov JPDHLkV1hTVYw7?1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/4.png new file mode 100644 index 0000000000000000000000000000000000000000..cedc6cd9ba03c7d3b5faf940a9a329efae3bae8d GIT binary patch literal 258 zcmV+d0sa1oP) zI}XAy5JVrp&V}npsUxM$Ik-VCM$bt&0tFH^2M7|WC=dm5G~TQOVoQ7GdDlCuL)V>v zBmY&u*;m!>M{y0jfTx_D*9(SV%nx9+q7tALaSaT>-2egD7R(nB-pqXiTuU9O8OPkJ z*#a74wiUg51t_^Tx=8*9ED|V`X1Av7t_VdJA^Z)<=07*qo IM6N<$f>c3dbpQYW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/red_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/red_stained_glass.properties new file mode 100644 index 000000000..331f8e8c0 --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/red_stained_glass.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass +metadata=14 +method=compact +faces=all +tiles=0-4 +connect=block diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/red_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/red_stained_glasspane.properties new file mode 100644 index 000000000..005cd5f2e --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/red_stained_glasspane.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass_pane +metadata=14 +method=compact +faces=all +tiles=0-4 +connect=sides diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/0.png new file mode 100644 index 0000000000000000000000000000000000000000..696c5aabd253b691f52250a5dede5e6f75eee726 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*x37`TN&n2}-D90{Nxdx@v7EBjq8eoiiKA@AkdK%qmPE{-7mix~n=`-v~wB|rI!^pW?+?YFJYz5VV$cmA0< z?&|laSGDI)SKwv!qD4_1ukx zubS>$`NOGSHetv9if|MZfE`={|OzxR8p{i_;>=!O!O1&^5aH2e*B5H4gi zdyv_{5X1D@w}rnruCe+`*WsBCX-dV?dLvr$r z&DWPQ?U6jLCH-2;oK>YsGSb|*HH+bxui2`JKZ|FwX&Sm;U01rr_Gl#IZbARXL|##W e|E%F}u1cF7(ViWX_%#FQa0X9TKbLh*2~7ZU2wM#R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/2.png new file mode 100644 index 0000000000000000000000000000000000000000..bafcc73b7ac23ee0a71797133847beb843b503cd GIT binary patch literal 254 zcmV zK@NgI6hohcB_VJC)+C(C<9QMfVdB~YV30j7WK5@g)c9AE`E7q^ehDCNJ%K^M9WVlS69k}Kn@+w6@MirUxUT2X9VnTAJO~-cpU@lG ztBLw5pvs-$8uC8~1=NXJS91SNz~5L2xrtn=K=j76%7N_~$0X3&Bro5LhN?{t(j<@S z9{D}2lx9U9RbOkeoyA!NW&>w|VH+yo^#^ruAA*CbpDqkA_Y57Tz5oCK07*qoM6N<$ Eg2e@B6951J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/3.png new file mode 100644 index 0000000000000000000000000000000000000000..adfe6eef7ad681b82ccf1e7066608259203152e8 GIT binary patch literal 247 zcmVT=NZ6#)B(eA;KHy9WPvr3cg_N= zyhvU``v$H6cfzeRoc{^v9V5ZX>yib$JJwMa^kdvuAYyPw^pj~!RRwA#cHa#C7Gont xv{u!zy1T#vyCgS;L2oJmKycQXLsz?7=Ql_YI18;JI=lb?002ovPDHLkV1iK;WEubf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/4.png new file mode 100644 index 0000000000000000000000000000000000000000..3bfca5b5f78aa928e6809473bf1c8980d0873a23 GIT binary patch literal 245 zcmVnaobHLhw9=*-A|Gfk+fL48TnH-bNpX^;YK vRP9>be?bj4BW?o2K2*SagzTKVVyE&8HyASLQ;r5$00000NkvXXu0mjf*MVfp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/white_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/white_stained_glass.properties new file mode 100644 index 000000000..f38ffd66a --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/white_stained_glass.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass +metadata=0 +method=compact +faces=all +tiles=0-4 +connect=block diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/white_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/white_stained_glasspane.properties new file mode 100644 index 000000000..e0be5e37b --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/white_stained_glasspane.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass_pane +metadata=0 +method=compact +faces=all +tiles=0-4 +connect=sides diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/0.png new file mode 100644 index 0000000000000000000000000000000000000000..8e48e12070a31590641f2f22c1cd2c38f0703a83 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Q#@T9Ln>}foqUk@fC7i>?%?uQ z3^EZ1Hg{TYXcFGhU46yGG>~QDVgH_A^E>{nzP8)sspFQwG_C9Q6?`JI8qPkIWtbt^ zYOAFnsopN=&^Gh%V*@ol4>$QAzgRljB406jhEMQvXVqeQbWBFq;g*dmSEwIDiOG6< z-LLfwe#TkyoHEZ?8QhFxBRSd`e>1pttQ32zdQSgfUPa)pS8Npfi@Lo9liPB!FYGUQ=lcbTaq z?;)$HTmR^!$CVeaoFBV~ebYL;VN&0I1&t`BK%R_C0_juD-}k(P4rjKC_s7v?utxIKHHDz)T@MCk5o_r3|Fv*x(ju(Vl* gIQ$Wh*%&UbX{9xL!hBmnpwk&VUHx3vIVCg!05WV>Q~&?~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/2.png new file mode 100644 index 0000000000000000000000000000000000000000..e739b934584007bd347ba5e3817df11fe54b0a4e GIT binary patch literal 256 zcmV+b0ssDqP) zF%E)26hxndk`OomH3_ZP@pzuZLzq|_YYcJ#3t2NeeAM`>&HkDBv-@XvyX{ZFk^kyY z0Mn1)4yf#IDn1Yt+yM_@cF>l$3UV_N0FdW~ZeXl;_0Z$?AaCI@Mf zM|F$*9#%@TB9E%CHQCPMtOB!vv%s(p74Z6lI=BzPLDf$nf-m#aUG7wNw@$T5;N*t1U&!)N_la9@YcrPiyc32rs;SAUi@OF z9eeY=8-Q~M(D1+&SoG(%12_Y}E!-1`lI;1m^)!M23=Q}ui4SugfP1R~g{i<%VJi>} zY-6mQtAHwdlQ)vTK~+F2(b5$T{{(E0PT;Xtr3%z~OrwmHW1LmM(ddzKGMTB8K)OlY z*Mrx~)JTrps&=fY?99$8u$bh`FqEcR1y1DaoZ>*a+QmA50F*Z|00(-5WB>pF07*qo IM6N<$f*h-BGynhq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/4.png new file mode 100644 index 0000000000000000000000000000000000000000..d0c4c5e7890518b5dbc796342473a090792e3850 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`dp%toLo9mdPBP?UQWS8VFYV2x z=dhP^?e&Kh)k6G-FROZ=W`!KH~ai$%r58Pkm{&WIQ-W_cD8P zm+%LMGHofwO&!7;7|WSi9#|N}yHpr|H!hGZU63YI9JZPD%&{Eps_$F@MMk?kezWU2 zSYNz$)ux{LhGg@M#n+cI?U8(~W&BsloRx*m_)`8d&QR7X({n=HpM6i3TH+uby8GI# uGU0UAH*R-W+U!COWVbw;vpZ?|DdE@;y5E~;9-jyF2!p4qpUXO@geCxvMqGpd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/yellow_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/yellow_stained_glass.properties new file mode 100644 index 000000000..987bdc01f --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/yellow_stained_glass.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass +metadata=4 +method=compact +faces=all +tiles=0-4 +connect=block diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/yellow_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/yellow_stained_glasspane.properties new file mode 100644 index 000000000..100f60376 --- /dev/null +++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/yellow_stained_glasspane.properties @@ -0,0 +1,6 @@ +matchBlocks=stained_glass_pane +metadata=4 +method=compact +faces=all +tiles=0-4 +connect=sides From 32bff85526edb054e8eaaf31cf4a5bb376b61203 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Wed, 17 Jun 2026 20:18:07 -0700 Subject: [PATCH 09/11] Handle glDrawArraysInstanced and variants, as well as dynamic TE bounds. (#1874) --- .../angelica/glsm/GLStateManager.java | 26 +++++ .../angelica/glsm/QuadConverter.java | 34 +++++- .../glsm/backend/Lwjgl2GLRenderBackend.java | 10 ++ .../angelica/glsm/backend/RenderBackend.java | 2 + .../glsm/redirect/GLSMRedirector.java | 13 ++- .../glsm/CompatUniformManagerTest.java | 2 +- .../angelica/glsm/GLSMExtension.java | 2 - .../glsm/InstancedQuadDrawGLTest.java | 105 ++++++++++++++++++ .../lwjgl3/Lwjgl3GLRenderBackend.java | 10 ++ .../angelica/config/AngelicaConfig.java | 7 ++ .../ITileEntityBoundingBoxCache.java | 2 +- .../angelica/proxy/ClientProxy.java | 2 + .../TileEntityRenderBoundsRegistry.java | 46 +++++--- .../AngelicaChunkBuilderMeshingTask.java | 3 +- .../celeritas/CeleritasWorldRenderer.java | 5 +- .../early/rendering/MixinTileEntity.java | 11 +- .../angelica/api/GLRedirectsTest.java | 5 + 17 files changed, 251 insertions(+), 34 deletions(-) create mode 100644 glsm/src/test/java/com/gtnewhorizons/angelica/glsm/InstancedQuadDrawGLTest.java diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 94ad22368..4e226a0e5 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -638,6 +638,9 @@ public class GLStateManager { RENDER_BACKEND.bindVertexArray(defaultVAO); boundVAO = defaultVAO; VAOManager.init(defaultVAO); + if (defaultVAO != 0) { + RENDER_BACKEND.provokingVertex(GL32.GL_LAST_VERTEX_CONVENTION); + } if (initCallback != null) { initCallback.run(); } @@ -2237,6 +2240,10 @@ public class GLStateManager { FeedbackManager.processDrawElements(mode, indices); return; } + if (mode == GL11.GL_QUADS) { + QuadConverter.drawQuadElementsAsTriangles(indices.remaining(), GL11.GL_UNSIGNED_BYTE, indices); + return; + } preDraw(mode); RENDER_BACKEND.drawElements(mode, indices); } @@ -2350,10 +2357,29 @@ public class GLStateManager { } public static void glDrawElementsInstanced(int mode, int count, int type, long indices, int primcount) { + if (mode == GL11.GL_QUADS) { + QuadConverter.drawQuadElementsAsTrianglesInstanced(count, type, indices, primcount); + return; + } preDraw(mode); RENDER_BACKEND.drawElementsInstanced(mode, count, type, indices, primcount); } + public static void glDrawArraysInstanced(int mode, int first, int count, int primcount) { + if (mode == GL11.GL_QUADS) { + QuadConverter.drawQuadsAsTrianglesInstanced(first, count, primcount); + } else if (mode == GL11.GL_QUAD_STRIP) { + preDraw(); + RENDER_BACKEND.drawArraysInstanced(GL11.GL_TRIANGLE_STRIP, first, count & ~1, primcount); + } else if (mode == GL11.GL_POLYGON) { + preDraw(); + RENDER_BACKEND.drawArraysInstanced(GL11.GL_TRIANGLE_FAN, first, count, primcount); + } else { + preDraw(mode); + RENDER_BACKEND.drawArraysInstanced(mode, first, count, primcount); + } + } + private static void prepareClientArrays() { if (VAOManager.hasAnyClientSideEnabledAttrib()) { VAOManager.uploadClientArraysToVBO(); diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/QuadConverter.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/QuadConverter.java index 8f6d0f68a..336c8e307 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/QuadConverter.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/QuadConverter.java @@ -83,6 +83,14 @@ public final class QuadConverter { * @param vertexCount number of vertices (must be multiple of 4) */ public static void drawQuadsAsTriangles(int first, int vertexCount) { + drawSharedQuadEbo(first, vertexCount, 1, false); + } + + public static void drawQuadsAsTrianglesInstanced(int first, int vertexCount, int primcount) { + drawSharedQuadEbo(first, vertexCount, primcount, true); + } + + private static void drawSharedQuadEbo(int first, int vertexCount, int primcount, boolean instanced) { GLStateManager.preDraw(); assert first % 4 == 0 : "QuadConverter: first (" + first + ") must be a multiple of 4"; assert vertexCount % 4 == 0 : "QuadConverter: vertexCount (" + vertexCount + ") must be a multiple of 4"; @@ -92,7 +100,11 @@ public final class QuadConverter { RENDER_BACKEND.bindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, eboId); // Index offset: first vertex / 4 quads * 6 indices * 4 bytes per int final long indexOffset = (long) (first / 4) * 6 * 4; - RENDER_BACKEND.drawElements(GL11.GL_TRIANGLES, quadCount * 6, INDEX_TYPE, indexOffset); + if (instanced) { + RENDER_BACKEND.drawElementsInstanced(GL11.GL_TRIANGLES, quadCount * 6, INDEX_TYPE, indexOffset, primcount); + } else { + RENDER_BACKEND.drawElements(GL11.GL_TRIANGLES, quadCount * 6, INDEX_TYPE, indexOffset); + } RENDER_BACKEND.bindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, prevEbo); } @@ -107,6 +119,10 @@ public final class QuadConverter { * @param bytesPerIndex bytes per index element */ private static void uploadAndDraw(ByteBuffer dst, int triIndexCount, int indexType, int bytesPerIndex) { + uploadAndDraw(dst, triIndexCount, indexType, bytesPerIndex, 1, false); + } + + private static void uploadAndDraw(ByteBuffer dst, int triIndexCount, int indexType, int bytesPerIndex, int primcount, boolean instanced) { GLStateManager.preDraw(); final int needed = triIndexCount * bytesPerIndex; final int prevEbo = GLStateManager.getBoundEBO(); @@ -126,7 +142,11 @@ public final class QuadConverter { } RENDER_BACKEND.bufferSubData(GL15.GL_ELEMENT_ARRAY_BUFFER, 0, dst); - RENDER_BACKEND.drawElements(GL11.GL_TRIANGLES, triIndexCount, indexType, 0L); + if (instanced) { + RENDER_BACKEND.drawElementsInstanced(GL11.GL_TRIANGLES, triIndexCount, indexType, 0L, primcount); + } else { + RENDER_BACKEND.drawElements(GL11.GL_TRIANGLES, triIndexCount, indexType, 0L); + } RENDER_BACKEND.bindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, prevEbo); memFree(dst); @@ -141,6 +161,14 @@ public final class QuadConverter { * @param offset byte offset into the currently bound EBO */ public static void drawQuadElementsAsTriangles(int indexCount, int type, long offset) { + drawQuadElementsFromEbo(indexCount, type, offset, 1, false); + } + + public static void drawQuadElementsAsTrianglesInstanced(int indexCount, int type, long offset, int primcount) { + drawQuadElementsFromEbo(indexCount, type, offset, primcount, true); + } + + private static void drawQuadElementsFromEbo(int indexCount, int type, long offset, int primcount, boolean instanced) { if (indexCount == 0) return; assert indexCount % 4 == 0 : "QuadConverter: indexCount must be multiple of 4"; final int quadCount = indexCount / 4; @@ -155,7 +183,7 @@ public final class QuadConverter { triangulateQuads(memAddress0(src), type, memAddress0(dst), GL11.GL_UNSIGNED_INT, quadCount); memFree(src); - uploadAndDraw(dst, triIndexCount, GL11.GL_UNSIGNED_INT, 4); + uploadAndDraw(dst, triIndexCount, GL11.GL_UNSIGNED_INT, 4, primcount, instanced); } /** diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/Lwjgl2GLRenderBackend.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/Lwjgl2GLRenderBackend.java index 2a2f9e02f..0c2fd5af6 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/Lwjgl2GLRenderBackend.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/Lwjgl2GLRenderBackend.java @@ -310,6 +310,16 @@ public final class Lwjgl2GLRenderBackend extends RenderBackend { GL31.glDrawElementsInstanced(mode, count, type, indices, primcount); } + @Override + public void drawArraysInstanced(int mode, int first, int count, int primcount) { + GL31.glDrawArraysInstanced(mode, first, count, primcount); + } + + @Override + public void provokingVertex(int provokeMode) { + GL32.glProvokingVertex(provokeMode); + } + @Override public void multiDrawElementsIndirect(int mode, int type, long indirect, int drawcount, int stride) { org.lwjgl.opengl.GL43.glMultiDrawElementsIndirect(mode, type, indirect, drawcount, stride); diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java index 25a9f4039..4fdba66b7 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java @@ -87,6 +87,8 @@ public abstract class RenderBackend { public abstract void multiDrawElementsIndirect(int mode, int type, long indirect, int drawcount, int stride); public abstract void copyBufferSubData(int readTarget, int writeTarget, long readOffset, long writeOffset, long size); public abstract void drawElementsInstanced(int mode, int count, int type, long indices, int primcount); + public abstract void drawArraysInstanced(int mode, int first, int count, int primcount); + public void provokingVertex(int provokeMode) {} public abstract void drawElementsBaseVertex(int mode, int count, int type, long indices, int baseVertex); public abstract void multiDrawElementsBaseVertex(int mode, long pCount, int type, long pIndices, int drawcount, long pBaseVertex); public abstract void drawBuffer(int mode); diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/redirect/GLSMRedirector.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/redirect/GLSMRedirector.java index 143760fdf..aeedc4ea6 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/redirect/GLSMRedirector.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/redirect/GLSMRedirector.java @@ -46,6 +46,8 @@ public class GLSMRedirector { private static final String ARBMultiTexture = "org/lwjgl/opengl/ARBMultitexture"; private static final String ARBShaderObjects = "org/lwjgl/opengl/ARBShaderObjects"; private static final String ARBInstancedArrays = "org/lwjgl/opengl/ARBInstancedArrays"; + private static final String ARBDrawInstanced = "org/lwjgl/opengl/ARBDrawInstanced"; + private static final String EXTDrawInstanced = "org/lwjgl/opengl/EXTDrawInstanced"; // Redirect VAO related calls from NHLib private static final String UniversalVAO = "com/gtnewhorizon/gtnhlib/client/opengl/UniversalVAO"; @@ -356,7 +358,8 @@ public class GLSMRedirector { .add("glGetFramebufferAttachmentParameteri") .add("glBlitFramebuffer"); final var gl31 = RedirectMap.newMap() - .add("glDrawElementsInstanced"); + .add("glDrawElementsInstanced") + .add("glDrawArraysInstanced"); final var gl32 = RedirectMap.newMap() .add("glFramebufferTexture"); final var gl33 = RedirectMap.newMap() @@ -459,6 +462,14 @@ public class GLSMRedirector { methodRedirects.put(ARBInstancedArrays, RedirectMap.newMap() .add("glVertexAttribDivisorARB") ); + methodRedirects.put(ARBDrawInstanced, RedirectMap.newMap() + .add("glDrawArraysInstancedARB", "glDrawArraysInstanced") + .add("glDrawElementsInstancedARB", "glDrawElementsInstanced") + ); + methodRedirects.put(EXTDrawInstanced, RedirectMap.newMap() + .add("glDrawArraysInstancedEXT", "glDrawArraysInstanced") + .add("glDrawElementsInstancedEXT", "glDrawElementsInstanced") + ); // APPLE methodRedirects.put(APPLEVertexArrayObject, RedirectMap.newMap() diff --git a/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/CompatUniformManagerTest.java b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/CompatUniformManagerTest.java index e882656c4..67eb930f9 100644 --- a/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/CompatUniformManagerTest.java +++ b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/CompatUniformManagerTest.java @@ -21,7 +21,7 @@ class CompatUniformManagerTest { void cleanup() { if (program != 0) { GL20.glUseProgram(0); - GL20.glDeleteProgram(program); + GLStateManager.glDeleteProgram(program); program = 0; } } diff --git a/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/GLSMExtension.java b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/GLSMExtension.java index e0caefe56..fef23275e 100644 --- a/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/GLSMExtension.java +++ b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/GLSMExtension.java @@ -1,7 +1,5 @@ package com.gtnewhorizons.angelica.glsm; -import com.gtnewhorizons.angelica.glsm.GLDebug; -import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.glsm.hooks.GLSMInitConfig; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; diff --git a/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/InstancedQuadDrawGLTest.java b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/InstancedQuadDrawGLTest.java new file mode 100644 index 000000000..1ba9d9178 --- /dev/null +++ b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/InstancedQuadDrawGLTest.java @@ -0,0 +1,105 @@ +package com.gtnewhorizons.angelica.glsm; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL15; +import org.lwjgl.opengl.GL20; + +import java.nio.FloatBuffer; +import java.nio.IntBuffer; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +@ExtendWith(GLSMCoreExtension.class) +class InstancedQuadDrawGLTest { + + private static final String VS = "#version 330 core\nlayout(location=0) in vec2 aPos;\nvoid main(){ gl_Position = vec4(aPos, 0.0, 1.0); }\n"; + private static final String FS = "#version 330 core\nout vec4 o;\nvoid main(){ o = vec4(1.0); }\n"; + + private int program; + private int vbo; + private int ebo; + + @BeforeEach + void setup() { + program = buildProgram(); + GLStateManager.glUseProgram(program); + + final FloatBuffer verts = BufferUtils.createFloatBuffer(8); + verts.put(new float[] {0, 0, 1, 0, 1, 1, 0, 1}).flip(); + vbo = GLStateManager.glGenBuffers(); + GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, vbo); + GLStateManager.glBufferData(GL15.GL_ARRAY_BUFFER, verts, GL15.GL_STATIC_DRAW); + GLStateManager.glVertexAttribPointer(0, 2, GL11.GL_FLOAT, false, 0, 0L); + GLStateManager.glEnableVertexAttribArray(0); + + final IntBuffer idx = BufferUtils.createIntBuffer(4); + idx.put(new int[] {0, 1, 2, 3}).flip(); + ebo = GLStateManager.glGenBuffers(); + GLStateManager.glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, ebo); + GLStateManager.glBufferData(GL15.GL_ELEMENT_ARRAY_BUFFER, idx, GL15.GL_STATIC_DRAW); + + drainErrors(); + } + + @AfterEach + void cleanup() { + GLStateManager.glUseProgram(0); + if (program != 0) GL20.glDeleteProgram(program); + GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0); + GLStateManager.glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, 0); + if (vbo != 0) GLStateManager.glDeleteBuffers(vbo); + if (ebo != 0) GLStateManager.glDeleteBuffers(ebo); + drainErrors(); + } + + @Test + void drawArraysInstanced_quads_noInvalidEnum() { + GLStateManager.glDrawArraysInstanced(GL11.GL_QUADS, 0, 4, 3); + assertEquals(GL11.GL_NO_ERROR, GL11.glGetError(), "GL_QUADS instanced array draw must be emulated, not rejected"); + } + + @Test + void drawArraysInstanced_triangles_fastPathClean() { + GLStateManager.glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, 0); + GLStateManager.glDrawArraysInstanced(GL11.GL_TRIANGLES, 0, 3, 3); + assertEquals(GL11.GL_NO_ERROR, GL11.glGetError(), "non-quad instanced array draw passes through cleanly"); + } + + @Test + void drawElementsInstanced_quads_noInvalidEnum() { + GLStateManager.glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, ebo); + GLStateManager.glDrawElementsInstanced(GL11.GL_QUADS, 4, GL11.GL_UNSIGNED_INT, 0L, 3); + assertEquals(GL11.GL_NO_ERROR, GL11.glGetError(), "GL_QUADS instanced element draw must be emulated, not rejected"); + } + + private static int buildProgram() { + final int vs = compile(GL20.GL_VERTEX_SHADER, VS); + final int fs = compile(GL20.GL_FRAGMENT_SHADER, FS); + final int p = GL20.glCreateProgram(); + GL20.glAttachShader(p, vs); + GL20.glAttachShader(p, fs); + GL20.glLinkProgram(p); + assertNotEquals(0, GL20.glGetProgrami(p, GL20.GL_LINK_STATUS), "test shader must link: " + GL20.glGetProgramInfoLog(p, 1024)); + GL20.glDeleteShader(vs); + GL20.glDeleteShader(fs); + return p; + } + + private static int compile(int type, String src) { + final int s = GL20.glCreateShader(type); + GL20.glShaderSource(s, src); + GL20.glCompileShader(s); + assertNotEquals(0, GL20.glGetShaderi(s, GL20.GL_COMPILE_STATUS), "test shader must compile: " + GL20.glGetShaderInfoLog(s, 1024)); + return s; + } + + private static void drainErrors() { + while (GL11.glGetError() != GL11.GL_NO_ERROR) { /* clear */ } + } +} diff --git a/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java b/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java index f9c514892..141e54c39 100644 --- a/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java +++ b/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java @@ -348,6 +348,16 @@ public final class Lwjgl3GLRenderBackend extends RenderBackend { GL31C.glDrawElementsInstanced(mode, count, type, indices, primcount); } + @Override + public void drawArraysInstanced(int mode, int first, int count, int primcount) { + GL31C.glDrawArraysInstanced(mode, first, count, primcount); + } + + @Override + public void provokingVertex(int provokeMode) { + GL32C.glProvokingVertex(provokeMode); + } + @Override public void multiDrawElementsIndirect(int mode, int type, long indirect, int drawcount, int stride) { GL43C.glMultiDrawElementsIndirect(mode, type, indirect, drawcount, stride); diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index 6d32181ca..c67147f54 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -269,6 +269,13 @@ public class AngelicaConfig { @Config.DefaultStringList({"jewelrycraft2:blockCrystal"}) public static String[] alwaysTranslucentSprites; + @Config.Comment({"TileEntity classnames whose render bounds change at runtime (e.g. OpenBlocks Guide).", + "These are always rendered and frustum-tested against their live bounds instead of the cached."}) + @Config.DefaultStringList({"openblocks.common.tileentity.TileEntityGuide", + "openblocks.common.tileentity.TileEntityBuilderGuide"}) + @Config.RequiresMcRestart + public static String[] dynamicBoundsTileEntities; + @Config.Comment("Register HardcodedCustomUniforms in Iris Shaders. May help with compatibility in certain shader packs") @Config.DefaultBoolean(false) public static boolean enableHardcodedCustomUniforms; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/ITileEntityBoundingBoxCache.java b/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/ITileEntityBoundingBoxCache.java index e407777a2..462e03c25 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/ITileEntityBoundingBoxCache.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/ITileEntityBoundingBoxCache.java @@ -5,5 +5,5 @@ import net.minecraft.util.AxisAlignedBB; public interface ITileEntityBoundingBoxCache { AxisAlignedBB angelica$getCachedRenderBoundingBox(); - boolean angelica$isInfiniteExtent(); + byte angelica$boundsClass(); } diff --git a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java index 89b6ee0ca..4c0577ad1 100644 --- a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java +++ b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java @@ -9,6 +9,7 @@ import com.gtnewhorizons.angelica.common.BlockError; import com.gtnewhorizons.angelica.compat.ModStatus; import com.gtnewhorizons.angelica.compat.bettercrashes.BetterCrashesCompat; import com.gtnewhorizons.angelica.config.AngelicaConfig; +import com.gtnewhorizons.angelica.rendering.TileEntityRenderBoundsRegistry; import com.gtnewhorizons.angelica.config.CompatConfig; import com.gtnewhorizons.angelica.config.ConfigMigrator; import com.gtnewhorizons.angelica.debug.F3Direction; @@ -102,6 +103,7 @@ public final class ClientProxy extends CommonProxy { @Override public void preInit(FMLPreInitializationEvent event) { ModStatus.preInit(); + for (String name : AngelicaConfig.dynamicBoundsTileEntities) TileEntityRenderBoundsRegistry.registerDynamicClass(name); super.preInit(event); FMLCommonHandler.instance().bus().register(this); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/TileEntityRenderBoundsRegistry.java b/src/main/java/com/gtnewhorizons/angelica/rendering/TileEntityRenderBoundsRegistry.java index bb401ebd7..7d30e329c 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/TileEntityRenderBoundsRegistry.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/TileEntityRenderBoundsRegistry.java @@ -4,48 +4,60 @@ import it.unimi.dsi.fastutil.objects.Reference2ByteOpenHashMap; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + /** - * Registry for tracking which TileEntity classes always return INFINITE_EXTENT_AABB. + * Registry for tracking which TileEntity classes always return INFINITE_EXTENT_AABB or are known to change at runtime */ public final class TileEntityRenderBoundsRegistry { private static final byte UNKNOWN = 0; - private static final byte FINITE = 1; - private static final byte INFINITE = 2; + public static final byte STATIC = 1; + public static final byte INFINITE = 2; + public static final byte DYNAMIC = 3; private static final Reference2ByteOpenHashMap> classRegistry = new Reference2ByteOpenHashMap<>(); + private static final Set dynamicClassNames = ConcurrentHashMap.newKeySet(); + static { classRegistry.defaultReturnValue(UNKNOWN); } private TileEntityRenderBoundsRegistry() {} + public static void registerDynamicClass(String className) { + if (className != null && !className.isEmpty()) dynamicClassNames.add(className); + } + public static boolean isInfiniteExtentsBox(AxisAlignedBB box) { return box == null || Double.isInfinite(box.minX) || Double.isInfinite(box.minY) || Double.isInfinite(box.minZ) || Double.isInfinite(box.maxX) || Double.isInfinite(box.maxY) || Double.isInfinite(box.maxZ); } - public static boolean isAlwaysInfiniteExtent(TileEntity te) { + public static byte classify(TileEntity te) { final Class clazz = te.getClass(); synchronized (classRegistry) { - final byte result = classRegistry.getByte(clazz); - if (result != UNKNOWN) return result == INFINITE; + final byte cached = classRegistry.getByte(clazz); + if (cached != UNKNOWN) return cached; } - return probeAndCache(te, clazz); - } - private static boolean probeAndCache(TileEntity te, Class clazz) { - boolean isInfinite; - try { - final AxisAlignedBB aabb = te.getRenderBoundingBox(); - isInfinite = isInfiniteExtentsBox(aabb); - } catch (Throwable t) { - isInfinite = true; + final byte result; + if (dynamicClassNames.contains(clazz.getName())) { + result = DYNAMIC; + } else { + boolean isInfinite; + try { + isInfinite = isInfiniteExtentsBox(te.getRenderBoundingBox()); + } catch (Throwable t) { + isInfinite = true; + } + result = isInfinite ? INFINITE : STATIC; } synchronized (classRegistry) { - classRegistry.put(clazz, isInfinite ? INFINITE : FINITE); + classRegistry.put(clazz, result); } - return isInfinite; + return result; } public static void clear() { diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java index 4e6d30a71..8047e4851 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java @@ -151,7 +151,8 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask Date: Thu, 18 Jun 2026 02:04:45 -0700 Subject: [PATCH 10/11] Add new CTM mode "compact_expanded" to generate textures on runtime (#1840) * Rewrite compact CTM to generate the textures ahead of time * fix animated textures not working * only interpolate if notfine is enabled * some bugfixes * bring back old compact ctm and make a new compact_expanded * bug fixes --- .../mcpatcher/ctm/CTMTextureGenerator.java | 99 +++++++++++++++++++ .../com/prupe/mcpatcher/ctm/CTMUtils.java | 4 +- .../ctm/GeneratedCTMAtlasSprite.java | 77 +++++++++++++++ .../com/prupe/mcpatcher/ctm/TileOverride.java | 41 +++++--- .../prupe/mcpatcher/ctm/TileOverrideImpl.java | 53 +++++++++- .../prupe/mcpatcher/mal/tile/TileLoader.java | 40 ++++++-- .../jss/notfine/render/InterpolatedIcon.java | 2 +- .../early/rendering/MixinRenderBlocks.java | 2 +- 8 files changed, 290 insertions(+), 28 deletions(-) create mode 100644 src/main/java/com/prupe/mcpatcher/ctm/CTMTextureGenerator.java create mode 100644 src/main/java/com/prupe/mcpatcher/ctm/GeneratedCTMAtlasSprite.java diff --git a/src/main/java/com/prupe/mcpatcher/ctm/CTMTextureGenerator.java b/src/main/java/com/prupe/mcpatcher/ctm/CTMTextureGenerator.java new file mode 100644 index 000000000..3aaff71e8 --- /dev/null +++ b/src/main/java/com/prupe/mcpatcher/ctm/CTMTextureGenerator.java @@ -0,0 +1,99 @@ +package com.prupe.mcpatcher.ctm; + +import com.prupe.mcpatcher.ctm.TileOverrideImpl.CTMCompactExpanded; +import com.prupe.mcpatcher.mal.tile.TileLoader; +import net.minecraft.util.ResourceLocation; + +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; + +public class CTMTextureGenerator { + + public static void generateTextures(BufferedImage[] compactIcons, CTMCompactExpanded override, + ResourceLocation propsLoc, ResourceLocation blankResource){ + BufferedImage cFull = compactIcons[0]; // Full + BufferedImage cNone = compactIcons[1]; // None + BufferedImage cVert = compactIcons[2]; // Vertical + BufferedImage cHori = compactIcons[3]; // Horizontal + BufferedImage cCorn = compactIcons[4]; // Corner + + BufferedImage[] expanded = new BufferedImage[47]; + + // Generate all 47 textures to match normal CTM + expanded[0] = cFull; + expanded[1] = generate(cFull, cHori, cFull, cHori); + expanded[2] = cHori; + expanded[3] = generate(cHori, cFull, cHori, cFull); + expanded[4] = generate(cFull, cHori, cVert, cCorn); + expanded[5] = generate(cHori, cFull, cCorn, cVert); + expanded[6] = generate(cVert, cCorn, cVert, cCorn); + expanded[7] = generate(cHori, cHori, cCorn, cCorn); + expanded[8] = generate(cCorn, cNone, cCorn, cCorn); + expanded[9] = generate(cCorn, cCorn, cCorn, cNone); + expanded[10] = generate(cNone, cCorn, cNone, cCorn); + expanded[11] = generate(cNone, cNone, cCorn, cCorn); + expanded[12] = generate(cFull, cFull, cVert, cVert); + expanded[13] = generate(cFull, cHori, cVert, cNone); + expanded[14] = generate(cHori, cHori, cNone, cNone); + expanded[15] = generate(cHori, cFull, cNone, cVert); + expanded[16] = generate(cVert, cCorn, cFull, cHori); + expanded[17] = generate(cCorn, cVert, cHori, cFull); + expanded[18] = generate(cCorn, cCorn, cHori, cHori); + expanded[19] = generate(cCorn, cVert, cCorn, cVert); + expanded[20] = generate(cNone, cCorn, cCorn, cCorn); + expanded[21] = generate(cCorn, cCorn, cNone, cCorn); + expanded[22] = generate(cCorn, cCorn, cNone, cNone); + expanded[23] = generate(cCorn, cNone, cCorn, cNone); + expanded[24] = cVert; + expanded[25] = generate(cVert, cNone, cVert, cNone); + expanded[26] = cNone; + expanded[27] = generate(cNone, cVert, cNone, cVert); + expanded[28] = generate(cVert, cCorn, cVert, cNone); + expanded[29] = generate(cHori, cHori, cNone, cCorn); + expanded[30] = generate(cVert, cNone, cVert, cCorn); + expanded[31] = generate(cHori, cHori, cCorn, cNone); + expanded[32] = generate(cNone, cNone, cNone, cCorn); + expanded[33] = generate(cNone, cNone, cCorn, cNone); + expanded[34] = generate(cCorn, cNone, cNone, cCorn); + expanded[35] = generate(cNone, cCorn, cCorn, cNone); + expanded[36] = generate(cVert, cVert, cFull, cFull); + expanded[37] = generate(cVert, cNone, cFull, cHori); + expanded[38] = generate(cNone, cNone, cHori, cHori); + expanded[39] = generate(cNone, cVert, cHori, cFull); + expanded[40] = generate(cCorn, cNone, cHori, cHori); + expanded[41] = generate(cNone, cVert, cNone, cVert); + expanded[42] = generate(cNone, cCorn, cHori, cHori); + expanded[43] = generate(cCorn, cVert, cNone, cVert); + expanded[44] = generate(cNone, cCorn, cNone, cNone); + expanded[45] = generate(cCorn, cNone, cNone, cNone); + expanded[46] = cCorn; + + for (int i = 0; i < expanded.length; i++){ + ResourceLocation resource = + TileLoader.parseTileAddress(propsLoc, String.valueOf(i), blankResource); + override.addIcon(resource, expanded[i]); + } + } + + private static BufferedImage generate(BufferedImage tl, BufferedImage tr, BufferedImage bl, BufferedImage br){ + int w = tl.getWidth(); + int hw = w/2; + BufferedImage img = new BufferedImage(tl.getWidth(), tl.getHeight(), BufferedImage.TYPE_INT_ARGB); + int numFrames = tl.getHeight() / tl.getWidth(); + Graphics2D g = img.createGraphics(); + for (int i = 0; i < numFrames; i++){ + int yOff = w * i; + copy(tl, g, 0, yOff, hw); + copy(tr, g, hw, yOff, hw); + copy(bl, g, 0, yOff + hw, hw); + copy(br, g, hw, yOff + hw, hw); + } + g.dispose(); + return img; + } + + private static void copy(BufferedImage src, Graphics2D g, int x, int y, int s){ + g.drawImage(src, x, y, x+s, y+s, x, y, x+s, y+s, null); + } + +} diff --git a/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java b/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java index 8a4d268c7..22ef4bdb3 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java @@ -10,12 +10,12 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.StampedLock; +import com.github.bsideup.jabel.Desugar; import net.minecraft.block.Block; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; -import com.github.bsideup.jabel.Desugar; import com.prupe.mcpatcher.MCLogger; import com.prupe.mcpatcher.MCPatcherUtils; import com.prupe.mcpatcher.mal.block.BlockAPI; @@ -32,7 +32,7 @@ import jss.notfine.config.MCPatcherForgeConfig; public class CTMUtils { - private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CONNECTED_TEXTURES, "CTM"); + public static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CONNECTED_TEXTURES, "CTM"); private static class Overrides { private final List all = new ArrayList<>(); diff --git a/src/main/java/com/prupe/mcpatcher/ctm/GeneratedCTMAtlasSprite.java b/src/main/java/com/prupe/mcpatcher/ctm/GeneratedCTMAtlasSprite.java new file mode 100644 index 000000000..5ba02f80b --- /dev/null +++ b/src/main/java/com/prupe/mcpatcher/ctm/GeneratedCTMAtlasSprite.java @@ -0,0 +1,77 @@ +package com.prupe.mcpatcher.ctm; + +import com.gtnewhorizons.angelica.config.AngelicaConfig; +import com.prupe.mcpatcher.mal.tile.TileLoader; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import jss.notfine.render.InterpolatedIcon; +import net.minecraft.client.resources.IResource; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.SimpleResource; +import net.minecraft.client.resources.data.AnimationMetadataSection; +import net.minecraft.util.ResourceLocation; + +import java.awt.image.BufferedImage; + +@SideOnly(Side.CLIENT) +public class GeneratedCTMAtlasSprite extends InterpolatedIcon { + + private final TileLoader loader; + private final boolean aniFiltering; + private boolean interpolated; + + public GeneratedCTMAtlasSprite(TileLoader loader, boolean aniFiltering, String name) { + super(name); + this.loader = loader; + this.aniFiltering = aniFiltering; + } + + @Override + protected void updateAnimationInterpolated() throws IllegalArgumentException, IllegalAccessException { + if(interpolated) super.updateAnimationInterpolated(); + } + + @Override + public boolean hasCustomLoader(IResourceManager manager, ResourceLocation location) { + return true; + } + + @Override + public boolean load(IResourceManager manager, ResourceLocation location) { + BufferedImage img = loader.getImageForPath(location); + if(img == null) return true; + try { + ResourceLocation metaLoc = getMetaLoc(location); + IResource iresource = manager.getResource(metaLoc); + AnimationMetadataSection anim = (AnimationMetadataSection)iresource.getMetadata("animation"); + interpolated = anim != null && AngelicaConfig.enableNotFineFeatures && shouldInterpolate(iresource); + loadSprite(new BufferedImage[]{img, null, null, null, null}, anim, aniFiltering); + }catch (Exception exception){ + CTMUtils.logger.error("Error loading sprite for " + location); + exception.printStackTrace(); + return true; + } + return false; + } + + private static boolean shouldInterpolate(IResource resource){ + try { + if (resource instanceof SimpleResource simple) { + return simple.mcmetaJson.getAsJsonObject("animation") + .getAsJsonPrimitive("interpolate").getAsBoolean(); + } + }catch (Exception _){} + return false; + } + + /** + * Find the mcmeta file associated with 0.png + */ + private static ResourceLocation getMetaLoc(ResourceLocation location) { + String path = location.getResourcePath(); + int index = path.lastIndexOf('/'); + if(index == -1) return new ResourceLocation(location.getResourceDomain(), "0.png"); + path = path.substring(0, index) + "/0.png"; + return new ResourceLocation(location.getResourceDomain(), path); + } +} diff --git a/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java b/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java index d883038fd..3d8a1108e 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java @@ -5,6 +5,7 @@ import static com.prupe.mcpatcher.ctm.RenderBlockState.CONNECT_BY_MATERIAL; import static com.prupe.mcpatcher.ctm.RenderBlockState.CONNECT_BY_TILE; import static com.prupe.mcpatcher.ctm.RenderBlockState.NORMALS; +import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.BitSet; import java.util.HashSet; @@ -32,10 +33,10 @@ public abstract class TileOverride implements Comparable { private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CONNECTED_TEXTURES, "CTM"); - private final PropertiesFile properties; + protected final PropertiesFile properties; private final String baseFilename; - private final TileLoader tileLoader; - private final int renderPass; + protected final TileLoader tileLoader; + protected final int renderPass; private final int weight; private final List matchBlocks; private final Set matchTiles; @@ -45,7 +46,7 @@ public abstract class TileOverride implements Comparable { private final BitSet biomes; private final BitSet height; - private final List tileNames = new ArrayList<>(); + protected final List tileNames = new ArrayList<>(); protected IIcon[] icons; // Index into this array is formed from these bit values: @@ -103,6 +104,7 @@ public abstract class TileOverride implements Comparable { case "sandstone", "top" -> override = new TileOverrideImpl.Top(properties, tileLoader); case "repeat", "pattern" -> override = new TileOverrideImpl.Repeat(properties, tileLoader); case "ctm_compact", "compact" -> override = new TileOverrideImpl.CTMCompact(properties, tileLoader); + case "compact_expanded" -> override = new TileOverrideImpl.CTMCompactExpanded(properties, tileLoader); default -> properties.error("unknown method \"%s\"", method); } @@ -196,7 +198,12 @@ public abstract class TileOverride implements Comparable { return tileLoader.preloadTile(resource, renderPass > RenderPassAPI.MAX_BASE_RENDER_PASS); } - private void loadIcons() { + public void addIcon(ResourceLocation resource, BufferedImage img){ + tileNames.add(resource); + tileLoader.addTile(resource, img, null, true); + } + + protected void loadIcons() { tileNames.clear(); String tileList = properties.getString("tiles", ""); ResourceLocation blankResource = RenderPassAPI.instance.getBlankResource(renderPass); @@ -221,16 +228,7 @@ public abstract class TileOverride implements Comparable { try { int from = Integer.parseInt(matcher.group(1)); int to = Integer.parseInt(matcher.group(2)); - for (int i = from; i <= to; i++) { - ResourceLocation resource = TileLoader - .parseTileAddress(properties.getResource(), String.valueOf(i), blankResource); - if (TexturePackAPI.hasResource(resource)) { - addIcon(resource); - } else { - properties.warning("could not find image %s", resource); - tileNames.add(null); - } - } + loadOverrideIcons(from, to, blankResource); } catch (NumberFormatException e) { e.printStackTrace(); } @@ -250,6 +248,19 @@ public abstract class TileOverride implements Comparable { } } + protected void loadOverrideIcons(int from, int to, ResourceLocation blankResource){ + for (int i = from; i <= to; i++) { + ResourceLocation resource = TileLoader + .parseTileAddress(properties.getResource(), String.valueOf(i), blankResource); + if (TexturePackAPI.hasResource(resource)) { + addIcon(resource); + } else { + properties.warning("could not find image %s", resource); + tileNames.add(null); + } + } + } + private List getBlockList(String property, String defaultMetadata) { List blocks = new ArrayList<>(); if (!MCPatcherUtils.isNullOrEmpty(defaultMetadata)) { diff --git a/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideImpl.java b/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideImpl.java index d9771c3b3..645a92c60 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideImpl.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideImpl.java @@ -12,15 +12,22 @@ import static com.prupe.mcpatcher.ctm.RenderBlockState.REL_UL; import static com.prupe.mcpatcher.ctm.RenderBlockState.REL_UR; import static com.prupe.mcpatcher.ctm.RenderBlockState.TOP_FACE; +import com.prupe.mcpatcher.mal.block.RenderPassAPI; +import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import net.minecraft.util.IIcon; import com.prupe.mcpatcher.mal.resource.PropertiesFile; import com.prupe.mcpatcher.mal.tile.TileLoader; import com.prupe.mcpatcher.mal.util.WeightedIndex; +import net.minecraft.util.ResourceLocation; + +import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.List; public class TileOverrideImpl { - final static class CTM extends TileOverride { + static class CTM extends TileOverride { CTM(PropertiesFile properties, TileLoader tileLoader) { super(properties, tileLoader); @@ -505,4 +512,48 @@ public class TileOverrideImpl { return p; } } + + final public static class CTMCompactExpanded extends CTM { + + CTMCompactExpanded(PropertiesFile propertiesFile, TileLoader tileLoader) { + super(propertiesFile, tileLoader); + } + + @Override + String checkTileMap() { + return null; + } + + @Override + String getMethod() { + return "compact_expanded"; + } + + @Override + protected void loadOverrideIcons(int from, int to, ResourceLocation blankResource) { + List compactIcons = new ArrayList<>(); + if(from != 0){ + properties.error("expanded compact CTM requires range to start at 0, starts at %d", from); + } + if(to - from + 1 != 5){ + properties.error("expanded compact CTM requires exactly 5 icons, got range %d - %d", from, to); + } + for (int i = from; i <= to; i++) { + ResourceLocation resource = TileLoader + .parseTileAddress(properties.getResource(), String.valueOf(i), blankResource); + if (TexturePackAPI.hasResource(resource)) { + compactIcons.add(tileLoader.loadResourceImage(resource, + renderPass > RenderPassAPI.MAX_BASE_RENDER_PASS)); + } else { + // Promote from warning to error for compact CTM + properties.error("could not find image %s, required for expanded compact CTM", resource); + tileNames.add(null); + } + } + if(compactIcons.size() == 5){ + CTMTextureGenerator.generateTextures(compactIcons.toArray(new BufferedImage[0]), + this, properties.getResource(), blankResource); + } + } + } } diff --git a/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java b/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java index 03f32eff4..98ee19b89 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java +++ b/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java @@ -11,6 +11,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.prupe.mcpatcher.ctm.GeneratedCTMAtlasSprite; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -44,6 +45,7 @@ public class TileLoader { private TextureMap baseTextureMap; private final Map baseTexturesByName = new HashMap<>(); private final Set tilesToRegister = new HashSet<>(); + private final Set generatedTiles = new HashSet<>(); private final Map tileImages = new HashMap<>(); private final Map iconMap = new HashMap<>(); @@ -119,6 +121,10 @@ public class TileLoader { logger.fine("after registerIcons(%s) %d icons", mapName, map.size()); } + public BufferedImage getImageForPath(ResourceLocation rl) { + return tileImages.get(rl); + } + public static String getOverridePath(String prefix, String basePath, String name, String ext) { String path; if (name.endsWith(".png")) { @@ -218,6 +224,22 @@ public class TileLoader { if (tileImages.containsKey(resource)) { return true; } + return addTile(resource, loadResourceImage(resource, alternate), special, false); + } + + public boolean addTile(ResourceLocation resource, BufferedImage image, String special, boolean generated) { + tilesToRegister.add(resource); + tileImages.put(resource, image); + if(generated){ + generatedTiles.add(resource); + } + if (special != null) { + specialTextures.put(resource.toString(), special); + } + return true; + } + + public BufferedImage loadResourceImage(ResourceLocation resource, boolean alternate){ BufferedImage image = null; if (!MCPatcherForgeConfig.ConnectedTextures.debugTextures) { image = TexturePackAPI.getImage(resource); @@ -228,12 +250,7 @@ public class TileLoader { if (image == null) { image = generateDebugTexture(resource.getResourcePath(), 64, 64, alternate); } - tilesToRegister.add(resource); - tileImages.put(resource, image); - if (special != null) { - specialTextures.put(resource.toString(), special); - } - return true; + return image; } public boolean preloadTile(ResourceLocation resource, boolean alternate) { @@ -287,8 +304,14 @@ public class TileLoader { return false; } } - IIcon icon = textureMap.registerIcon(name); - map.put(name, (TextureAtlasSprite) icon); + TextureAtlasSprite icon; + if(generatedTiles.contains(resource)){ + icon = new GeneratedCTMAtlasSprite(this, textureMap.anisotropicFiltering > 1, name); + textureMap.setTextureEntry(name, icon); + }else{ + icon = (TextureAtlasSprite)textureMap.registerIcon(name); + } + map.put(name, icon); iconMap.put(name, icon); String extra = (width == height ? "" : ", " + (height / width) + " frames"); subLogger.finer("%s -> %s icon %dx%d%s", name, mapName, width, width, extra); @@ -299,6 +322,7 @@ public class TileLoader { public void finish() { tilesToRegister.clear(); tileImages.clear(); + generatedTiles.clear(); } public IIcon getIcon(String name) { diff --git a/src/main/java/jss/notfine/render/InterpolatedIcon.java b/src/main/java/jss/notfine/render/InterpolatedIcon.java index 776addc3c..c22672ed6 100644 --- a/src/main/java/jss/notfine/render/InterpolatedIcon.java +++ b/src/main/java/jss/notfine/render/InterpolatedIcon.java @@ -29,7 +29,7 @@ public class InterpolatedIcon extends TextureAtlasSprite { } } - private void updateAnimationInterpolated() throws IllegalArgumentException, IllegalAccessException { + protected void updateAnimationInterpolated() throws IllegalArgumentException, IllegalAccessException { double d0 = 1.0D - tickCounter / (double) animationMetadata.getFrameTimeSingle(frameCounter); int i = animationMetadata.getFrameIndex(frameCounter); diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java index ae57cdd7a..74f1e8667 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java @@ -169,7 +169,7 @@ public abstract class MixinRenderBlocks { } @ModifyExpressionValue(method = { "renderStandardBlockWithColorMultiplier" }, - at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lnet/minecraft/client/renderer/RenderBlocks;renderAllFaces:Z")) + at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lnet/minecraft/client/renderer/RenderBlocks;renderAllFaces:Z")) private boolean applyAOBrightness(boolean original, @Local(ordinal = 0) Tessellator tessellator) { ((StateAwareTessellator)tessellator).angelica$setAppliedAo(this.applyingCeleritasAO); return original; From 0decc515e4aed3cd9c09e333f64ebe2e4726a863 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Thu, 18 Jun 2026 23:42:21 -0700 Subject: [PATCH 11/11] Fix universium shader (#1877) --- .../angelica/glsm/GLStateManager.java | 10 +- .../glsm/backend/Lwjgl2GLRenderBackend.java | 25 +++++ .../angelica/glsm/backend/RenderBackend.java | 5 + .../glsm/ArrayUniformUploadGLTest.java | 103 ++++++++++++++++++ .../lwjgl3/Lwjgl3GLRenderBackend.java | 25 +++++ 5 files changed, 163 insertions(+), 5 deletions(-) create mode 100644 glsm/src/test/java/com/gtnewhorizons/angelica/glsm/ArrayUniformUploadGLTest.java diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 4e226a0e5..0010ad1b5 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -6030,15 +6030,15 @@ public class GLStateManager { } public static void glUniform1(int location, IntBuffer values) { - if (values.remaining() >= 1) RENDER_BACKEND.uniform1i(location, values.get(values.position())); + RENDER_BACKEND.uniform1iv(location, values); } public static void glUniform2(int location, FloatBuffer values) { - if (values.remaining() >= 2) RENDER_BACKEND.uniform2f(location, values.get(values.position()), values.get(values.position() + 1)); + RENDER_BACKEND.uniform2(location, values); } public static void glUniform2(int location, IntBuffer values) { - if (values.remaining() >= 2) RENDER_BACKEND.uniform2i(location, values.get(values.position()), values.get(values.position() + 1)); + RENDER_BACKEND.uniform2iv(location, values); } public static void glUniform3(int location, FloatBuffer values) { @@ -6046,7 +6046,7 @@ public class GLStateManager { } public static void glUniform3(int location, IntBuffer values) { - if (values.remaining() >= 3) RENDER_BACKEND.uniform3i(location, values.get(values.position()), values.get(values.position() + 1), values.get(values.position() + 2)); + RENDER_BACKEND.uniform3iv(location, values); } public static void glUniform4(int location, FloatBuffer values) { @@ -6054,7 +6054,7 @@ public class GLStateManager { } public static void glUniform4(int location, IntBuffer values) { - if (values.remaining() >= 4) RENDER_BACKEND.uniform4i(location, values.get(values.position()), values.get(values.position() + 1), values.get(values.position() + 2), values.get(values.position() + 3)); + RENDER_BACKEND.uniform4iv(location, values); } public static void glUniformMatrix2(int location, boolean transpose, FloatBuffer matrices) { diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/Lwjgl2GLRenderBackend.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/Lwjgl2GLRenderBackend.java index 0c2fd5af6..6c8fad23a 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/Lwjgl2GLRenderBackend.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/Lwjgl2GLRenderBackend.java @@ -822,6 +822,11 @@ public final class Lwjgl2GLRenderBackend extends RenderBackend { GL20.glUniform4i(location, v0, v1, v2, v3); } + @Override + public void uniform2(int location, FloatBuffer value) { + GL20.glUniform2(location, value); + } + @Override public void uniform3(int location, FloatBuffer value) { GL20.glUniform3(location, value); @@ -832,6 +837,26 @@ public final class Lwjgl2GLRenderBackend extends RenderBackend { GL20.glUniform4(location, value); } + @Override + public void uniform1iv(int location, IntBuffer value) { + GL20.glUniform1(location, value); + } + + @Override + public void uniform2iv(int location, IntBuffer value) { + GL20.glUniform2(location, value); + } + + @Override + public void uniform3iv(int location, IntBuffer value) { + GL20.glUniform3(location, value); + } + + @Override + public void uniform4iv(int location, IntBuffer value) { + GL20.glUniform4(location, value); + } + @Override public void uniformMatrix3(int location, boolean transpose, FloatBuffer value) { GL20.glUniformMatrix3(location, transpose, value); diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java index 4fdba66b7..6f6cc6256 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java @@ -201,8 +201,13 @@ public abstract class RenderBackend { public abstract void uniform3i(int location, int v0, int v1, int v2); public abstract void uniform4f(int location, float v0, float v1, float v2, float v3); public abstract void uniform4i(int location, int v0, int v1, int v2, int v3); + public abstract void uniform2(int location, FloatBuffer value); public abstract void uniform3(int location, FloatBuffer value); public abstract void uniform4(int location, FloatBuffer value); + public abstract void uniform1iv(int location, IntBuffer value); + public abstract void uniform2iv(int location, IntBuffer value); + public abstract void uniform3iv(int location, IntBuffer value); + public abstract void uniform4iv(int location, IntBuffer value); public abstract void uniformMatrix3(int location, boolean transpose, FloatBuffer value); public abstract void uniformMatrix4(int location, boolean transpose, FloatBuffer value); public void uniformMatrix2(int location, boolean transpose, FloatBuffer matrices) {} diff --git a/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/ArrayUniformUploadGLTest.java b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/ArrayUniformUploadGLTest.java new file mode 100644 index 000000000..c1ba31143 --- /dev/null +++ b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/ArrayUniformUploadGLTest.java @@ -0,0 +1,103 @@ +package com.gtnewhorizons.angelica.glsm; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL20; + +import java.nio.FloatBuffer; +import java.nio.IntBuffer; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@ExtendWith(GLSMCoreExtension.class) +class ArrayUniformUploadGLTest { + + private static int compile(int type, String src) { + final int s = GL20.glCreateShader(type); + GL20.glShaderSource(s, src); + GL20.glCompileShader(s); + assertEquals(GL11.GL_TRUE, GL20.glGetShaderi(s, GL20.GL_COMPILE_STATUS), () -> "shader compile failed: " + GL20.glGetShaderInfoLog(s, 4096)); + return s; + } + + private static int link(String vs, String fs) { + final int v = compile(GL20.GL_VERTEX_SHADER, vs); + final int f = compile(GL20.GL_FRAGMENT_SHADER, fs); + final int p = GL20.glCreateProgram(); + GL20.glAttachShader(p, v); + GL20.glAttachShader(p, f); + GL20.glLinkProgram(p); + assertEquals(GL11.GL_TRUE, GL20.glGetProgrami(p, GL20.GL_LINK_STATUS), () -> "link failed: " + GL20.glGetProgramInfoLog(p, 4096)); + GL20.glDeleteShader(v); + GL20.glDeleteShader(f); + return p; + } + + private static final String VS = "#version 330 core\nvoid main(){ gl_Position = vec4(0.0); }\n"; + + @Test + void glUniform2FloatBufferUploadsWholeArray() { + // Runtime index keeps the whole array active so element locations stay queryable. + final String fs = "#version 330 core\n" + + "uniform vec2 cosmicuvs[10];\n" + + "uniform int idx;\n" + + "out vec4 o;\n" + + "void main(){ o = vec4(cosmicuvs[idx], cosmicuvs[(idx+1)%10]); }\n"; + final int p = link(VS, fs); + try { + GL20.glUseProgram(p); + + final FloatBuffer buf = BufferUtils.createFloatBuffer(20); + for (int i = 0; i < 20; i++) buf.put(i + 1.0f); // 1..20, all distinct, all non-zero + buf.flip(); + + GLStateManager.glUniform2(GL20.glGetUniformLocation(p, "cosmicuvs"), buf); + + final FloatBuffer read = BufferUtils.createFloatBuffer(2); + for (int i = 0; i < 10; i++) { + final int loc = GL20.glGetUniformLocation(p, "cosmicuvs[" + i + "]"); + assertTrue(loc >= 0, "element " + i + " optimized out"); + read.clear(); + GL20.glGetUniform(p, loc, read); + assertEquals(2 * i + 1.0f, read.get(0), 0.0f, "cosmicuvs[" + i + "].x"); + assertEquals(2 * i + 2.0f, read.get(1), 0.0f, "cosmicuvs[" + i + "].y"); + } + } finally { + GL20.glUseProgram(0); + GL20.glDeleteProgram(p); + } + } + + @Test + void glUniform1IntBufferUploadsWholeArray() { + final String fs = "#version 330 core\n" + + "uniform int vals[4];\n" + + "uniform int idx;\n" + + "out vec4 o;\n" + + "void main(){ o = vec4(float(vals[idx])); }\n"; + final int p = link(VS, fs); + try { + GL20.glUseProgram(p); + + final IntBuffer buf = BufferUtils.createIntBuffer(4); + buf.put(11).put(22).put(33).put(44).flip(); + GLStateManager.glUniform1(GL20.glGetUniformLocation(p, "vals"), buf); + + final IntBuffer read = BufferUtils.createIntBuffer(1); + final int[] expect = {11, 22, 33, 44}; + for (int i = 0; i < 4; i++) { + final int loc = GL20.glGetUniformLocation(p, "vals[" + i + "]"); + assertTrue(loc >= 0, "element " + i + " optimized out"); + read.clear(); + GL20.glGetUniform(p, loc, read); + assertEquals(expect[i], read.get(0), "vals[" + i + "]"); + } + } finally { + GL20.glUseProgram(0); + GL20.glDeleteProgram(p); + } + } +} diff --git a/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java b/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java index 141e54c39..7f2c2aef4 100644 --- a/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java +++ b/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java @@ -866,6 +866,11 @@ public final class Lwjgl3GLRenderBackend extends RenderBackend { GL20C.glUniform4i(location, v0, v1, v2, v3); } + @Override + public void uniform2(int location, FloatBuffer value) { + GL20C.glUniform2fv(location, value); + } + @Override public void uniform3(int location, FloatBuffer value) { GL20C.glUniform3fv(location, value); @@ -876,6 +881,26 @@ public final class Lwjgl3GLRenderBackend extends RenderBackend { GL20C.glUniform4fv(location, value); } + @Override + public void uniform1iv(int location, IntBuffer value) { + GL20C.glUniform1iv(location, value); + } + + @Override + public void uniform2iv(int location, IntBuffer value) { + GL20C.glUniform2iv(location, value); + } + + @Override + public void uniform3iv(int location, IntBuffer value) { + GL20C.glUniform3iv(location, value); + } + + @Override + public void uniform4iv(int location, IntBuffer value) { + GL20C.glUniform4iv(location, value); + } + @Override public void uniformMatrix3(int location, boolean transpose, FloatBuffer value) { GL20C.glUniformMatrix3fv(location, transpose, value);