From c7ea5c8bb1deac4f3a80122eb985e538e79897ec Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 12 Oct 2026 14:08:10 -0700 Subject: [PATCH] Add patches to fix new Eclipse compiler issues --- .../server/jsonrpc/api/MethodInfo.java.patch | 15 ++++++++++++ .../server/jsonrpc/api/Schema.java.patch | 23 +++++++++++++++++++ .../level/chunk/PalettedContainer.java.patch | 11 +++++++++ 3 files changed, 49 insertions(+) create mode 100644 patches/minecraft/net/minecraft/server/jsonrpc/api/MethodInfo.java.patch create mode 100644 patches/minecraft/net/minecraft/server/jsonrpc/api/Schema.java.patch create mode 100644 patches/minecraft/net/minecraft/world/level/chunk/PalettedContainer.java.patch diff --git a/patches/minecraft/net/minecraft/server/jsonrpc/api/MethodInfo.java.patch b/patches/minecraft/net/minecraft/server/jsonrpc/api/MethodInfo.java.patch new file mode 100644 index 0000000000..4155187484 --- /dev/null +++ b/patches/minecraft/net/minecraft/server/jsonrpc/api/MethodInfo.java.patch @@ -0,0 +1,15 @@ +--- a/net/minecraft/server/jsonrpc/api/MethodInfo.java ++++ b/net/minecraft/server/jsonrpc/api/MethodInfo.java +@@ -27,10 +_,10 @@ + } + + static MapCodec> typedCodec() { +- return (MapCodec)RecordCodecBuilder.mapCodec( ++ return RecordCodecBuilder.mapCodec( + p_449116_ -> p_449116_.group( + Codec.STRING.fieldOf("description").forGetter(MethodInfo::description), +- paramsTypedCodec().fieldOf("params").forGetter(MethodInfo::params), ++ MethodInfo.paramsTypedCodec().fieldOf("params").forGetter(MethodInfo::params), + ResultInfo.typedCodec().optionalFieldOf("result").forGetter(MethodInfo::result) + ) + .apply(p_449116_, MethodInfo::new) diff --git a/patches/minecraft/net/minecraft/server/jsonrpc/api/Schema.java.patch b/patches/minecraft/net/minecraft/server/jsonrpc/api/Schema.java.patch new file mode 100644 index 0000000000..e90aa744e4 --- /dev/null +++ b/patches/minecraft/net/minecraft/server/jsonrpc/api/Schema.java.patch @@ -0,0 +1,23 @@ +--- a/net/minecraft/server/jsonrpc/api/Schema.java ++++ b/net/minecraft/server/jsonrpc/api/Schema.java +@@ -46,15 +_,15 @@ + "Schema", + p_422846_ -> RecordCodecBuilder.create( + p_449128_ -> p_449128_.group( +- ReferenceUtil.REFERENCE_CODEC.optionalFieldOf("$ref").forGetter(Schema::reference), ++ ReferenceUtil.REFERENCE_CODEC.optionalFieldOf("$ref").forGetter(Schema::reference), + ExtraCodecs.compactListCodec(Codec.STRING) + .optionalFieldOf("type", List.of()) +- .forGetter(Schema::type), +- p_422846_.optionalFieldOf("items").forGetter(Schema::items), ++ .forGetter(Schema::type), ++ p_422846_.optionalFieldOf("items").forGetter(Schema::items), + Codec.unboundedMap(Codec.STRING, p_422846_) + .optionalFieldOf("properties", Map.of()) +- .forGetter(Schema::properties), +- Codec.STRING.listOf().optionalFieldOf("enum", List.of()).forGetter(Schema::enumValues) ++ .forGetter(Schema::properties), ++ Codec.STRING.listOf().optionalFieldOf("enum", List.of()).forGetter(Schema::enumValues) + ) + .apply(p_449128_, (p_449121_, p_449122_, p_449123_, p_449124_, p_449125_) -> null) + ) 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..9a00a031f6 --- /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 +@@ -52,7 +_,7 @@ + private static > Codec codec( + Codec p_238429_, Strategy p_430459_, 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)