From 96ffdf9ee550afdc54e02ea1d8cf51e3f98660e6 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 12 Oct 2026 15:44:22 -0700 Subject: [PATCH] Update SRGUtils and Fix new eclipse compiler issue --- build.gradle | 4 ++-- buildSrc/build.gradle | 2 +- .../world/level/chunk/PalettedContainer.java.patch | 11 +++++++++++ 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 5d1ee59741..cce4e46434 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ plugins { id 'net.minecraftforge.gradleutils' version '[2.6.4,2.7)' id 'eclipse' id 'de.undercouch.download' version '5.4.0' - id 'net.minecraftforge.gradle.patcher' version '[6.0.22,6.2)' apply false - id 'net.minecraftforge.gradle.mcp' version '[6.0.22,6.2)' apply false + id 'net.minecraftforge.gradle.patcher' version '[6.0.54,6.2)' apply false + id 'net.minecraftforge.gradle.mcp' version '[6.0.45,6.2)' apply false id 'net.minecraftforge.gradlejarsigner' version '1.0.4' id 'org.barfuin.gradle.taskinfo' version '2.1.0' } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 57f81fc1f9..87b1cf2660 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -6,7 +6,7 @@ repositories { dependencies { implementation 'org.ow2.asm:asm:9.9.1' implementation 'org.ow2.asm:asm-tree:9.9.1' - implementation 'net.minecraftforge:srgutils:0.6.2' + implementation 'net.minecraftforge:srgutils:0.6.8' implementation 'commons-io:commons-io:2.13.0' implementation 'com.google.code.gson:gson:2.10.1' implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r' 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..ce6f872a11 --- /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 +@@ -55,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().fieldOf("palette").forGetter(PalettedContainerRO.PackedData::paletteEntries), + Codec.LONG_STREAM.lenientOptionalFieldOf("data").forGetter(PalettedContainerRO.PackedData::storage)