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/.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
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
diff --git a/dependencies.gradle b/dependencies.gradle
index 215b69227..5fef210f4 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/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 39f236404..a1da68a65 100644
--- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java
+++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java
@@ -57,6 +57,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;
@@ -656,6 +657,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();
}
@@ -2265,6 +2269,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);
}
@@ -2378,10 +2386,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();
@@ -3472,6 +3499,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 -> {
@@ -6036,15 +6078,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) {
@@ -6052,7 +6094,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) {
@@ -6060,7 +6102,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/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..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
@@ -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);
@@ -812,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);
@@ -822,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 25a9f4039..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
@@ -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);
@@ -199,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/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/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/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..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
@@ -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);
@@ -856,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);
@@ -866,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);
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")
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 f603d0807..f09a531c7 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).getTexture2D();
+ final int activeUnit = GLStateManager.getActiveTextureUnit();
+ final int textureId = GLStateManager.getTextures().getTextureUnitBindings(activeUnit).getTexture2D();
final int srcRgb = GLStateManager.getBlendState().getSrcRgb();
final int dstRgb = GLStateManager.getBlendState().getDstRgb();
final boolean blendEnabled = GLStateManager.getBlendMode().isEnabled();
diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java
index 3d28e8e72..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;
@@ -350,4 +357,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 3e0f8d648..239369364 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"
@@ -59,6 +57,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;
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 extends TileEntity> 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 extends TileEntity> 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 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/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;
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();
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 3a0d2393d..c99b6a87a 100644
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/1.png and b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/1.png differ
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 73293d8fe..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/10.png and /dev/null differ
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 0069435f2..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/11.png and /dev/null differ
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 45d7e6614..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/12.png and /dev/null differ
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 7dca2abc5..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/13.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/14.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/14.png
deleted file mode 100644
index 810d80597..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/14.png and /dev/null differ
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 15de4aea8..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/15.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/16.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/16.png
deleted file mode 100644
index 7332639cb..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/16.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/17.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/17.png
deleted file mode 100644
index 72f7c48f0..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/17.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/18.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/18.png
deleted file mode 100644
index ccb71ef3c..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/18.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/19.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/19.png
deleted file mode 100644
index 64a691689..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/19.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/2.png
index f95fb53b4..c4329584c 100644
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/2.png and b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/2.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/20.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/20.png
deleted file mode 100644
index fbb6edc63..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/20.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/21.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/21.png
deleted file mode 100644
index 01a151ea2..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/21.png and /dev/null differ
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 ad5855d02..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/22.png and /dev/null differ
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 77ae599b6..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/23.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/24.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/24.png
deleted file mode 100644
index c4329584c..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/24.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/25.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/25.png
deleted file mode 100644
index a1284d7b3..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/25.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/26.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/26.png
deleted file mode 100644
index c99b6a87a..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/26.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/27.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/27.png
deleted file mode 100644
index 929ca24db..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/27.png and /dev/null differ
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 8818d434d..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/28.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/29.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/29.png
deleted file mode 100644
index 5d519f425..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/29.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/3.png
index 4b3e44330..f95fb53b4 100644
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/3.png and b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/3.png differ
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 640eb79ab..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/30.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/31.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/31.png
deleted file mode 100644
index f789c188a..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/31.png and /dev/null differ
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 e729c1ed6..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/32.png and /dev/null differ
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 ae04ee53a..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/33.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/34.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/34.png
deleted file mode 100644
index a5e9cdae0..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/34.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/35.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/35.png
deleted file mode 100644
index 0d0ff6619..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/35.png and /dev/null differ
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 ec37179ce..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/36.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/37.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/37.png
deleted file mode 100644
index c451bb3da..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/37.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/38.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/38.png
deleted file mode 100644
index 8c7d6710a..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/38.png and /dev/null differ
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 9c876ecc6..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/39.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/4.png
index e57eaad0c..b45b83bfc 100644
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/4.png and b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/4.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/40.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/40.png
deleted file mode 100644
index 57ae3e416..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/40.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/41.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/41.png
deleted file mode 100644
index 4ba26a466..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/41.png and /dev/null differ
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 f0f2624b3..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/42.png and /dev/null differ
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 3225df413..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/43.png and /dev/null differ
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 11bb6b847..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/44.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/45.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/45.png
deleted file mode 100644
index ed16b0aac..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/45.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/46.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/46.png
deleted file mode 100644
index b45b83bfc..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/46.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/5.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/5.png
deleted file mode 100644
index 94653269b..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/5.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/6.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/6.png
deleted file mode 100644
index 538d6c1f9..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/6.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/7.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/7.png
deleted file mode 100644
index 41ec1dd2a..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/7.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/8.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/8.png
deleted file mode 100644
index fc6d16dfa..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/8.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/9.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/9.png
deleted file mode 100644
index d2cafee9f..000000000
Binary files a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/9.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/glass.properties
index 359790115..db05c1515 100644
--- a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/glass.properties
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/glass.properties
@@ -1,6 +1,6 @@
-matchBlocks=minecraft:glass minecraft:glass_pane
+matchBlocks=glass
metadata=0
-method=ctm
+method=compact
faces=all
-tiles=0-46
-connect=block
\ No newline at end of file
+tiles=0-4
+connect=block
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/glasspane.properties
new file mode 100644
index 000000000..9c502e75b
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/glass/glasspane.properties
@@ -0,0 +1,6 @@
+matchBlocks=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_black/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/0.png
new file mode 100644
index 000000000..06f342797
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/0.png differ
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 000000000..f89157f7b
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/1.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/2.png
new file mode 100644
index 000000000..ee3829173
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/2.png differ
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 000000000..8f57ddc28
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/3.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/4.png
new file mode 100644
index 000000000..4818a5e1a
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_black/4.png differ
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 000000000..38885de79
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/0.png differ
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 000000000..9eb238fce
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/1.png differ
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 000000000..48e9e4544
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/2.png differ
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 000000000..b4df44ac3
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/3.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/4.png
new file mode 100644
index 000000000..5d16a5e44
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/4.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/blue_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/blue_stained_glass.properties
new file mode 100644
index 000000000..e0fb5eae8
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/blue_stained_glass.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass
+metadata=11
+method=compact
+faces=all
+tiles=0-4
+connect=block
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/blue_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/blue_stained_glasspane.properties
new file mode 100644
index 000000000..2a6cfa474
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_blue/blue_stained_glasspane.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass_pane
+metadata=11
+method=compact
+faces=all
+tiles=0-4
+connect=sides
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/0.png
new file mode 100644
index 000000000..259b61c60
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/0.png differ
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 000000000..e1a508c6c
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/1.png differ
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 000000000..395271755
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/2.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/3.png
new file mode 100644
index 000000000..6a2706764
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/3.png differ
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 000000000..8c074b98d
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/4.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/brown_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/brown_stained_glass.properties
new file mode 100644
index 000000000..de90c41b6
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/brown_stained_glass.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass
+metadata=12
+method=compact
+faces=all
+tiles=0-4
+connect=block
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/brown_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/brown_stained_glasspane.properties
new file mode 100644
index 000000000..606f29999
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_brown/brown_stained_glasspane.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass_pane
+metadata=12
+method=compact
+faces=all
+tiles=0-4
+connect=sides
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/0.png
new file mode 100644
index 000000000..d30caa44c
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/0.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/1.png
new file mode 100644
index 000000000..39bc6a737
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/1.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/2.png
new file mode 100644
index 000000000..2625e3097
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/2.png differ
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 000000000..b0c20f3cd
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/3.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/4.png
new file mode 100644
index 000000000..29fbebe05
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/4.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/cyan_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/cyan_stained_glass.properties
new file mode 100644
index 000000000..3c7f07c08
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/cyan_stained_glass.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass
+metadata=9
+method=compact
+faces=all
+tiles=0-4
+connect=block
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/cyan_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/cyan_stained_glasspane.properties
new file mode 100644
index 000000000..af5b1efd0
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_cyan/cyan_stained_glasspane.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass_pane
+metadata=9
+method=compact
+faces=all
+tiles=0-4
+connect=sides
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/0.png
new file mode 100644
index 000000000..3f07a5d89
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/0.png differ
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 000000000..f71006fe2
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/1.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/2.png
new file mode 100644
index 000000000..d2a873d2d
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/2.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/3.png
new file mode 100644
index 000000000..bddbf40b0
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/3.png differ
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 000000000..ba96016c6
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_gray/4.png differ
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 000000000..7c1f4e60b
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/0.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/1.png
new file mode 100644
index 000000000..9ccdaeee3
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/1.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/2.png
new file mode 100644
index 000000000..6ce7f2507
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/2.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/3.png
new file mode 100644
index 000000000..940329521
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/3.png differ
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 000000000..b62f2b834
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_green/4.png differ
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 000000000..b62703d4d
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/0.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/1.png
new file mode 100644
index 000000000..52a179cc5
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/1.png differ
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 000000000..5ef0a45e5
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/2.png differ
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 000000000..b1a13655d
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/3.png differ
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 000000000..57dbc8a74
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/4.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/light_blue_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/light_blue_stained_glass.properties
new file mode 100644
index 000000000..ad184355a
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/light_blue_stained_glass.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass
+metadata=3
+method=compact
+faces=all
+tiles=0-4
+connect=block
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/light_blue_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/light_blue_stained_glasspane.properties
new file mode 100644
index 000000000..8805565ce
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_blue/light_blue_stained_glasspane.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass_pane
+metadata=3
+method=compact
+faces=all
+tiles=0-4
+connect=sides
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/0.png
new file mode 100644
index 000000000..846166468
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/0.png differ
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 000000000..4e3bbd00d
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/1.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/2.png
new file mode 100644
index 000000000..bc4a6748d
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/2.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/3.png
new file mode 100644
index 000000000..3d6fe6cfa
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/3.png differ
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 000000000..b8c31845c
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/4.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/light_gray_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/light_gray_stained_glass.properties
new file mode 100644
index 000000000..8a70a67a2
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/light_gray_stained_glass.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass
+metadata=8
+method=compact
+faces=all
+tiles=0-4
+connect=block
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/light_gray_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/light_gray_stained_glasspane.properties
new file mode 100644
index 000000000..0d2a84f11
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_light_gray/light_gray_stained_glasspane.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass_pane
+metadata=8
+method=compact
+faces=all
+tiles=0-4
+connect=sides
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/0.png
new file mode 100644
index 000000000..f1d3c46a0
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/0.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/1.png
new file mode 100644
index 000000000..550927247
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/1.png differ
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 000000000..10173f811
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/2.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/3.png
new file mode 100644
index 000000000..a2eafb75c
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/3.png differ
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 000000000..a510721a0
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_lime/4.png differ
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 000000000..5cd99450d
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/0.png differ
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 000000000..667af6d17
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/1.png differ
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 000000000..b929d2121
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/2.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/3.png
new file mode 100644
index 000000000..a60c48a9b
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/3.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/4.png
new file mode 100644
index 000000000..0c2c6fcdb
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_magenta/4.png differ
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 000000000..3a29e31b7
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/0.png differ
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 000000000..833541a77
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/1.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/2.png
new file mode 100644
index 000000000..94585579b
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/2.png differ
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 000000000..b8748915a
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/3.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/4.png
new file mode 100644
index 000000000..b2dcce37f
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/4.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/orange_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/orange_stained_glass.properties
new file mode 100644
index 000000000..ac254108a
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/orange_stained_glass.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass
+metadata=1
+method=compact
+faces=all
+tiles=0-4
+connect=block
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/orange_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/orange_stained_glasspane.properties
new file mode 100644
index 000000000..0e1fb3ed1
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_orange/orange_stained_glasspane.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass_pane
+metadata=1
+method=compact
+faces=all
+tiles=0-4
+connect=sides
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/0.png
new file mode 100644
index 000000000..42d8739db
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/0.png differ
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 000000000..c9f0164aa
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/1.png differ
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 000000000..ef4fc0ec2
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/2.png differ
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 000000000..54bdb04dd
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/3.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/4.png
new file mode 100644
index 000000000..102bed45e
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_pink/4.png differ
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 000000000..fcae3d262
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/0.png differ
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 000000000..387adff7f
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/1.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/2.png
new file mode 100644
index 000000000..edb25b90e
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/2.png differ
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 000000000..3e694c391
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/3.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/4.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/4.png
new file mode 100644
index 000000000..94cda6c4a
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/4.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/purple_stained_glass.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/purple_stained_glass.properties
new file mode 100644
index 000000000..f550606d5
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/purple_stained_glass.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass
+metadata=10
+method=compact
+faces=all
+tiles=0-4
+connect=block
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/purple_stained_glasspane.properties b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/purple_stained_glasspane.properties
new file mode 100644
index 000000000..d8eadb9db
--- /dev/null
+++ b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_purple/purple_stained_glasspane.properties
@@ -0,0 +1,6 @@
+matchBlocks=stained_glass_pane
+metadata=10
+method=compact
+faces=all
+tiles=0-4
+connect=sides
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/0.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/0.png
new file mode 100644
index 000000000..db4c5eb7a
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/0.png differ
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 000000000..b861c3db5
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/1.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/2.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/2.png
new file mode 100644
index 000000000..3a5a728d0
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/2.png differ
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 000000000..b9977cb86
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/3.png differ
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 000000000..cedc6cd9b
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_red/4.png differ
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 000000000..696c5aabd
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/0.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/1.png
new file mode 100644
index 000000000..470dc2893
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/1.png differ
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 000000000..bafcc73b7
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/2.png differ
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 000000000..adfe6eef7
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/3.png differ
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 000000000..3bfca5b5f
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_white/4.png differ
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 000000000..8e48e1207
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/0.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/1.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/1.png
new file mode 100644
index 000000000..c8bd2fabf
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/1.png differ
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 000000000..e739b9345
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/2.png differ
diff --git a/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/3.png b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/3.png
new file mode 100644
index 000000000..d54bcbffa
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/3.png differ
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 000000000..d0c4c5e78
Binary files /dev/null and b/src/main/resources/assets/minecraft/mcpatcher/ctm/stained_glass/glass_yellow/4.png differ
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
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;
diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinTileEntity.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinTileEntity.java
index 0998edb79..c6579368f 100644
--- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinTileEntity.java
+++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinTileEntity.java
@@ -52,7 +52,7 @@ public abstract class MixinTileEntity implements ITileEntityBoundingBoxCache {
@Unique private int angelica$cachedBBMetadata = -1;
@Unique private Block angelica$cachedBBBlockType = null;
@Unique private AxisAlignedBB angelica$cachedRenderBB = null;
- @Unique private byte angelica$infiniteExtentCached = 0; // 0 = unchecked, 1 = finite, 2 = infinite
+ @Unique private byte angelica$boundsClassCached = 0; // 0 = unchecked, otherwise STATIC/INFINITE/DYNAMIC
/**
* @author mitchej123
@@ -114,11 +114,10 @@ public abstract class MixinTileEntity implements ITileEntityBoundingBoxCache {
}
@Override
- public boolean angelica$isInfiniteExtent() {
- if (angelica$infiniteExtentCached == 0) {
- final boolean isInfinite = TileEntityRenderBoundsRegistry.isAlwaysInfiniteExtent((TileEntity) (Object) this);
- angelica$infiniteExtentCached = isInfinite ? (byte) 2 : (byte) 1;
+ public byte angelica$boundsClass() {
+ if (angelica$boundsClassCached == 0) {
+ angelica$boundsClassCached = TileEntityRenderBoundsRegistry.classify((TileEntity) (Object) this);
}
- return angelica$infiniteExtentCached == 2;
+ return angelica$boundsClassCached;
}
}
diff --git a/src/test/java/com/gtnewhorizons/angelica/api/GLRedirectsTest.java b/src/test/java/com/gtnewhorizons/angelica/api/GLRedirectsTest.java
index 904825cb2..005af05e8 100644
--- a/src/test/java/com/gtnewhorizons/angelica/api/GLRedirectsTest.java
+++ b/src/test/java/com/gtnewhorizons/angelica/api/GLRedirectsTest.java
@@ -64,6 +64,7 @@ class GLRedirectsTest {
"GL30, glBindVertexArray, glBindVertexArray",
"GL30, glGenerateMipmap, glGenerateMipmap",
"GL31, glDrawElementsInstanced, glDrawElementsInstanced",
+ "GL31, glDrawArraysInstanced, glDrawArraysInstanced",
"GL33, glGenSamplers, glGenSamplers",
"GL33, glBindSampler, glBindSampler",
"GL42, glTexStorage2D, glTexStorage2D",
@@ -98,6 +99,10 @@ class GLRedirectsTest {
"ARBShaderObjects, glGetUniformLocationARB, glGetUniformLocation",
"ARBVertexArrayObject, glBindVertexArray, glBindVertexArray",
"ARBInstancedArrays, glVertexAttribDivisorARB, glVertexAttribDivisorARB",
+ "ARBDrawInstanced, glDrawArraysInstancedARB, glDrawArraysInstanced",
+ "ARBDrawInstanced, glDrawElementsInstancedARB, glDrawElementsInstanced",
+ "EXTDrawInstanced, glDrawArraysInstancedEXT, glDrawArraysInstanced",
+ "EXTDrawInstanced, glDrawElementsInstancedEXT, glDrawElementsInstanced",
"APPLEVertexArrayObject, glBindVertexArrayAPPLE, glBindVertexArray",
"UniversalVAO, bindVertexArray, glBindVertexArray",
"UniversalVAO, deleteVertexArrays, glDeleteVertexArrays",