Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-14 18:40:10 +01:00
Code Issues Projekte Releases Wiki Aktivität

Fix can_place_on conversion and size check for item containers

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Joseph Burton 2024-05-02 20:23:15 +02:00 committet von Nassim Jahnke
Ursprung 59fe7ccc3b
Commit 0db72ac19e
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
1 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
patches/server/0976-Rewrite-dataconverter-system.patch
Datei anzeigen

@ -6572,7 +6572,7 @@ index 0000000000000000000000000000000000000000..4fa31e40b0a6f571a853299b4e242de9
+} +}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..1354b139f929010bdb090764d6151ac9569df753 index 0000000000000000000000000000000000000000..a5a21d1c7579e45b78eae4b42a9f023db74acc0a
--- /dev/null --- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/itemstack/ConverterItemStackToDataComponents.java
@@ -0,0 +1,1244 @@ @@ -0,0 +1,1244 @@
@ -6816,7 +6816,7 @@ index 0000000000000000000000000000000000000000..1354b139f929010bdb090764d6151ac9
+ case "minecraft:crafter": { + case "minecraft:crafter": {
+ final ListType items = tileEntity.getList("Items", ObjectType.MAP); + final ListType items = tileEntity.getList("Items", ObjectType.MAP);
+ tileEntity.remove("Items"); + tileEntity.remove("Items");
+ if (items != null && items.size() > 1) { + if (items != null && items.size() > 0) {
+ transientItem.componentSetList("minecraft:container", items); + transientItem.componentSetList("minecraft:container", items);
+ +
+ for (int i = 0, len = items.size(); i < len; ++i) { + for (int i = 0, len = items.size(); i < len; ++i) {
@ -22437,7 +22437,7 @@ index 0000000000000000000000000000000000000000..f50b81d931a1908d405bb72e0679983a
+} +}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..15257d47a2c449290e428402a9fa1e955f07e341 index 0000000000000000000000000000000000000000..29d256c2f5d5e338dc7abeb82c0f1ae99ee1edf7
--- /dev/null --- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java
@@ -0,0 +1,339 @@ @@ -0,0 +1,339 @@
@ -22678,7 +22678,7 @@ index 0000000000000000000000000000000000000000..15257d47a2c449290e428402a9fa1e95
+ walkBlockPredicates(canBreak, fromVersion, toVersion); + walkBlockPredicates(canBreak, fromVersion, toVersion);
+ } + }
+ +
+ final MapType<String> canPlaceOn = root.getMap("minecraft:can_break"); + final MapType<String> canPlaceOn = root.getMap("minecraft:can_place_on");
+ if (canPlaceOn != null) { + if (canPlaceOn != null) {
+ final ListType predicates = canPlaceOn.getList("predicates", ObjectType.MAP); + final ListType predicates = canPlaceOn.getList("predicates", ObjectType.MAP);
+ if (predicates != null) { + if (predicates != null) {