diff --git a/src/main/java/dan200/computercraft/fabric/mixin/MixinItemFrameEntityRenderer.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinItemFrameEntityRenderer.java index 0f1dd7818..92ba04c51 100644 --- a/src/main/java/dan200/computercraft/fabric/mixin/MixinItemFrameEntityRenderer.java +++ b/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(); } diff --git a/src/main/resources/assets/computercraft/shaders/monitor.frag b/src/main/resources/assets/computercraft/shaders/monitor.frag deleted file mode 100644 index f19a6a9eb..000000000 --- a/src/main/resources/assets/computercraft/shaders/monitor.frag +++ /dev/null @@ -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); -} diff --git a/src/main/resources/assets/computercraft/shaders/monitor.vert b/src/main/resources/assets/computercraft/shaders/monitor.vert deleted file mode 100644 index 15b81fbb7..000000000 --- a/src/main/resources/assets/computercraft/shaders/monitor.vert +++ /dev/null @@ -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; -} diff --git a/src/main/resources/assets/computercraft/shaders/monitor_tbo.fsh b/src/main/resources/assets/computercraft/shaders/monitor_tbo.fsh deleted file mode 100644 index f89635ca5..000000000 --- a/src/main/resources/assets/computercraft/shaders/monitor_tbo.fsh +++ /dev/null @@ -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); -} diff --git a/src/main/resources/assets/computercraft/shaders/monitor_tbo.json b/src/main/resources/assets/computercraft/shaders/monitor_tbo.json deleted file mode 100644 index 8f9a900d6..000000000 --- a/src/main/resources/assets/computercraft/shaders/monitor_tbo.json +++ /dev/null @@ -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 ] } - ] -} diff --git a/src/main/resources/assets/computercraft/shaders/monitor_tbo.vsh b/src/main/resources/assets/computercraft/shaders/monitor_tbo.vsh deleted file mode 100644 index 8b673710b..000000000 --- a/src/main/resources/assets/computercraft/shaders/monitor_tbo.vsh +++ /dev/null @@ -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; -} diff --git a/src/main/resources/assets/computercraft/textures/block/cable_core.png b/src/main/resources/assets/computercraft/textures/block/cable_core.png index 184b644c0..53566f532 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/cable_core.png and b/src/main/resources/assets/computercraft/textures/block/cable_core.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/cable_side.png b/src/main/resources/assets/computercraft/textures/block/cable_side.png index 148adec7a..137538c87 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/cable_side.png and b/src/main/resources/assets/computercraft/textures/block/cable_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_advanced_front.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front.png index ccf1ab916..feb0e5a2b 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_advanced_front.png and b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png index 8c29b0e49..e53bda37f 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png and b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_on.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_on.png index 49fea014b..4f560654d 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_on.png and b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_advanced_side.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_side.png index b2cd71abb..819d7dd82 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_advanced_side.png and b/src/main/resources/assets/computercraft/textures/block/computer_advanced_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_advanced_top.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_top.png index 389261c2d..acc566858 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_advanced_top.png and b/src/main/resources/assets/computercraft/textures/block/computer_advanced_top.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_command_front.png b/src/main/resources/assets/computercraft/textures/block/computer_command_front.png index 9bbd09637..c6d5577b4 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_command_front.png and b/src/main/resources/assets/computercraft/textures/block/computer_command_front.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png b/src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png index be746fcb3..aaab241fb 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png and b/src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_command_front_on.png b/src/main/resources/assets/computercraft/textures/block/computer_command_front_on.png index 1d5d38f75..ffe5856bc 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_command_front_on.png and b/src/main/resources/assets/computercraft/textures/block/computer_command_front_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_command_side.png b/src/main/resources/assets/computercraft/textures/block/computer_command_side.png index 227f0f294..b8f381c50 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_command_side.png and b/src/main/resources/assets/computercraft/textures/block/computer_command_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_command_top.png b/src/main/resources/assets/computercraft/textures/block/computer_command_top.png index 669eadfee..e8a21e0c4 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_command_top.png and b/src/main/resources/assets/computercraft/textures/block/computer_command_top.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_normal_front.png b/src/main/resources/assets/computercraft/textures/block/computer_normal_front.png index bb9aa4975..f89a53b07 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_normal_front.png and b/src/main/resources/assets/computercraft/textures/block/computer_normal_front.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png b/src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png index ba62d067e..76ddd92e8 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png and b/src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_normal_front_on.png b/src/main/resources/assets/computercraft/textures/block/computer_normal_front_on.png index d87bcac8f..c6bc48f41 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_normal_front_on.png and b/src/main/resources/assets/computercraft/textures/block/computer_normal_front_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_normal_side.png b/src/main/resources/assets/computercraft/textures/block/computer_normal_side.png index 55a1c633f..25ceb7800 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_normal_side.png and b/src/main/resources/assets/computercraft/textures/block/computer_normal_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/computer_normal_top.png b/src/main/resources/assets/computercraft/textures/block/computer_normal_top.png index 932df74c9..749fb06e4 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_normal_top.png and b/src/main/resources/assets/computercraft/textures/block/computer_normal_top.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/disk_drive_front.png b/src/main/resources/assets/computercraft/textures/block/disk_drive_front.png index 2a749d240..dc48b3cd0 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/disk_drive_front.png and b/src/main/resources/assets/computercraft/textures/block/disk_drive_front.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/disk_drive_front_accepted.png b/src/main/resources/assets/computercraft/textures/block/disk_drive_front_accepted.png index 8dd30d905..348654e7b 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/disk_drive_front_accepted.png and b/src/main/resources/assets/computercraft/textures/block/disk_drive_front_accepted.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/disk_drive_front_rejected.png b/src/main/resources/assets/computercraft/textures/block/disk_drive_front_rejected.png index 2a71b664f..1856eda95 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/disk_drive_front_rejected.png and b/src/main/resources/assets/computercraft/textures/block/disk_drive_front_rejected.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/disk_drive_side.png b/src/main/resources/assets/computercraft/textures/block/disk_drive_side.png index 55a1c633f..25ceb7800 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/disk_drive_side.png and b/src/main/resources/assets/computercraft/textures/block/disk_drive_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/disk_drive_top.png b/src/main/resources/assets/computercraft/textures/block/disk_drive_top.png index 932df74c9..749fb06e4 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/disk_drive_top.png and b/src/main/resources/assets/computercraft/textures/block/disk_drive_top.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_0.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_0.png index 3b60ac4fd..e4ac69050 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_0.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_0.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_1.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_1.png index 5198f9a94..5a32437cc 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_1.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_1.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_15.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_15.png index 4b547fd0d..8b5f7738e 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_15.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_15.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_16.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_16.png index d2ce35864..50a2b1436 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_16.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_16.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_17.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_17.png index aaccdcb99..92ae9ad76 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_17.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_17.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_18.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_18.png index 6186ff715..b5cbf0cec 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_18.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_18.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_19.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_19.png index 082c431c5..8a6c2a0c2 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_19.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_19.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_2.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_2.png index 05fdf5b2d..482654890 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_2.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_2.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_20.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_20.png index 6791dbe68..19b5f1180 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_20.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_20.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_21.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_21.png index 519c820f1..78093f097 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_21.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_21.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_22.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_22.png index c2f1da5bd..d2fa6490c 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_22.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_22.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_23.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_23.png index f46f808d2..f82b05c55 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_23.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_23.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_24.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_24.png index 63c5b04b2..8adac6dc7 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_24.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_24.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_25.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_25.png index d9b01ceb1..129ebffab 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_25.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_25.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_26.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_26.png index c72ad8bdb..99abe3412 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_26.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_26.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_27.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_27.png index 96729e159..55b8c22f9 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_27.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_27.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_28.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_28.png index 6babfaac3..924026939 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_28.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_28.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_29.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_29.png index 4b4a51090..4423bece2 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_29.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_29.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_3.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_3.png index 2d1837cbf..380a7a4ec 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_3.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_3.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_30.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_30.png index 572fa1a1f..1c6e5dbf9 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_30.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_30.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_31.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_31.png index a10166751..0d3386cce 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_31.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_31.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_32.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_32.png index 5fd8dd8ea..b91e05461 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_32.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_32.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_33.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_33.png index 3b0cf13cc..b8c3862cf 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_33.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_33.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_34.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_34.png index fd94783bf..0ba4eda3c 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_34.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_34.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_35.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_35.png index fb3c23291..85a99d251 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_35.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_35.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_36.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_36.png index 54f957fde..0f3214a58 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_36.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_36.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_37.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_37.png index 5e40eb9a4..ec29d0ef7 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_37.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_37.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_38.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_38.png index 6f32ae9f1..ba356046b 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_38.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_38.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_39.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_39.png index 4d62e8a80..43b789d83 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_39.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_39.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_4.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_4.png index 5fd8dd8ea..b91e05461 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_4.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_4.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_40.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_40.png index 269f24ec5..c9d6a2241 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_40.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_40.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_41.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_41.png index fcf256eec..25f78157c 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_41.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_41.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_42.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_42.png index 7aa10b315..cfa985fee 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_42.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_42.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_43.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_43.png index c718b7ebb..2582b9f4a 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_43.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_43.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_44.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_44.png index 4d91742bc..82110c0c3 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_44.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_44.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_45.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_45.png index 9ee48c8b4..8b6c5c63b 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_45.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_45.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_46.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_46.png index 59d0f0d78..51029de9f 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_46.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_46.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_47.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_47.png index 9529d3c1e..a9fbe21ff 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_47.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_47.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_5.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_5.png index 6f32ae9f1..b78ab90fe 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_5.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_5.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_6.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_6.png index 5e40eb9a4..ec29d0ef7 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_6.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_6.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_7.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_7.png index 54f957fde..201cfae47 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_advanced_7.png and b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_7.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_0.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_0.png index 932df74c9..b8d7fd680 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_0.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_0.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_1.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_1.png index 9b8e541b5..551a5b339 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_1.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_1.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_15.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_15.png index d26ff56b9..39616a9fc 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_15.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_15.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_16.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_16.png index 3f007142c..ae75f167a 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_16.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_16.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_17.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_17.png index e7f90c3c9..a12a3a87d 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_17.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_17.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_18.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_18.png index 1425de965..a4aa30f96 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_18.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_18.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_19.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_19.png index 59ff8bedb..66f9bdb6b 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_19.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_19.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_2.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_2.png index 3c6e465ec..6cbef2145 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_2.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_2.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_20.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_20.png index e65d6f6b7..baa6248ef 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_20.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_20.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_21.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_21.png index 953663a9c..73a607b98 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_21.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_21.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_22.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_22.png index 565bb3935..c0594c87f 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_22.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_22.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_23.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_23.png index aeb4f6fc8..bd29cb1c2 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_23.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_23.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_24.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_24.png index 0045efbda..ea984ebb4 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_24.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_24.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_25.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_25.png index ffea7b8e0..1a600f3d9 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_25.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_25.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_26.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_26.png index 9d047e8d0..e70d39c2c 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_26.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_26.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_27.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_27.png index 96729e159..55b8c22f9 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_27.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_27.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_28.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_28.png index 76dec1c8b..560708ae3 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_28.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_28.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_29.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_29.png index c8170d688..79def9734 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_29.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_29.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_3.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_3.png index e42cd59c9..85989a309 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_3.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_3.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_30.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_30.png index 45eb7903f..6a091b139 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_30.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_30.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_31.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_31.png index 92d439fc7..08fce59c3 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_31.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_31.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_32.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_32.png index 55a1c633f..e8eef8717 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_32.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_32.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_33.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_33.png index 881d99de8..4ef6a0a3e 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_33.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_33.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_34.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_34.png index 068a59ba6..3657b7967 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_34.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_34.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_35.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_35.png index 87f763048..e663d803e 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_35.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_35.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_36.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_36.png index 938501b40..a0482397e 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_36.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_36.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_37.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_37.png index a970f8175..5eff49364 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_37.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_37.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_38.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_38.png index 91f52201b..b067ff250 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_38.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_38.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_39.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_39.png index c0dc753b6..dbb0e7c45 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_39.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_39.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_4.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_4.png index 55a1c633f..e8eef8717 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_4.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_4.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_40.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_40.png index 53b6811e3..ba7cabece 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_40.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_40.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_41.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_41.png index 79997fd0d..84ba36bbe 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_41.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_41.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_42.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_42.png index 9053f3261..8885b15bd 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_42.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_42.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_43.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_43.png index 95bbf5706..ec00c8bf5 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_43.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_43.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_44.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_44.png index 1b9270112..f958e6fee 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_44.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_44.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_45.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_45.png index 845e7fa93..c52b458f5 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_45.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_45.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_46.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_46.png index d4cc702af..35a0a0a6c 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_46.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_46.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_47.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_47.png index e2e08d5ef..fed629e55 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_47.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_47.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_5.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_5.png index 91f52201b..b067ff250 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_5.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_5.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_6.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_6.png index a970f8175..5eff49364 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_6.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_6.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/monitor_normal_7.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_7.png index 938501b40..a0482397e 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/monitor_normal_7.png and b/src/main/resources/assets/computercraft/textures/block/monitor_normal_7.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/printer_front_both_trays.png b/src/main/resources/assets/computercraft/textures/block/printer_front_both_trays.png index a3acf1b94..63f068772 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/printer_front_both_trays.png and b/src/main/resources/assets/computercraft/textures/block/printer_front_both_trays.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/printer_front_bottom_tray.png b/src/main/resources/assets/computercraft/textures/block/printer_front_bottom_tray.png index c057bf0ed..4597f28df 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/printer_front_bottom_tray.png and b/src/main/resources/assets/computercraft/textures/block/printer_front_bottom_tray.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/printer_front_empty.png b/src/main/resources/assets/computercraft/textures/block/printer_front_empty.png index 166163ce9..915b530df 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/printer_front_empty.png and b/src/main/resources/assets/computercraft/textures/block/printer_front_empty.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/printer_front_top_tray.png b/src/main/resources/assets/computercraft/textures/block/printer_front_top_tray.png index 94800919f..47db8fa95 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/printer_front_top_tray.png and b/src/main/resources/assets/computercraft/textures/block/printer_front_top_tray.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/printer_side.png b/src/main/resources/assets/computercraft/textures/block/printer_side.png index 55a1c633f..25ceb7800 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/printer_side.png and b/src/main/resources/assets/computercraft/textures/block/printer_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/printer_top.png b/src/main/resources/assets/computercraft/textures/block/printer_top.png index 932df74c9..749fb06e4 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/printer_top.png and b/src/main/resources/assets/computercraft/textures/block/printer_top.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/speaker_front.png b/src/main/resources/assets/computercraft/textures/block/speaker_front.png index 57a9717f8..8368f65d7 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/speaker_front.png and b/src/main/resources/assets/computercraft/textures/block/speaker_front.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/speaker_side.png b/src/main/resources/assets/computercraft/textures/block/speaker_side.png index 55a1c633f..25ceb7800 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/speaker_side.png and b/src/main/resources/assets/computercraft/textures/block/speaker_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/speaker_top.png b/src/main/resources/assets/computercraft/textures/block/speaker_top.png index 932df74c9..749fb06e4 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/speaker_top.png and b/src/main/resources/assets/computercraft/textures/block/speaker_top.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/turtle_advanced.png b/src/main/resources/assets/computercraft/textures/block/turtle_advanced.png index cf617d963..90a63842c 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/turtle_advanced.png and b/src/main/resources/assets/computercraft/textures/block/turtle_advanced.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/turtle_colour.png b/src/main/resources/assets/computercraft/textures/block/turtle_colour.png index 9d3fb89d6..2a65aab2a 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/turtle_colour.png and b/src/main/resources/assets/computercraft/textures/block/turtle_colour.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/turtle_crafty_face.png b/src/main/resources/assets/computercraft/textures/block/turtle_crafty_face.png index b569b62fc..218f11eed 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/turtle_crafty_face.png and b/src/main/resources/assets/computercraft/textures/block/turtle_crafty_face.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/turtle_elf_overlay.png b/src/main/resources/assets/computercraft/textures/block/turtle_elf_overlay.png index 9b7814a1d..00ebec95c 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/turtle_elf_overlay.png and b/src/main/resources/assets/computercraft/textures/block/turtle_elf_overlay.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/turtle_normal.png b/src/main/resources/assets/computercraft/textures/block/turtle_normal.png index 93f0d75ac..ddf4a92e6 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/turtle_normal.png and b/src/main/resources/assets/computercraft/textures/block/turtle_normal.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/turtle_speaker_face.png b/src/main/resources/assets/computercraft/textures/block/turtle_speaker_face.png index e796b1393..83da5eae5 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/turtle_speaker_face.png and b/src/main/resources/assets/computercraft/textures/block/turtle_speaker_face.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/wired_modem_face.png b/src/main/resources/assets/computercraft/textures/block/wired_modem_face.png index ad0deca0e..80cbd86d9 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/wired_modem_face.png and b/src/main/resources/assets/computercraft/textures/block/wired_modem_face.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/wired_modem_face_on.png b/src/main/resources/assets/computercraft/textures/block/wired_modem_face_on.png index 14837c44c..1e9e21aea 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/wired_modem_face_on.png and b/src/main/resources/assets/computercraft/textures/block/wired_modem_face_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/wired_modem_face_peripheral.png b/src/main/resources/assets/computercraft/textures/block/wired_modem_face_peripheral.png index 278193c21..48d462b2a 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/wired_modem_face_peripheral.png and b/src/main/resources/assets/computercraft/textures/block/wired_modem_face_peripheral.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/wired_modem_face_peripheral_on.png b/src/main/resources/assets/computercraft/textures/block/wired_modem_face_peripheral_on.png index 71c108025..d1970edd1 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/wired_modem_face_peripheral_on.png and b/src/main/resources/assets/computercraft/textures/block/wired_modem_face_peripheral_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face.png b/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face.png index 90d976e72..24ba52a78 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face.png and b/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face_on.png b/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face_on.png index e4e6eae41..b92d0f79f 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face_on.png and b/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face.png b/src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face.png index a2b223816..2fce9fa32 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face.png and b/src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face_on.png b/src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face_on.png index cfbcb2909..fcdb5da14 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face_on.png and b/src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/disk_drive.png b/src/main/resources/assets/computercraft/textures/gui/disk_drive.png index fc65203bf..b4e5b9537 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/disk_drive.png and b/src/main/resources/assets/computercraft/textures/gui/disk_drive.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/printer.png b/src/main/resources/assets/computercraft/textures/gui/printer.png index 81ecfe272..c3dd9af0f 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/printer.png and b/src/main/resources/assets/computercraft/textures/gui/printer.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/printout.png b/src/main/resources/assets/computercraft/textures/gui/printout.png index 16ee7b353..7ae1abd35 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/printout.png and b/src/main/resources/assets/computercraft/textures/gui/printout.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png b/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png index 74a149a47..b746b0ad9 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png and b/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png b/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png index 83b6a882e..4ac3eee08 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png and b/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/disk_frame.png b/src/main/resources/assets/computercraft/textures/item/disk_frame.png index 951b8b1f1..42f93e137 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/disk_frame.png and b/src/main/resources/assets/computercraft/textures/item/disk_frame.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/pocket_computer_advanced.png b/src/main/resources/assets/computercraft/textures/item/pocket_computer_advanced.png index 3e66d42a9..96015e297 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/pocket_computer_advanced.png and b/src/main/resources/assets/computercraft/textures/item/pocket_computer_advanced.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/pocket_computer_blink.png b/src/main/resources/assets/computercraft/textures/item/pocket_computer_blink.png index 12132ccf6..2474f6baf 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/pocket_computer_blink.png and b/src/main/resources/assets/computercraft/textures/item/pocket_computer_blink.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/pocket_computer_colour.png b/src/main/resources/assets/computercraft/textures/item/pocket_computer_colour.png index d4086e4ad..426015e6c 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/pocket_computer_colour.png and b/src/main/resources/assets/computercraft/textures/item/pocket_computer_colour.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/pocket_computer_frame.png b/src/main/resources/assets/computercraft/textures/item/pocket_computer_frame.png index 789d52dc2..1f27b7ea9 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/pocket_computer_frame.png and b/src/main/resources/assets/computercraft/textures/item/pocket_computer_frame.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/pocket_computer_light.png b/src/main/resources/assets/computercraft/textures/item/pocket_computer_light.png index 3a416b3db..52f186fc7 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/pocket_computer_light.png and b/src/main/resources/assets/computercraft/textures/item/pocket_computer_light.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/pocket_computer_normal.png b/src/main/resources/assets/computercraft/textures/item/pocket_computer_normal.png index 6795ec929..0ee14134b 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/pocket_computer_normal.png and b/src/main/resources/assets/computercraft/textures/item/pocket_computer_normal.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/pocket_computer_on.png b/src/main/resources/assets/computercraft/textures/item/pocket_computer_on.png index c25ffc856..c0d3956bb 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/pocket_computer_on.png and b/src/main/resources/assets/computercraft/textures/item/pocket_computer_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/printed_book.png b/src/main/resources/assets/computercraft/textures/item/printed_book.png index fb3cd3a9e..4be66b368 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/printed_book.png and b/src/main/resources/assets/computercraft/textures/item/printed_book.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/printed_page.png b/src/main/resources/assets/computercraft/textures/item/printed_page.png index 4b83e573b..7863f7012 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/printed_page.png and b/src/main/resources/assets/computercraft/textures/item/printed_page.png differ diff --git a/src/main/resources/assets/computercraft/textures/item/printed_pages.png b/src/main/resources/assets/computercraft/textures/item/printed_pages.png index 5ccfb9e66..dc6a5f23b 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/printed_pages.png and b/src/main/resources/assets/computercraft/textures/item/printed_pages.png differ diff --git a/src/main/resources/cc.accesswidener b/src/main/resources/cc.accesswidener index ff0086ba7..cb9b4b774 100644 --- a/src/main/resources/cc.accesswidener +++ b/src/main/resources/cc.accesswidener @@ -5,9 +5,4 @@ accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;Lnet/minecraft/client/render/VertexFormat;Lnet/minecraft/client/render/VertexFormat$DrawMode;IZZLnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase; accessible class net/minecraft/client/render/RenderPhase$Shader -accessible field net/minecraft/client/render/RenderPhase ALL_MASK Lnet/minecraft/client/render/RenderPhase$WriteMaskState; -accessible field net/minecraft/client/render/RenderPhase LIGHTNING_TRANSPARENCY Lnet/minecraft/client/render/RenderPhase$Transparency; -accessible field net/minecraft/client/render/RenderPhase TRANSLUCENT_TRANSPARENCY Lnet/minecraft/client/render/RenderPhase$Transparency; -accessible field net/minecraft/client/render/RenderPhase WEATHER_TARGET Lnet/minecraft/client/render/RenderPhase$Target; -accessible field net/minecraft/client/render/RenderPhase DISABLE_LIGHTMAP Lnet/minecraft/client/render/RenderPhase$Lightmap; accessible class net/minecraft/client/render/RenderPhase$Texture diff --git a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_advanced.png b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_advanced.png index 12a080626..4da80a9bc 100644 Binary files a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_advanced.png and b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_advanced.png differ diff --git a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_command.png b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_command.png index 1bd3c311a..0a96d54ff 100644 Binary files a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_command.png and b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_command.png differ diff --git a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_normal.png b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_normal.png index be4cd974b..3627eaf3e 100644 Binary files a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_normal.png and b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_normal.png differ diff --git a/src/main/resources/resourcepacks/classic/pack.mcmeta b/src/main/resources/resourcepacks/classic/pack.mcmeta index 453fcc72a..0450878b5 100644 --- a/src/main/resources/resourcepacks/classic/pack.mcmeta +++ b/src/main/resources/resourcepacks/classic/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 6, + "pack_format": 7, "description": "The clasic look of ComputerCraft" } }