diff --git a/versions/snapshot/1.21/24w35a/patches/client/net/minecraft/client/Minecraft.java.patch b/versions/snapshot/1.21/24w35a/patches/client/net/minecraft/client/Minecraft.java.patch
index 3f18e892..e27b4ec2 100644
--- a/versions/snapshot/1.21/24w35a/patches/client/net/minecraft/client/Minecraft.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/client/net/minecraft/client/Minecraft.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -2299,7 +2299,7 @@
+@@ -2308,7 +2308,7 @@
      }
  
      public CompletableFuture<Void> delayTextureReload() {
diff --git a/versions/snapshot/1.21/24w35a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch b/versions/snapshot/1.21/24w35a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch
index 33334393..9ee83761 100644
--- a/versions/snapshot/1.21/24w35a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
 +++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
-@@ -299,7 +299,7 @@
+@@ -298,7 +298,7 @@
          public Component describePreset() {
              return Optional.ofNullable(this.preset)
                  .flatMap(Holder::unwrapKey)
diff --git a/versions/snapshot/1.21/24w35a/patches/joined/net/minecraft/client/Minecraft.java.patch b/versions/snapshot/1.21/24w35a/patches/joined/net/minecraft/client/Minecraft.java.patch
index e6860e04..b433265d 100644
--- a/versions/snapshot/1.21/24w35a/patches/joined/net/minecraft/client/Minecraft.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/joined/net/minecraft/client/Minecraft.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -2302,7 +2302,7 @@
+@@ -2311,7 +2311,7 @@
      }
  
      public CompletableFuture<Void> delayTextureReload() {
diff --git a/versions/snapshot/1.21/24w35a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch b/versions/snapshot/1.21/24w35a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch
index 2fef8e14..2facd110 100644
--- a/versions/snapshot/1.21/24w35a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
 +++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
-@@ -304,7 +304,7 @@
+@@ -303,7 +303,7 @@
          public Component describePreset() {
              return Optional.ofNullable(this.preset)
                  .flatMap(Holder::unwrapKey)
diff --git a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch
index 4a25553d..a904fbf5 100644
--- a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/critereon/EntitySubPredicates.java
 +++ b/net/minecraft/advancements/critereon/EntitySubPredicates.java
-@@ -175,7 +175,7 @@
+@@ -176,7 +176,7 @@
              this.getter = p_336167_;
              this.codec = RecordCodecBuilder.mapCodec(
                  p_335436_ -> p_335436_.group(RegistryCodecs.homogeneousList(p_336141_).fieldOf("variant").forGetter(p_335992_ -> p_335992_.variants))
@@ -9,7 +9,7 @@
              );
          }
  
-@@ -218,7 +218,7 @@
+@@ -219,7 +219,7 @@
              this.getter = p_333805_;
              this.codec = RecordCodecBuilder.mapCodec(
                  p_333719_ -> p_333719_.group(p_333738_.fieldOf("variant").forGetter(p_333753_ -> p_333753_.variant))
diff --git a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/core/Registry.java.patch b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/core/Registry.java.patch
index 3011ab48..f55f390e 100644
--- a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/core/Registry.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/core/Registry.java.patch
@@ -1,11 +1,11 @@
 --- a/net/minecraft/core/Registry.java
 +++ b/net/minecraft/core/Registry.java
-@@ -152,7 +152,7 @@
-     Optional<HolderSet.Named<T>> getTag(TagKey<T> p_206052_);
+@@ -141,7 +141,7 @@
+     Holder<T> wrapAsHolder(T p_263382_);
  
      default Iterable<Holder<T>> getTagOrEmpty(TagKey<T> p_206059_) {
--        return DataFixUtils.orElse(this.getTag(p_206059_), List.<T>of());
-+        return DataFixUtils.orElse(this.getTag(p_206059_), List.of());
+-        return DataFixUtils.orElse(this.get(p_206059_), List.<T>of());
++        return DataFixUtils.orElse(this.get(p_206059_), List.of());
      }
  
      default Optional<Holder<T>> getRandomElementOf(TagKey<T> p_320357_, RandomSource p_320935_) {
diff --git a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/core/RegistrySetBuilder.java.patch b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/core/RegistrySetBuilder.java.patch
index ec6aac3e..59a0a974 100644
--- a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/core/RegistrySetBuilder.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/core/RegistrySetBuilder.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/core/RegistrySetBuilder.java
 +++ b/net/minecraft/core/RegistrySetBuilder.java
-@@ -422,13 +422,13 @@
+@@ -421,13 +421,13 @@
  
          <T> Holder.Reference<T> getOrCreate(ResourceKey<T> p_256298_) {
              return (Holder.Reference<T>)this.holders
diff --git a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/data/info/RegistryDumpReport.java.patch b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/data/info/RegistryDumpReport.java.patch
index 0c124630..23a99bd9 100644
--- a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/data/info/RegistryDumpReport.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/data/info/RegistryDumpReport.java.patch
@@ -8,4 +8,4 @@
 +        int i = ((Registry<Registry<T>>)BuiltInRegistries.REGISTRY).getId(p_124059_);
          jsonobject.addProperty("protocol_id", i);
          JsonObject jsonobject1 = new JsonObject();
-         p_124059_.holders().forEach(p_211092_ -> {
+         p_124059_.listElements().forEach(p_211092_ -> {
diff --git a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/resources/RegistryDataLoader.java.patch b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/resources/RegistryDataLoader.java.patch
index f6e8179d..ab4a3be0 100644
--- a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/resources/RegistryDataLoader.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/resources/RegistryDataLoader.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/resources/RegistryDataLoader.java
 +++ b/net/minecraft/resources/RegistryDataLoader.java
-@@ -73,7 +73,7 @@
+@@ -74,7 +74,7 @@
  
  public class RegistryDataLoader {
      private static final Logger LOGGER = LogUtils.getLogger();
diff --git a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/server/MinecraftServer.java.patch b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/server/MinecraftServer.java.patch
index b3f40561..45ba8054 100644
--- a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/server/MinecraftServer.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/server/MinecraftServer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -873,7 +873,7 @@
+@@ -872,7 +872,7 @@
          }
      }
  
diff --git a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch
index b36c4ad6..e8979424 100644
--- a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/datafix/DataFixers.java
 +++ b/net/minecraft/util/datafix/DataFixers.java
-@@ -1090,7 +1090,7 @@
+@@ -1091,7 +1091,7 @@
          Schema schema161 = p_14514_.addSchema(3086, SAME_NAMESPACED);
          p_14514_.addFixer(
              new EntityVariantFix(
@@ -9,7 +9,7 @@
                      p_216528_.defaultReturnValue("minecraft:tabby");
                      p_216528_.put(0, "minecraft:tabby");
                      p_216528_.put(1, "minecraft:black");
-@@ -1130,7 +1130,7 @@
+@@ -1131,7 +1131,7 @@
          Schema schema162 = p_14514_.addSchema(3087, SAME_NAMESPACED);
          p_14514_.addFixer(
              new EntityVariantFix(
diff --git a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/world/entity/Entity.java.patch b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/world/entity/Entity.java.patch
index c13986ff..ebc03230 100644
--- a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/world/entity/Entity.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/world/entity/Entity.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -475,7 +475,7 @@
+@@ -477,7 +477,7 @@
  
          this.firstTick = false;
          if (!this.level().isClientSide && this instanceof Leashable) {
diff --git a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch
index 43edf7df..f46c2229 100644
--- a/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch
+++ b/versions/snapshot/1.21/24w35a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/Sheep.java
 +++ b/net/minecraft/world/entity/animal/Sheep.java
-@@ -60,7 +60,7 @@
+@@ -58,7 +58,7 @@
      private static final int EAT_ANIMATION_TICKS = 40;
      private static final EntityDataAccessor<Byte> DATA_WOOL_ID = SynchedEntityData.defineId(Sheep.class, EntityDataSerializers.BYTE);
      private static final Map<DyeColor, Integer> COLOR_BY_DYE = Maps.newEnumMap(