mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add missing glow_item_frame walkers

Browse source 
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).
This commit is contained in:
Spottedleaf 2022-03-04 20:57:59 -08:00
commit c232bf0419
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
patches/server/Rewrite-dataconverter-system.patch
View file

@ -399,7 +399,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ 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);
+ +
@ -959,6 +959,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ 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
@ -14792,6 +14796,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+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..00000000000000000000000000000000
+ +
+ 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
@ -17736,6 +17742,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // 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");
+ } + }