From 2c0fe5b985867e75d98b09a7820604cd2d6c8a09 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Mon, 12 Oct 2026 16:56:38 -0700
Subject: [PATCH] Fix generic errors in new Eclipse compiler

---
 .../world/level/block/CrafterBlock.java.patch         |  4 ++--
 .../world/level/chunk/PalettedContainer.java.patch    | 11 +++++++++++
 .../common/util/ConcatenatedListView.java             |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 patches/minecraft/net/minecraft/world/level/chunk/PalettedContainer.java.patch

diff --git a/patches/minecraft/net/minecraft/world/level/block/CrafterBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/CrafterBlock.java.patch
index 310406151f..469c7d03f2 100644
--- a/patches/minecraft/net/minecraft/world/level/block/CrafterBlock.java.patch
+++ b/patches/minecraft/net/minecraft/world/level/block/CrafterBlock.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/CrafterBlock.java
 +++ b/net/minecraft/world/level/block/CrafterBlock.java
-@@ -185,12 +_,15 @@
+@@ -192,12 +_,15 @@
          ServerLevel p_336186_, BlockPos p_312358_, CrafterBlockEntity p_309887_, ItemStack p_310474_, BlockState p_310667_, RecipeHolder<?> p_329387_
      ) {
          Direction direction = p_310667_.getValue(ORIENTATION).front();
@@ -16,7 +16,7 @@
                  if (!itemstack1.isEmpty()) {
                      break;
                  }
-@@ -201,10 +_,14 @@
+@@ -208,10 +_,14 @@
              while (!itemstack.isEmpty()) {
                  int i = itemstack.getCount();
                  itemstack = HopperBlockEntity.addItem(p_309887_, container, itemstack, direction.getOpposite());
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 82ce32dc4f..0097cbc0a6 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