1.20.5: final fix-up

bangetto · bangetto · commit f9201acdd8e9 · 2024-04-28T15:50:39.000+03:00
diff --git a/assets/minecraft/optifine/cit/pottery/shard/archer/flow_pottery_sherd.properties b/assets/minecraft/optifine/cit/pottery/shard/archer/flow_pottery_sherd.properties
@@ -0,0 +1,4 @@
+type=item
+matchItems=pottery_shard_archer
+model=item/flow_pottery_sherd
+nbt.VB|Protocol1_20_3To1_20_5|id=1293
diff --git a/assets/minecraft/optifine/cit/pottery/shard/archer/guster_pottery_sherd.properties b/assets/minecraft/optifine/cit/pottery/shard/archer/guster_pottery_sherd.properties
@@ -0,0 +1,4 @@
+type=item
+matchItems=pottery_shard_archer
+model=item/guster_pottery_sherd
+nbt.VB|Protocol1_20_3To1_20_5|id=1295
diff --git a/assets/minecraft/optifine/cit/pottery/shard/blade/scrape_pottery_sherd.properties b/assets/minecraft/optifine/cit/pottery/shard/blade/scrape_pottery_sherd.properties
@@ -0,0 +1,4 @@
+type=item
+matchItems=pottery_shard_blade
+model=item/scrape_pottery_sherd
+nbt.VB|Protocol1_20_3To1_20_5|id=1303
diff --git a/assets/minecraft/optifine/cit/pottery/sherd/blade/scrape_pottery_sherd.properties b/assets/minecraft/optifine/cit/pottery/sherd/blade/scrape_pottery_sherd.properties
@@ -1,4 +1,4 @@
 type=item
-matchItems=blade_pottery_shard
+matchItems=blade_pottery_sherd
 model=item/scrape_pottery_sherd
 nbt.VB|Protocol1_20_3To1_20_5|id=1303
diff --git a/assets/minecraft/optifine/cit/pottery/sherd/friend/flow_pottery_sherd.properties b/assets/minecraft/optifine/cit/pottery/sherd/friend/flow_pottery_sherd.properties
@@ -0,0 +1,4 @@
+type=item
+matchItems=friend_pottery_sherd
+model=item/flow_pottery_sherd
+nbt.VB|Protocol1_20_3To1_20_5|id=1293
diff --git a/assets/minecraft/optifine/cit/pottery/sherd/friend/guster_pottery_sherd.properties b/assets/minecraft/optifine/cit/pottery/sherd/friend/guster_pottery_sherd.properties
@@ -0,0 +1,4 @@
+type=item
+matchItems=friend_pottery_sherd
+model=item/guster_pottery_sherd
+nbt.VB|Protocol1_20_3To1_20_5|id=1295
diff --git a/assets/minecraft/optifine/cit/template.properties b/assets/minecraft/optifine/cit/template.properties
@@ -1,4 +1,4 @@
 type=item
 matchItems=
 model=item/
-nbt.VB|Protocol1_19_4To1_19_3|id=
+nbt.VB|Protocol1_20_3To1_20_5|id=
diff --git a/assets/minecraft/overrides/item/friend_pottery_sherd.json b/assets/minecraft/overrides/item/friend_pottery_sherd.json
@@ -11,10 +11,18 @@
           {
             "predicate": {
               "nbt": {
-                "VB|Protocol1_20_3To1_20_5|id": 1294
+                "VB|Protocol1_20_3To1_20_5|id": 1295
               }
             },
             "model": "item/guster_pottery_sherd"
+          },
+          {
+            "predicate": {
+              "nbt": {
+                "VB|Protocol1_20_3To1_20_5|id": 1303
+              }
+            },
+            "model": "item/scrape_pottery_sherd"
           }
       ]
   }
diff --git a/assets/minecraft/overrides/item/pottery_shard_archer.json b/assets/minecraft/overrides/item/pottery_shard_archer.json
@@ -127,6 +127,30 @@
             }
           },
           "model": "item/snort_pottery_sherd"
+        },
+        {
+          "predicate": {
+            "nbt": {
+              "VB|Protocol1_20_3To1_20_5|id": 1293
+            }
+          },
+          "model": "item/flow_pottery_sherd"
+        },
+        {
+          "predicate": {
+            "nbt": {
+              "VB|Protocol1_20_3To1_20_5|id": 1295
+            }
+          },
+          "model": "item/guster_pottery_sherd"
+        },
+        {
+          "predicate": {
+            "nbt": {
+              "VB|Protocol1_20_3To1_20_5|id": 1303
+            }
+          },
+          "model": "item/scrape_pottery_sherd"
         }
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,18 @@`
`11`	`11`	`{`
`12`	`12`	`"predicate": {`
`13`	`13`	`"nbt": {`
`14`		`- "VB\|Protocol1_20_3To1_20_5\|id": 1294`
	`14`	`+ "VB\|Protocol1_20_3To1_20_5\|id": 1295`
`15`	`15`	`}`
`16`	`16`	`},`
`17`	`17`	`"model": "item/guster_pottery_sherd"`
	`18`	`+ },`
	`19`	`+ {`
	`20`	`+ "predicate": {`
	`21`	`+ "nbt": {`
	`22`	`+ "VB\|Protocol1_20_3To1_20_5\|id": 1303`
	`23`	`+ }`
	`24`	`+ },`
	`25`	`+ "model": "item/scrape_pottery_sherd"`
`18`	`26`	`}`
`19`	`27`	`]`
`20`	`28`	`}`