From 0246a9da86a923e68d079eeceaeabdf750ee630d Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 28 Jul 2024 17:36:53 -0700 Subject: [PATCH] Add mob bucket items to item id to entity map in DataConverter Mojang missed these in their mapping. Since the entity data is used when spawning the bucketed mob, we need to have these inside the id map to ensure that the entity data is converted correctly if the entity id is missing. --- .../server/0989-Rewrite-dataconverter-system.patch | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/patches/server/0989-Rewrite-dataconverter-system.patch b/patches/server/0989-Rewrite-dataconverter-system.patch index 6df1423d3c..1e689d81de 100644 --- a/patches/server/0989-Rewrite-dataconverter-system.patch +++ b/patches/server/0989-Rewrite-dataconverter-system.patch @@ -23833,10 +23833,10 @@ index 0000000000000000000000000000000000000000..cc593df4a09d6cb93196d8cfb34ebac4 +} 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 -index 0000000000000000000000000000000000000000..10ee10109405bd569beb23a235a7411db45d6ec0 +index 0000000000000000000000000000000000000000..e6777f58d7d4722cabd30fa495cee054f58b3e48 --- /dev/null +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V704.java -@@ -0,0 +1,432 @@ +@@ -0,0 +1,440 @@ +package ca.spottedleaf.dataconverter.minecraft.versions; + +import ca.spottedleaf.dataconverter.converters.DataConverter; @@ -24115,6 +24115,14 @@ index 0000000000000000000000000000000000000000..10ee10109405bd569beb23a235a7411d + ITEM_ID_TO_ENTITY_ID.put("minecraft:hopper_minecart", makeDouble(V99.VERSION, "MinecartHopper", V705.VERSION, "minecraft:hopper_minecart")); + ITEM_ID_TO_ENTITY_ID.put("minecraft:item_frame", makeDouble(V99.VERSION, "ItemFrame", V705.VERSION, "minecraft:item_frame")); + ITEM_ID_TO_ENTITY_ID.put("minecraft:glow_item_frame", makeSingle(V705.VERSION, "minecraft:glow_item_frame")); ++ ++ // Mojang missed these ++ ITEM_ID_TO_ENTITY_ID.put("minecraft:pufferfish_bucket", makeSingle(V705.VERSION, "minecraft:pufferfish")); ++ ITEM_ID_TO_ENTITY_ID.put("minecraft:salmon_bucket", makeSingle(V705.VERSION, "minecraft:salmon")); ++ ITEM_ID_TO_ENTITY_ID.put("minecraft:cod_bucket", makeSingle(V705.VERSION, "minecraft:cod")); ++ ITEM_ID_TO_ENTITY_ID.put("minecraft:tropical_fish_bucket", makeSingle(V705.VERSION, "minecraft:tropical_fish")); ++ ITEM_ID_TO_ENTITY_ID.put("minecraft:axolotl_bucket", makeSingle(V705.VERSION, "minecraft:axolotl")); ++ ITEM_ID_TO_ENTITY_ID.put("minecraft:tadpole_bucket", makeSingle(V705.VERSION, "minecraft:tadpole")); + } + + private static final Map TILE_ID_UPDATE = new HashMap<>();