make CTM work, remove 1.16 panorama and cum water

2026-04-17 08:46:58 -04:00 · 2021-03-31 13:22:19 +02:00
parent 2122ef9cc0
commit 3f71917148
43 changed files with 32 additions and 40 deletions
--- a/assets/minecraft/mcpatcher/ctm/glass/black_stained_glass/black_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/black_stained_glass/black_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=black_stained_glass
+matchBlocks=95:15
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/black_stained_glass/black_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/black_stained_glass/black_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=black_stained_glass_pane
+matchBlocks=160:15
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/blue_stained_glass/blue_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/blue_stained_glass/blue_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=blue_stained_glass
+matchBlocks=95:11
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/blue_stained_glass/blue_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/blue_stained_glass/blue_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=blue_stained_glass_pane
+matchBlocks=160:11
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/brown_stained_glass/brown_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/brown_stained_glass/brown_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=brown_stained_glass
+matchBlocks=95:12
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/brown_stained_glass/brown_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/brown_stained_glass/brown_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=brown_stained_glass_pane
+matchBlocks=160:12
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/cyan_stained_glass/cyan_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/cyan_stained_glass/cyan_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=cyan_stained_glass
+matchBlocks=95:9
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/cyan_stained_glass/cyan_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/cyan_stained_glass/cyan_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=cyan_stained_glass_pane
+matchBlocks=160:9
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/gray_stained_glass/gray_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/gray_stained_glass/gray_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=gray_stained_glass
+matchBlocks=95:7
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/gray_stained_glass/gray_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/gray_stained_glass/gray_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=gray_stained_glass_pane
+matchBlocks=160:7
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/green_stained_glass/green_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/green_stained_glass/green_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=green_stained_glass
+matchBlocks=95:13
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/green_stained_glass/green_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/green_stained_glass/green_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=green_stained_glass_pane
+matchBlocks=160:13
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/light_blue_stained_glass/light_blue_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/light_blue_stained_glass/light_blue_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=light_blue_stained_glass
+matchBlocks=95:3
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/light_blue_stained_glass/light_blue_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/light_blue_stained_glass/light_blue_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=light_blue_stained_glass_pane
+matchBlocks=160:3
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/light_gray_stained_glass/light_gray_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/light_gray_stained_glass/light_gray_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=light_gray_stained_glass
+matchBlocks=95:8
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/light_gray_stained_glass/light_gray_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/light_gray_stained_glass/light_gray_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=light_gray_stained_glass_pane
+matchBlocks=160:8
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/lime_stained_glass/lime_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/lime_stained_glass/lime_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=lime_stained_glass
+matchBlocks=95:5
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/lime_stained_glass/lime_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/lime_stained_glass/lime_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=lime_stained_glass_pane
+matchBlocks=160:5
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/magenta_stained_glass/magenta_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/magenta_stained_glass/magenta_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=magenta_stained_glass
+matchBlocks=95:2
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/magenta_stained_glass/magenta_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/magenta_stained_glass/magenta_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=magenta_stained_glass_pane
+matchBlocks=160:2
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/orange_stained_glass/orange_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/orange_stained_glass/orange_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=orange_stained_glass
+matchBlocks=95:1
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/orange_stained_glass/orange_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/orange_stained_glass/orange_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=orange_stained_glass_pane
+matchBlocks=160:1
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/pink_stained_glass/pink_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/pink_stained_glass/pink_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=pink_stained_glass
+matchBlocks=95:6
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/pink_stained_glass/pink_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/pink_stained_glass/pink_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=pink_stained_glass_pane
+matchBlocks=160:6
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/purple_stained_glass/purple_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/purple_stained_glass/purple_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=purple_stained_glass
+matchBlocks=95:10
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/purple_stained_glass/purple_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/purple_stained_glass/purple_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=purple_stained_glass_pane
+matchBlocks=160:10
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/red_stained_glass/red_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/red_stained_glass/red_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=red_stained_glass
+matchBlocks=95:14
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/red_stained_glass/red_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/red_stained_glass/red_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=red_stained_glass_pane
+matchBlocks=160:14
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/white_stained_glass/white_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/white_stained_glass/white_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=white_stained_glass
+matchBlocks=95:0
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/white_stained_glass/white_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/white_stained_glass/white_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=white_stained_glass_pane
+matchBlocks=160:0
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/mcpatcher/ctm/glass/yellow_stained_glass/yellow_stained_glass.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/yellow_stained_glass/yellow_stained_glass.properties
@@ -1,3 +1,3 @@
-matchBlocks=yellow_stained_glass
+matchBlocks=95:4
 method=ctm
 tiles=0-46
--- a/assets/minecraft/mcpatcher/ctm/glass/yellow_stained_glass/yellow_stained_glass_pane.properties
+++ b/assets/minecraft/mcpatcher/ctm/glass/yellow_stained_glass/yellow_stained_glass_pane.properties
@@ -1,4 +1,4 @@
-matchBlocks=yellow_stained_glass_pane
+matchBlocks=160:4
 method=ctm
 tiles=0-46
 faces=sides
--- a/assets/minecraft/textures/blocks/water_flow.png
+++ b/assets/minecraft/textures/blocks/water_flow.png
--- a/assets/minecraft/textures/blocks/water_flow.png.mcmeta
+++ b/assets/minecraft/textures/blocks/water_flow.png.mcmeta
@@ -1,3 +0,0 @@
-{
-  "animation": {}
-}
--- a/assets/minecraft/textures/blocks/water_overlay.png
+++ b/assets/minecraft/textures/blocks/water_overlay.png
--- a/assets/minecraft/textures/blocks/water_still.png
+++ b/assets/minecraft/textures/blocks/water_still.png
--- a/assets/minecraft/textures/blocks/water_still.png.mcmeta
+++ b/assets/minecraft/textures/blocks/water_still.png.mcmeta
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 2
-  }
-}
--- a/assets/minecraft/textures/gui/title/background/panorama_0.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_0.png
--- a/assets/minecraft/textures/gui/title/background/panorama_1.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_1.png
--- a/assets/minecraft/textures/gui/title/background/panorama_2.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_2.png
--- a/assets/minecraft/textures/gui/title/background/panorama_3.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_3.png
--- a/assets/minecraft/textures/gui/title/background/panorama_4.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_4.png
--- a/assets/minecraft/textures/gui/title/background/panorama_5.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_5.png