upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 00:07:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add patches to fix new Eclipse compiler issues

Browse Source
This commit is contained in:
LexManos committed 2026-10-12 14:08:10 -07:00
1 parent 424fa2bdf6
commit c7ea5c8bb1
3 files changed
+49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

patches/minecraft/net/minecraft/server/jsonrpc/api/MethodInfo.java.patch
+15
View File
@@ -0,0 +1,15 @@
--- a/net/minecraft/server/jsonrpc/api/MethodInfo.java
+++ b/net/minecraft/server/jsonrpc/api/MethodInfo.java
@@ -27,10 +_,10 @@
}
static <Params, Result> MapCodec<MethodInfo<Params, Result>> typedCodec() {
- return (MapCodec)RecordCodecBuilder.<MethodInfo>mapCodec(
+ return RecordCodecBuilder.mapCodec(
p_449116_ -> p_449116_.group(
Codec.STRING.fieldOf("description").forGetter(MethodInfo::description),
- paramsTypedCodec().fieldOf("params").forGetter(MethodInfo::params),
+ MethodInfo.<Params>paramsTypedCodec().fieldOf("params").forGetter(MethodInfo::params),
ResultInfo.<Result>typedCodec().optionalFieldOf("result").forGetter(MethodInfo::result)
)
.apply(p_449116_, MethodInfo::new)
patches/minecraft/net/minecraft/server/jsonrpc/api/Schema.java.patch
+23
View File
@@ -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").<Schema>forGetter(Schema::reference),
+ ReferenceUtil.REFERENCE_CODEC.optionalFieldOf("$ref").forGetter(Schema::reference),
ExtraCodecs.compactListCodec(Codec.STRING)
.optionalFieldOf("type", List.of())
- .<Schema>forGetter(Schema::type),
- p_422846_.optionalFieldOf("items").<Schema>forGetter(Schema::items),
+ .forGetter(Schema::type),
+ p_422846_.optionalFieldOf("items").forGetter(Schema::items),
Codec.unboundedMap(Codec.STRING, p_422846_)
.optionalFieldOf("properties", Map.of())
- .<Schema>forGetter(Schema::properties),
- Codec.STRING.listOf().optionalFieldOf("enum", List.<String>of()).<Schema>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)
)
patches/minecraft/net/minecraft/world/level/chunk/PalettedContainer.java.patch
+11
View File
@@ -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 <T, C extends PalettedContainerRO<T>> Codec<C> codec(
Codec<T> p_238429_, Strategy<T> p_430459_, 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().fieldOf("palette").forGetter(PalettedContainerRO.PackedData::paletteEntries),
Codec.LONG_STREAM.lenientOptionalFieldOf("data").forGetter(PalettedContainerRO.PackedData::storage)