fix: return cc:r textures except advanced gui corners

src/main/java/dan200/computercraft/fabric/mixin/MixinItemFrameEntityRenderer.java

@@ -43,7 +43,7 @@ public class MixinItemFrameEntityRenderer
         {
             int light = itemFrameEntity.getType() == EntityType.GLOW_ITEM_FRAME ? 0xf000d2 : itemFrameEntityLight; // See getLightVal.
             ItemPrintoutRenderer.INSTANCE.renderInFrame( matrixStack, vertexConsumerProvider, stack, light );
-            // TODO: need to find how to make if instead return, like it doing Forge
+            // TODO: need to find how to make if statement instead return, like it doing Forge
             matrixStack.pop();
             info.cancel();
         }

src/main/resources/assets/computercraft/shaders/monitor.frag

@@ -1,40 +0,0 @@
-#version 140
-
-#define FONT_WIDTH 6.0
-#define FONT_HEIGHT 9.0
-
-uniform sampler2D u_font;
-uniform int u_width;
-uniform int u_height;
-uniform usamplerBuffer u_tbo;
-uniform vec3 u_palette[16];
-
-in vec2 f_pos;
-
-out vec4 colour;
-
-vec2 texture_corner(int index) {
-    float x = 1.0 + float(index % 16) * (FONT_WIDTH + 2.0);
-    float y = 1.0 + float(index / 16) * (FONT_HEIGHT + 2.0);
-    return vec2(x, y);
-}
-
-void main() {
-    vec2 term_pos = vec2(f_pos.x / FONT_WIDTH, f_pos.y / FONT_HEIGHT);
-    vec2 corner = floor(term_pos);
-
-    ivec2 cell = ivec2(corner);
-    int index = 3 * (clamp(cell.x, 0, u_width - 1) + clamp(cell.y, 0, u_height - 1) * u_width);
-
-    // 1 if 0 <= x, y < width, height, 0 otherwise
-    vec2 outside = step(vec2(0.0, 0.0), vec2(cell)) * step(vec2(cell), vec2(float(u_width) - 1.0, float(u_height) - 1.0));
-    float mult = outside.x * outside.y;
-
-    int character = int(texelFetch(u_tbo, index).r);
-    int fg = int(texelFetch(u_tbo, index + 1).r);
-    int bg = int(texelFetch(u_tbo, index + 2).r);
-
-    vec2 pos = (term_pos - corner) * vec2(FONT_WIDTH, FONT_HEIGHT);
-    vec4 img = texture(u_font, (texture_corner(character) + pos) / 256.0);
-    colour = vec4(mix(u_palette[bg], img.rgb * u_palette[fg], img.a * mult), 1.0);
-}

src/main/resources/assets/computercraft/shaders/monitor.vert

@@ -1,12 +0,0 @@
-#version 130
-
-uniform mat4 u_mv;
-
-in vec3 v_pos;
-
-out vec2 f_pos;
-
-void main() {
-    gl_Position = gl_ProjectionMatrix * u_mv * vec4(v_pos.x, v_pos.y, 0, 1);
-    f_pos = v_pos.xy;
-}

src/main/resources/assets/computercraft/shaders/monitor_tbo.fsh

@@ -1,40 +0,0 @@
-#version 150
-
-#define FONT_WIDTH 6.0
-#define FONT_HEIGHT 9.0
-
-uniform sampler2D Sampler0; // Font
-uniform int Width;
-uniform int Height;
-uniform usamplerBuffer Tbo;
-uniform vec3 Palette[16];
-
-in vec2 f_pos;
-
-out vec4 colour;
-
-vec2 texture_corner(int index) {
-    float x = 1.0 + float(index % 16) * (FONT_WIDTH + 2.0);
-    float y = 1.0 + float(index / 16) * (FONT_HEIGHT + 2.0);
-    return vec2(x, y);
-}
-
-void main() {
-    vec2 term_pos = vec2(f_pos.x / FONT_WIDTH, f_pos.y / FONT_HEIGHT);
-    vec2 corner = floor(term_pos);
-
-    ivec2 cell = ivec2(corner);
-    int index = 3 * (clamp(cell.x, 0, Width - 1) + clamp(cell.y, 0, Height - 1) * Width);
-
-    // 1 if 0 <= x, y < Width, Height, 0 otherwise
-    vec2 outside = step(vec2(0.0, 0.0), vec2(cell)) * step(vec2(cell), vec2(float(Width) - 1.0, float(Height) - 1.0));
-    float mult = outside.x * outside.y;
-
-    int character = int(texelFetch(Tbo, index).r);
-    int fg = int(texelFetch(Tbo, index + 1).r);
-    int bg = int(texelFetch(Tbo, index + 2).r);
-
-    vec2 pos = (term_pos - corner) * vec2(FONT_WIDTH, FONT_HEIGHT);
-    vec4 img = texture(Sampler0, (texture_corner(character) + pos) / 256.0);
-    colour = vec4(mix(Palette[bg], img.rgb * Palette[fg], img.a * mult), 1.0);
-}

src/main/resources/assets/computercraft/shaders/monitor_tbo.json

@@ -1,13 +0,0 @@
-{
-    "vertex": "computercraft:monitor_tbo",
-    "fragment": "computercraft:monitor_tbo",
-    "attributes": [ "Position" ],
-    "samplers": [ { "name": "Sampler0" } ],
-    "uniforms": [
-        { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "Width", "type": "int", "count": 1, "values": [ 1 ] },
-        { "name": "Height", "type": "int", "count": 1, "values": [ 1 ] },
-        { "name": "Tbo", "type": "int", "count": 1, "values": [ 3 ] }
-    ]
-}

src/main/resources/assets/computercraft/shaders/monitor_tbo.vsh

@@ -1,14 +0,0 @@
-#version 150
-
-in vec3 Position;
-in vec2 UV0;
-
-uniform mat4 ModelViewMat;
-uniform mat4 ProjMat;
-
-out vec2 f_pos;
-
-void main() {
-    gl_Position = ProjMat * ModelViewMat * vec4(Position, 1);
-    f_pos = UV0;
-}