Update to Minecraft 1.20.6

Dockerfile-mc

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 FROM debian:stable-slim AS build
 
-ARG bedrock_bone_meal_version=1.2.1+1.20
+ARG bedrock_bone_meal_version=1.2.1+1.20.5
 
 RUN apt-get update \
   && apt-get install zip wget ca-certificates -y --no-install-recommends \
@@ -25,11 +25,11 @@ FROM itzg/minecraft-server:2024.10.2
 
 ENV MODRINTH_PROJECTS=fabric-api,cloth-config,lithium,ferrite-core,starlight,fastback,chunky,no-chat-reports,disableinsecurechattoast,inventory-sorting,jamlib,architectury-api,rightclickharvest,jade,rei,memoryleakfix,mc-server-description
 
-ENV DATAPACKS=/datapacks/ocw-stuff.zip,/datapacks/who-did-this.zip,/datapacks/bedrock-bone-meal.zip,/datapacks/custom-compostables.zip
+ENV DATAPACKS=/datapacks/who-did-this.zip,/datapacks/bedrock-bone-meal.zip
 RUN mkdir -p /datapacks
 COPY --from=build /datapacks/*.zip /datapacks
 
-ENV VANILLATWEAKS_FILE=/vt/craftingtweaks.json,/vt/datapacks.json
+ENV VANILLATWEAKS_FILE=/vt/craftingtweaks.json
 RUN mkdir -p /vt
 COPY rhc/vt/*.json /vt
 

datapacks/custom-compostables/data/custcompost/advancements/composter/use_compostable_on_interaction.json

@@ -4,7 +4,7 @@
       "trigger": "minecraft:player_interacted_with_entity",
       "conditions": {
         "item": {
-          "tag": "custcompost:compostables",
+          "items": "#custcompost:compostables",
           "count": {
             "min": 1
           }

datapacks/custom-compostables/data/custcompost/advancements/holding_compostable.json

@@ -10,7 +10,7 @@
             "predicate": {
               "equipment": {
                 "mainhand": {
-                  "tag": "custcompost:compostables"
+                  "items": "#custcompost:compostables"
                 }
               }
             }

datapacks/custom-compostables/data/custcompost/advancements/not_holding_compostable.json

@@ -12,7 +12,7 @@
               "predicate": {
                 "equipment": {
                   "mainhand": {
-                    "tag": "custcompost:compostables"
+                    "items": "#custcompost:compostables"
                   }
                 }
               }

datapacks/custom-compostables/data/custcompost/functions/composter/hopper/hopper_tick_check.mcfunction

@@ -11,17 +11,17 @@ scoreboard players set @s hopperslot2other 0
 scoreboard players set @s hopperslot3other 0
 scoreboard players set @s hopperslot4other 0
 
-execute store result score @s hopperslot0 run data get block ~ ~1 ~ Items[{Slot:0b,id:"minecraft:poisonous_potato"}].Count
-execute store result score @s hopperslot1 run data get block ~ ~1 ~ Items[{Slot:1b,id:"minecraft:poisonous_potato"}].Count
-execute store result score @s hopperslot2 run data get block ~ ~1 ~ Items[{Slot:2b,id:"minecraft:poisonous_potato"}].Count
-execute store result score @s hopperslot3 run data get block ~ ~1 ~ Items[{Slot:3b,id:"minecraft:poisonous_potato"}].Count
-execute store result score @s hopperslot4 run data get block ~ ~1 ~ Items[{Slot:4b,id:"minecraft:poisonous_potato"}].Count
+execute store result score @s hopperslot0 run data get block ~ ~1 ~ Items[{Slot:0b,id:"minecraft:poisonous_potato"}].count
+execute store result score @s hopperslot1 run data get block ~ ~1 ~ Items[{Slot:1b,id:"minecraft:poisonous_potato"}].count
+execute store result score @s hopperslot2 run data get block ~ ~1 ~ Items[{Slot:2b,id:"minecraft:poisonous_potato"}].count
+execute store result score @s hopperslot3 run data get block ~ ~1 ~ Items[{Slot:3b,id:"minecraft:poisonous_potato"}].count
+execute store result score @s hopperslot4 run data get block ~ ~1 ~ Items[{Slot:4b,id:"minecraft:poisonous_potato"}].count
 
-execute store result score @s hopperslot0other run data get block ~ ~1 ~ Items[{Slot:0b}].Count
-execute store result score @s hopperslot1other run data get block ~ ~1 ~ Items[{Slot:1b}].Count
-execute store result score @s hopperslot2other run data get block ~ ~1 ~ Items[{Slot:2b}].Count
-execute store result score @s hopperslot3other run data get block ~ ~1 ~ Items[{Slot:3b}].Count
-execute store result score @s hopperslot4other run data get block ~ ~1 ~ Items[{Slot:4b}].Count
+execute store result score @s hopperslot0other run data get block ~ ~1 ~ Items[{Slot:0b}].count
+execute store result score @s hopperslot1other run data get block ~ ~1 ~ Items[{Slot:1b}].count
+execute store result score @s hopperslot2other run data get block ~ ~1 ~ Items[{Slot:2b}].count
+execute store result score @s hopperslot3other run data get block ~ ~1 ~ Items[{Slot:3b}].count
+execute store result score @s hopperslot4other run data get block ~ ~1 ~ Items[{Slot:4b}].count
 
 scoreboard players operation @s hopperslot0other -= @s hopperslot0
 scoreboard players operation @s hopperslot1other -= @s hopperslot1

datapacks/custom-compostables/data/custcompost/predicates/composter/holding_compostable_65.json

@@ -4,7 +4,7 @@
   "predicate": {
     "equipment": {
       "mainhand": {
-        "tag": "custcompost:compostables_65",
+        "items": "#custcompost:compostables_65",
         "count": {
           "min": 1
         }

datapacks/custom-compostables/data/custcompost/predicates/composter/hopper/can_run_composter.json

@@ -1,19 +1,99 @@
 [
   {
-    "condition": "minecraft:location_check",
-    "predicate": {
-      "block": {
-        "blocks": [
-          "minecraft:composter"
-        ],
-        "state": {
-          "level": {
-            "min": 0,
-            "max": 6
+    "condition": "minecraft:any_of",
+    "terms": [
+      {
+        "condition": "minecraft:location_check",
+        "predicate": {
+          "block": {
+            "blocks": [
+              "minecraft:composter"
+            ],
+            "state": {
+              "level": "0"
+            }
+          }
+        }
+      },
+      {
+        "condition": "minecraft:location_check",
+        "predicate": {
+          "block": {
+            "blocks": [
+              "minecraft:composter"
+            ],
+            "state": {
+              "level": "1"
+            }
+          }
+        }
+      },
+      {
+        "condition": "minecraft:location_check",
+        "predicate": {
+          "block": {
+            "blocks": [
+              "minecraft:composter"
+            ],
+            "state": {
+              "level": "2"
+            }
+          }
+        }
+      },
+      {
+        "condition": "minecraft:location_check",
+        "predicate": {
+          "block": {
+            "blocks": [
+              "minecraft:composter"
+            ],
+            "state": {
+              "level": "3"
+            }
+          }
+        }
+      },
+      {
+        "condition": "minecraft:location_check",
+        "predicate": {
+          "block": {
+            "blocks": [
+              "minecraft:composter"
+            ],
+            "state": {
+              "level": "4"
+            }
+          }
+        }
+      },
+      {
+        "condition": "minecraft:location_check",
+        "predicate": {
+          "block": {
+            "blocks": [
+              "minecraft:composter"
+            ],
+            "state": {
+              "level": "5"
+            }
+          }
+        }
+      },
+      {
+        "condition": "minecraft:location_check",
+        "predicate": {
+          "block": {
+            "blocks": [
+              "minecraft:composter"
+            ],
+            "state": {
+              "level": "6"
+            }
           }
         }
       }
-    }
+    ]
   },
   {
     "condition": "minecraft:location_check",
@@ -25,8 +105,7 @@
         ],
         "nbt": "{TransferCooldown:0}",
         "state": {
-          "facing": "down",
-          "enabled": true
+          "facing": "down"
         }
       }
     }

datapacks/custom-compostables/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
-        "pack_format": 26,
+        "pack_format": 41,
         "description": "Custom Compostables v0.1.0 by Nincodedo"
     }
 }

datapacks/ocw-stuff/data/minecraft/loot_tables/archaeology/desert_pyramid.json

@@ -39,7 +39,7 @@
         },
         {
           "type": "minecraft:loot_table",
-          "name": "nincodedo:ocw_map"
+          "value": "nincodedo:ocw_map"
         }
       ]
     }

datapacks/ocw-stuff/data/minecraft/loot_tables/archaeology/desert_well.json

@@ -7,13 +7,13 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "weight": 2,
-          "name": "minecraft:arms_up_pottery_sherd"
+          "name": "minecraft:arms_up_pottery_sherd",
+          "weight": 2
         },
         {
           "type": "minecraft:item",
-          "weight": 2,
-          "name": "minecraft:brewer_pottery_sherd"
+          "name": "minecraft:brewer_pottery_sherd",
+          "weight": 2
         },
         {
           "type": "minecraft:item",
@@ -88,7 +88,7 @@
         },
         {
           "type": "minecraft:loot_table",
-          "name": "nincodedo:ocw_map"
+          "value": "nincodedo:ocw_map"
         }
       ]
     }

datapacks/ocw-stuff/data/minecraft/loot_tables/blocks/bookshelf.json

@@ -15,7 +15,7 @@
                 {
                   "condition": "minecraft:location_check",
                   "predicate": {
-                    "structure": "nincodedo:library_hidden_wing"
+                    "structures": "nincodedo:library_hidden_wing"
                   }
                 }
               ]
@@ -27,14 +27,11 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
-                        }
+                    "components": {
+                      "minecraft:enchantments": {
+                        "minecraft:silk_touch": 1
                       }
-                    ]
+                    }
                   }
                 }
               ]