From 82f7d4311e46fe6d73aa4965437742dd1e6ff63e Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 12 Oct 2026 17:29:31 -0700 Subject: [PATCH] Fix generic errors in new Eclipse compiler --- build.gradle | 2 +- .../world/level/chunk/PalettedContainer.java.patch | 11 +++++++++++ .../common/util/ConcatenatedListView.java | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 patches/minecraft/net/minecraft/world/level/chunk/PalettedContainer.java.patch diff --git a/build.gradle b/build.gradle index 1fc68fd4ba..5293f1e822 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { } changelog { - from '47.999' + from '51.0' // Since 1.21 } tasks.register('setup') { 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 > Codec codec( + IdMap p_238428_, Codec p_238429_, PalettedContainer.Strategy p_238430_, T p_238431_, PalettedContainerRO.Unpacker p_238432_ + ) { +- return RecordCodecBuilder.create( ++ return RecordCodecBuilder.>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 implements List @Override public Iterator iterator() { - return Iterables.unmodifiableIterable(Iterables.concat(lists)).iterator(); + return Iterables.unmodifiableIterable(Iterables.concat(lists)).iterator(); } @Override public Spliterator spliterator() { - return Iterables.unmodifiableIterable(Iterables.concat(lists)).spliterator(); + return Iterables.unmodifiableIterable(Iterables.concat(lists)).spliterator(); } // Delegate to a concatenated collection