SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Add missing glow_item_frame walkers

Quellcode durchsuchen 
Needs one for ItemStack and Entity. It looks like I missed
the entity one because Mojang defined it as being simple,
which it certainly isn't (they "missed" it too).
Dieser Commit ist enthalten in:
Spottedleaf 2022-03-04 20:57:59 -08:00
Ursprung 42a9c3789d
Commit 1d7a6a0732
1 geänderte Dateien mit 17 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

25
patches/server/0776-Rewrite-dataconverter-system.patch
Datei anzeigen

@ -207,7 +207,7 @@ index 0000000000000000000000000000000000000000..25f1f4c355c1b4aca12e366f100922c5
+} +}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..44fa4eb2030242fc8d22c616c5d2f42bdfe96198 index 0000000000000000000000000000000000000000..cba546314710df81824c22ae70271c68650da4bc
--- /dev/null --- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java
@@ -0,0 +1,346 @@ @@ -0,0 +1,346 @@
@ -399,7 +399,7 @@ index 0000000000000000000000000000000000000000..44fa4eb2030242fc8d22c616c5d2f42b
+ 2852, + 2852,
+ 2967, + 2967,
+ 2970 + 2970
+ // All up to 1.18.2-pre1 + // All up to 1.18.2
+ }; + };
+ Arrays.sort(converterVersions); + Arrays.sort(converterVersions);
+ +
@ -559,10 +559,10 @@ index 0000000000000000000000000000000000000000..44fa4eb2030242fc8d22c616c5d2f42b
+} +}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..5957de996f4fa1a30ec16c7d6e377b1fabd0eb2f index 0000000000000000000000000000000000000000..ec2f53b9523ce39775b034b78ceb2a4a7042c07f
--- /dev/null --- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java
@@ -0,0 +1,397 @@ @@ -0,0 +1,401 @@
+package ca.spottedleaf.dataconverter.minecraft; +package ca.spottedleaf.dataconverter.minecraft;
+ +
+@SuppressWarnings("unused") +@SuppressWarnings("unused")
@ -959,6 +959,10 @@ index 0000000000000000000000000000000000000000..5957de996f4fa1a30ec16c7d6e377b1f
+ public static final int V22W06A = 2968; + public static final int V22W06A = 2968;
+ public static final int V22W07A = 2969; + public static final int V22W07A = 2969;
+ public static final int V1_18_2_PRE1 = 2971; + public static final int V1_18_2_PRE1 = 2971;
+ public static final int V1_18_2_PRE2 = 2972;
+ public static final int V1_18_2_PRE3 = 2973;
+ public static final int V1_18_2_RC1 = 2974;
+ public static final int V1_18_2 = 2975;
+} +}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/ReplacedDataFixerUpper.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/ReplacedDataFixerUpper.java diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/ReplacedDataFixerUpper.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/ReplacedDataFixerUpper.java
new file mode 100644 new file mode 100644
@ -14783,15 +14787,16 @@ index 0000000000000000000000000000000000000000..f6a6f33d4f701f4188828994c8e56dea
+} +}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..2c6450ae2786d05a9eed8c2e8ae03acf5ff3dab4 index 0000000000000000000000000000000000000000..6fcfcb66e1fd9291abad47e41ee076a7816b4244
--- /dev/null --- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2688.java
@@ -0,0 +1,18 @@ @@ -0,0 +1,20 @@
+package ca.spottedleaf.dataconverter.minecraft.versions; +package ca.spottedleaf.dataconverter.minecraft.versions;
+ +
+import ca.spottedleaf.dataconverter.minecraft.MCVersions; +import ca.spottedleaf.dataconverter.minecraft.MCVersions;
+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry; +import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
+import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItemLists; +import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItemLists;
+import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItems;
+ +
+public final class V2688 { +public final class V2688 {
+ +
@ -14803,6 +14808,7 @@ index 0000000000000000000000000000000000000000..2c6450ae2786d05a9eed8c2e8ae03acf
+ +
+ public static void register() { + public static void register() {
+ registerMob("minecraft:glow_squid"); + registerMob("minecraft:glow_squid");
+ MCTypeRegistry.ENTITY.addWalker(VERSION, "minecraft:glow_item_frame", new DataWalkerItems("Item"));
+ } + }
+} +}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2690.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2690.java diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2690.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V2690.java
@ -17463,10 +17469,10 @@ index 0000000000000000000000000000000000000000..88d9c0fcd88ccfd6d6b46ae050914079
+} +}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V704.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V704.java diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V704.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V704.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..216cb6bba5971b17963cd6f60391efccfc36243b index 0000000000000000000000000000000000000000..7fbb8e9e78ad2165a46a7360e3f60e56df681cd2
--- /dev/null --- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V704.java +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V704.java
@@ -0,0 +1,335 @@ @@ -0,0 +1,338 @@
+package ca.spottedleaf.dataconverter.minecraft.versions; +package ca.spottedleaf.dataconverter.minecraft.versions;
+ +
+import ca.spottedleaf.dataconverter.converters.DataConverter; +import ca.spottedleaf.dataconverter.converters.DataConverter;
@ -17736,6 +17742,9 @@ index 0000000000000000000000000000000000000000..216cb6bba5971b17963cd6f60391efcc
+ // add missing item_frame entity id + // add missing item_frame entity id
+ // version check is same for armorstand, as both were namespaced at the same time + // version check is same for armorstand, as both were namespaced at the same time
+ entityId = DataConverter.getVersion(fromVersion) < 705 ? "ItemFrame" : "minecraft:item_frame"; + entityId = DataConverter.getVersion(fromVersion) < 705 ? "ItemFrame" : "minecraft:item_frame";
+ } else if ("minecraft:glow_item_frame".equals(itemId)) {
+ // add missing glow_item_frame entity id
+ entityId = "minecraft:glow_item_frame";
+ } else { + } else {
+ entityId = entityTag.getString("id"); + entityId = entityTag.getString("id");
+ } + }