Update to Minecraft 1.21.9

.editorconfig

@@ -15,6 +15,7 @@ trim_trailing_whitespace = false
 [{*.bash,*.sh,*.zsh}]
 indent_size = 2
 tab_width = 2
+end_of_line = lf
 
 [{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
 indent_size = 2

.gitattributes

@@ -0,0 +1,3 @@
+*           text=auto
+*.txt       text
+*.sh        text eol=lf

Dockerfile

@@ -0,0 +1,41 @@
+# syntax=docker/dockerfile:1
+FROM alpine:3.22.1 AS log_watcher
+WORKDIR /app
+RUN apk --no-cache add tzdata docker=28.3.3-r0 docker-cli-compose=2.36.2-r0 curl=8.14.1-r1 jq=1.8.0-r0
+COPY docker-compose.yaml ocw-minecraft/docker-compose.yaml
+COPY --chmod=755 rhc/scripts/*.sh .
+COPY *.env ocw-minecraft/
+LABEL org.opencontainers.image.source="https://github.com/Nincodedo/rhc-ocw"
+ENTRYPOINT ["/app/resetWorld.sh"]
+
+FROM debian:stable-slim AS mc_build
+
+RUN apt-get update \
+  && apt-get install zip wget ca-certificates -y --no-install-recommends \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
+COPY datapacks /datapacks/
+RUN cd /datapacks/who-did-this \
+  && zip -r who-did-this.zip . \
+  && mv who-did-this.zip /datapacks
+
+FROM itzg/minecraft-server:2025.8.0 AS mc
+
+ENV MODRINTH_PROJECTS=mc-server-description,rightclickharvest,vanilla-pings
+ENV MODRINTH_DOWNLOAD_DEPENDENCIES=required
+
+ENV DATAPACKS=/datapacks/who-did-this.zip
+COPY --from=mc_build /datapacks/*.zip /datapacks/
+
+ENV VANILLATWEAKS_FILE=/vt/craftingtweaks.json,/vt/datapacks.json
+COPY rhc/vt/*.json /vt/
+
+COPY rhc/patches/*.json /patches/
+ENV PATCH_DEFINITIONS=/patches
+
+ENV REPLACE_ENV_VARIABLES=true
+ENV REPLACE_ENV_DURING_SYNC=true
+ENV SYNC_SKIP_NEWER_IN_DESTINATION=false
+
+LABEL org.opencontainers.image.source="https://github.com/Nincodedo/rhc-ocw"

common.env

@@ -0,0 +1 @@
+TZ="America/Chicago"

datapacks/custom-compostables/data/custcompost/advancements/composter/move_interaction.json → datapacks/custom-compostables/data/custcompost/advancement/composter/move_interaction.json

@@ -22,7 +22,7 @@
               "entity": "this",
               "predicate": {
                 "type_specific": {
-                  "type": "player",
+                  "type": "minecraft:player",
                   "looking_at": {
                     "type": "minecraft:interaction",
                     "nbt": "{Tags:[\"composter_interaction\"]}"

datapacks/custom-compostables/data/custcompost/advancements/composter/use_compostable_on_interaction.json → datapacks/custom-compostables/data/custcompost/advancement/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 → datapacks/custom-compostables/data/custcompost/advancement/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 → datapacks/custom-compostables/data/custcompost/advancement/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 → datapacks/custom-compostables/data/custcompost/function/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/functions/load.mcfunction → datapacks/custom-compostables/data/custcompost/function/load.mcfunction

@@ -13,3 +13,5 @@ scoreboard objectives add hopperslot2other dummy
 scoreboard objectives add hopperslot3other dummy
 scoreboard objectives add hopperslot4other dummy
 scoreboard objectives add hopperslottotal dummy
+
+execute if entity @e[tag=hopper_enabled_composter] run schedule function custcompost:composter/hopper/schedule_hopper_tick_check 8t

datapacks/custom-compostables/data/custcompost/predicates/composter/holding_compostable_65.json → datapacks/custom-compostables/data/custcompost/predicate/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 → datapacks/custom-compostables/data/custcompost/predicate/composter/hopper/can_run_composter.json

@@ -3,13 +3,11 @@
     "condition": "minecraft:location_check",
     "predicate": {
       "block": {
-        "blocks": [
-          "minecraft:composter"
-        ],
+        "blocks": "minecraft:composter",
         "state": {
           "level": {
-            "min": 0,
-            "max": 6
+            "min": "0",
+            "max": "6"
           }
         }
       }
@@ -26,7 +24,7 @@
         "nbt": "{TransferCooldown:0}",
         "state": {
           "facing": "down",
-          "enabled": true
+          "enabled": "true"
         }
       }
     }

datapacks/custom-compostables/data/custcompost/predicates/composter/rng/held_compostable_65.json → datapacks/custom-compostables/data/custcompost/predicate/composter/rng/held_compostable_65.json

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

datapacks/custom-compostables/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
-        "pack_format": 26,
+        "pack_format": 57,
         "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
                       }
-                    ]
+                    }
                   }
                 }
               ]