922c33171c
* work * work * more work * complete configuration base * More work * more work * Configurable cave lava sea level, Fix MC-237017 * more more more work * Updated Upstream (Paper, Pufferfish, Purpur) * Rework, again * Cleanup workflows, fix build * typo * more work * more work - Updated Upstream (Paper) - [CI-Skip] Update Upstream CacheData (Pufferfish, Purpur) - Update Dependencies (Paperweight) - Fix build - Update Wrapper * more works * more more works * Fix build * Fix test * Implemented FixMySpawnR, Added more config optimize * Fix build
61 lines
4.2 KiB
Diff
61 lines
4.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: IPECTER <ipectert@gmail.com>
|
|
Date: Tue, 30 May 2023 12:12:29 +0900
|
|
Subject: [PATCH] MC Dev fixes
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java b/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java
|
|
index 733134401fcba393053c7a2dfa1d0d44f8f79ff5..79fba35fc74723529bff7d8fdcca7de6407fb5ad 100644
|
|
--- a/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java
|
|
+++ b/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java
|
|
@@ -71,14 +71,14 @@ public class LeavesFix extends DataFix {
|
|
return this.fixTypeEverywhereTyped("Leaves fix", type, (typed) -> {
|
|
return typed.updateTyped(opticFinder, (typedx) -> {
|
|
int[] is = new int[]{0};
|
|
- Typed<?> typed2 = typedx.updateTyped(opticFinder2, (typed) -> {
|
|
- Int2ObjectMap<LeavesFix.LeavesSection> int2ObjectMap = new Int2ObjectOpenHashMap<>(typed.getAllTyped(opticFinder3).stream().map((typedx) -> {
|
|
- return new LeavesFix.LeavesSection(typedx, this.getInputSchema());
|
|
+ Typed<?> typed2 = typedx.updateTyped(opticFinder2, (typed2x) -> { // Plazma - decompile fix
|
|
+ Int2ObjectMap<LeavesFix.LeavesSection> int2ObjectMap = new Int2ObjectOpenHashMap<>(typed2x.getAllTyped(opticFinder3).stream().map((typedx2) -> { // Plazma - decompile fix
|
|
+ return new LeavesFix.LeavesSection(typedx2, this.getInputSchema()); // Plazma - decompile fix
|
|
}).collect(Collectors.toMap(LeavesFix.Section::getIndex, (leavesSection) -> {
|
|
return leavesSection;
|
|
})));
|
|
if (int2ObjectMap.values().stream().allMatch(LeavesFix.Section::isSkippable)) {
|
|
- return typed;
|
|
+ return typed2x; // Plazma - decompile fix
|
|
} else {
|
|
List<IntSet> list = Lists.newArrayList();
|
|
|
|
@@ -134,8 +134,8 @@ public class LeavesFix extends DataFix {
|
|
}
|
|
}
|
|
|
|
- return typed.updateTyped(opticFinder3, (typedx) -> {
|
|
- return int2ObjectMap.get(typedx.get(DSL.remainderFinder()).get("Y").asInt(0)).write(typedx);
|
|
+ return typed.updateTyped(opticFinder3, (typedx2) -> { // Plazma - decompile fix
|
|
+ return int2ObjectMap.get(typedx2.get(DSL.remainderFinder()).get("Y").asInt(0)).write(typedx2); // Plazma - decompile fix
|
|
});
|
|
}
|
|
});
|
|
@@ -298,8 +298,8 @@ public class LeavesFix extends DataFix {
|
|
throw new IllegalStateException("Block state type is not what was expected.");
|
|
} else {
|
|
Optional<List<Pair<String, Dynamic<?>>>> optional = typed.getOptional(this.paletteFinder);
|
|
- this.palette = optional.map((list) -> {
|
|
- return list.stream().map(Pair::getSecond).collect(Collectors.toList());
|
|
+ this.palette = (List) optional.map((list) -> { // Plazma - decompile fix
|
|
+ return (List) list.stream().map(Pair::getSecond).collect(Collectors.toList()); // Plazma - decompile fix
|
|
}).orElse(ImmutableList.of());
|
|
Dynamic<?> dynamic = typed.get(DSL.remainderFinder());
|
|
this.index = dynamic.get("Y").asInt(0);
|
|
@@ -321,7 +321,7 @@ public class LeavesFix extends DataFix {
|
|
public Typed<?> write(Typed<?> typed) {
|
|
return this.isSkippable() ? typed : typed.update(DSL.remainderFinder(), (dynamic) -> {
|
|
return dynamic.set("BlockStates", dynamic.createLongList(Arrays.stream(this.storage.getRaw())));
|
|
- }).set(this.paletteFinder, this.palette.stream().map((dynamic) -> {
|
|
+ }).set(this.paletteFinder, (List) this.palette.stream().map((dynamic) -> { // Plazma - decompile fix
|
|
return Pair.of(References.BLOCK_STATE.typeName(), dynamic);
|
|
}).collect(Collectors.toList()));
|
|
}
|