From 9e61558ea9765cced5ee712d647164274eadb555 Mon Sep 17 00:00:00 2001
From: MiniDigger | Martin <admin@benndorf.dev>
Date: Tue, 23 Apr 2024 19:18:42 +0200
Subject: [PATCH] fix patches for 24w07a, closes #25

---
 .../core/RegistrySetBuilder.java.patch         | 18 ++++++++----------
 .../server/level/ServerChunkCache.java.patch   |  2 +-
 .../util/datafix/DataFixers.java.patch         |  4 ++--
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/versions/24w07a/patches/net/minecraft/core/RegistrySetBuilder.java.patch b/versions/24w07a/patches/net/minecraft/core/RegistrySetBuilder.java.patch
index 380ca91..7591970 100644
--- a/versions/24w07a/patches/net/minecraft/core/RegistrySetBuilder.java.patch
+++ b/versions/24w07a/patches/net/minecraft/core/RegistrySetBuilder.java.patch
@@ -1,15 +1,6 @@
 --- a/net/minecraft/core/RegistrySetBuilder.java
 +++ b/net/minecraft/core/RegistrySetBuilder.java
-@@ -269,7 +_,7 @@
-         }
- 
-         public <T> HolderOwner<T> cast() {
--            return this;
-+            return (HolderOwner<T>) this;
-         }
-     }
- 
-@@ -384,7 +_,7 @@
+@@ -425,13 +_,13 @@
  
          <T> Holder.Reference<T> getOrCreate(ResourceKey<T> key) {
              return (Holder.Reference<T>)this.holders
@@ -18,3 +9,10 @@
          }
      }
  
+     static class UniversalOwner implements HolderOwner<Object> {
+         public <T> HolderOwner<T> cast() {
+-            return this;
++            return (HolderOwner<T>) this;
+         }
+     }
+ 
diff --git a/versions/24w07a/patches/net/minecraft/server/level/ServerChunkCache.java.patch b/versions/24w07a/patches/net/minecraft/server/level/ServerChunkCache.java.patch
index 4c79629..25e099c 100644
--- a/versions/24w07a/patches/net/minecraft/server/level/ServerChunkCache.java.patch
+++ b/versions/24w07a/patches/net/minecraft/server/level/ServerChunkCache.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerChunkCache.java
 +++ b/net/minecraft/server/level/ServerChunkCache.java
-@@ -573,7 +_,8 @@
+@@ -576,7 +_,8 @@
              super.doRunTask(task);
          }
  
diff --git a/versions/24w07a/patches/net/minecraft/util/datafix/DataFixers.java.patch b/versions/24w07a/patches/net/minecraft/util/datafix/DataFixers.java.patch
index 1b2510d..13582e6 100644
--- a/versions/24w07a/patches/net/minecraft/util/datafix/DataFixers.java.patch
+++ b/versions/24w07a/patches/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
-@@ -1051,7 +_,7 @@
+@@ -1052,7 +_,7 @@
          Schema schema161 = builder.addSchema(3086, SAME_NAMESPACED);
          builder.addFixer(
              new EntityVariantFix(
@@ -9,7 +9,7 @@
                      map5.defaultReturnValue("minecraft:tabby");
                      map5.put(0, "minecraft:tabby");
                      map5.put(1, "minecraft:black");
-@@ -1088,7 +_,7 @@
+@@ -1089,7 +_,7 @@
          Schema schema162 = builder.addSchema(3087, SAME_NAMESPACED);
          builder.addFixer(
              new EntityVariantFix(