diff --git a/patches/minecraft/net/minecraft/world/level/chunk/PalettedContainer.java.patch b/patches/minecraft/net/minecraft/world/level/chunk/PalettedContainer.java.patch
new file mode 100644
index 0000000000..719377855d
--- /dev/null
+++ b/patches/minecraft/net/minecraft/world/level/chunk/PalettedContainer.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/level/chunk/PalettedContainer.java
++++ b/net/minecraft/world/level/chunk/PalettedContainer.java
+@@ -56,7 +_,7 @@
+     private static <T, C extends PalettedContainerRO<T>> Codec<C> codec(
+         IdMap<T> p_238428_, Codec<T> p_238429_, PalettedContainer.Strategy p_238430_, T p_238431_, PalettedContainerRO.Unpacker<T, C> p_238432_
+     ) {
+-        return RecordCodecBuilder.<PalettedContainerRO.PackedData>create(
++        return RecordCodecBuilder.<PalettedContainerRO.PackedData<T>>create(
+                 p_327417_ -> p_327417_.group(
+                             p_238429_.mapResult(ExtraCodecs.orElsePartial(p_238431_))
+                                 .listOf()
diff --git a/src/main/java/net/minecraftforge/common/util/ConcatenatedListView.java b/src/main/java/net/minecraftforge/common/util/ConcatenatedListView.java
index 55600db154..51f8fb42d8 100644
--- a/src/main/java/net/minecraftforge/common/util/ConcatenatedListView.java
+++ b/src/main/java/net/minecraftforge/common/util/ConcatenatedListView.java
@@ -114,13 +114,13 @@ public class ConcatenatedListView<T> implements List<T>
     @Override
     public Iterator<T> iterator()
     {
-        return Iterables.unmodifiableIterable(Iterables.concat(lists)).iterator();
+        return Iterables.unmodifiableIterable(Iterables.<T>concat(lists)).iterator();
     }
 
     @Override
     public Spliterator<T> spliterator()
     {
-        return Iterables.unmodifiableIterable(Iterables.concat(lists)).spliterator();
+        return Iterables.unmodifiableIterable(Iterables.<T>concat(lists)).spliterator();
     }
 
     // Delegate to a concatenated collection