SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/minecraft/util/datafix/**

Browse Source
This commit is contained in:
MiniDigger | Martin
2024-12-14 16:42:52 +01:00
parent f803e7cc28
commit 41494c70b0
6 changed files with 43 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
paper-server/patches/sources/net/minecraft/util/datafix/DataFixers.java.patch Normal file
View File

@@ -0,0 +1,21 @@
--- a/net/minecraft/util/datafix/DataFixers.java
+++ b/net/minecraft/util/datafix/DataFixers.java
@@ -505,6 +_,18 @@
Schema schema44 = builder.addSchema(1456, SAME_NAMESPACED);
builder.addFixer(new EntityItemFrameDirectionFix(schema44, false));
Schema schema45 = builder.addSchema(1458, SAME_NAMESPACED);
+ // CraftBukkit start
+ builder.addFixer(new com.mojang.datafixers.DataFix(schema45, false) {
+ @Override
+ protected com.mojang.datafixers.TypeRewriteRule makeRule() {
+ return this.fixTypeEverywhereTyped("Player CustomName", this.getInputSchema().getType(References.PLAYER), (typed) -> {
+ return typed.update(DSL.remainderFinder(), (dynamic) -> {
+ return EntityCustomNameToComponentFix.fixTagCustomName(dynamic);
+ });
+ });
+ }
+ });
+ // CraftBukkit end
builder.addFixer(new EntityCustomNameToComponentFix(schema45, false));
builder.addFixer(new ItemCustomNameToComponentFix(schema45, false));
builder.addFixer(new BlockEntityCustomNameToComponentFix(schema45, false));

11
paper-server/patches/sources/net/minecraft/util/datafix/fixes/ItemStackMapIdFix.java.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/net/minecraft/util/datafix/fixes/ItemStackMapIdFix.java
+++ b/net/minecraft/util/datafix/fixes/ItemStackMapIdFix.java
@@ -29,7 +_,7 @@
Dynamic<?> dynamic = typed.get(DSL.remainderFinder());
Typed<?> typed1 = typed.getOrCreateTyped(opticFinder1);
Dynamic<?> dynamic1 = typed1.get(DSL.remainderFinder());
- dynamic1 = dynamic1.set("map", dynamic1.createInt(dynamic.get("Damage").asInt(0)));
+ if (dynamic1.getElement("map").result().isEmpty()) dynamic1 = dynamic1.set("map", dynamic1.createInt(dynamic.get("Damage").asInt(0))); // CraftBukkit
return typed.set(opticFinder1, typed1.set(DSL.remainderFinder(), dynamic1));
} else {
return typed;

11
paper-server/patches/sources/net/minecraft/util/datafix/fixes/ItemStackTheFlatteningFix.java.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/net/minecraft/util/datafix/fixes/ItemStackTheFlatteningFix.java
+++ b/net/minecraft/util/datafix/fixes/ItemStackTheFlatteningFix.java
@@ -423,7 +_,7 @@
if (DAMAGE_IDS.contains(optional.get().getSecond())) {
Typed<?> typed2 = typed.getOrCreateTyped(opticFinder1);
Dynamic<?> dynamic1 = typed2.get(DSL.remainderFinder());
- dynamic1 = dynamic1.set("Damage", dynamic1.createInt(_int));
+ if (_int != 0) dynamic1 = dynamic1.set("Damage", dynamic1.createInt(_int)); // CraftBukkit
typed1 = typed1.set(opticFinder1, typed2.set(DSL.remainderFinder(), dynamic1));
}