From 45adee02dd706e035cc93168eae50422e02af2c3 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 28 Feb 2024 22:41:16 +0100 Subject: [PATCH] Add data_component_type --- build.gradle.kts | 2 +- mappings/mapping-1.20.3.json | 49 ++++++++++++++++++ mappings/mapping-1.20.5.json | 49 ++++++++++++++++++ output/identifiers-1.20.3.nbt | Bin 3967 -> 4722 bytes output/identifiers-1.20.5.nbt | Bin 4039 -> 4794 bytes .../mappingsgenerator/MappingsGenerator.java | 1 + .../mappingsgenerator/MappingsOptimizer.java | 2 + 7 files changed, 102 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e6c9c25..ff06336 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { api("ch.qos.logback:logback-classic:1.4.14") compileOnly("org.jetbrains:annotations:24.0.1") // Uncomment to manually run mappings gen in ide - // compileOnly(files("server.jar")) + compileOnly(files("server.jar")) testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testRuntimeOnly("org.junit.platform:junit-platform-launcher") diff --git a/mappings/mapping-1.20.3.json b/mappings/mapping-1.20.3.json index b928640..33d3057 100644 --- a/mappings/mapping-1.20.3.json +++ b/mappings/mapping-1.20.3.json @@ -31028,5 +31028,54 @@ "smithing_transform", "smithing_trim", "crafting_decorated_pot" + ], + "data_component_type": [ + "custom_data", + "damage", + "unbreakable", + "custom_name", + "lore", + "enchantments", + "can_place_on", + "can_break", + "attribute_modifiers", + "custom_model_data", + "hide_additional_tooltip", + "repair_cost", + "creative_slot_lock", + "enchantment_glint_override", + "intangible_projectile", + "stored_enchantments", + "dyed_color", + "map_color", + "map_id", + "map_decorations", + "map_post_processing", + "charged_projectiles", + "bundle_contents", + "potion_contents", + "suspicious_stew_effects", + "writable_book_content", + "written_book_content", + "trim", + "debug_stick_state", + "entity_data", + "bucket_entity_data", + "block_entity_data", + "instrument", + "recipes", + "lodestone_target", + "firework_explosion", + "fireworks", + "profile", + "note_block_sound", + "banner_patterns", + "base_color", + "pot_decorations", + "container", + "block_state", + "bees", + "lock", + "container_loot" ] } \ No newline at end of file diff --git a/mappings/mapping-1.20.5.json b/mappings/mapping-1.20.5.json index ec698b5..aa33ae0 100644 --- a/mappings/mapping-1.20.5.json +++ b/mappings/mapping-1.20.5.json @@ -31110,5 +31110,54 @@ "smithing_transform", "smithing_trim", "crafting_decorated_pot" + ], + "data_component_type": [ + "custom_data", + "damage", + "unbreakable", + "custom_name", + "lore", + "enchantments", + "can_place_on", + "can_break", + "attribute_modifiers", + "custom_model_data", + "hide_additional_tooltip", + "repair_cost", + "creative_slot_lock", + "enchantment_glint_override", + "intangible_projectile", + "stored_enchantments", + "dyed_color", + "map_color", + "map_id", + "map_decorations", + "map_post_processing", + "charged_projectiles", + "bundle_contents", + "potion_contents", + "suspicious_stew_effects", + "writable_book_content", + "written_book_content", + "trim", + "debug_stick_state", + "entity_data", + "bucket_entity_data", + "block_entity_data", + "instrument", + "recipes", + "lodestone_target", + "firework_explosion", + "fireworks", + "profile", + "note_block_sound", + "banner_patterns", + "base_color", + "pot_decorations", + "container", + "block_state", + "bees", + "lock", + "container_loot" ] } \ No newline at end of file diff --git a/output/identifiers-1.20.3.nbt b/output/identifiers-1.20.3.nbt index 65f280b1f01b0622bccb170855a8828360c3f6f0..d5353a88efa08bc24687c122ad903cc03f5390b3 100644 GIT binary patch delta 769 zcmY*X%WfMn4CKK`YCEXoxIus(dg{HOBhw_Y69D{xWt>ELbo~L`BtQBAVL6r1(C>W6b~(Q& zengmMZU}c+;OWHN93ime$RJlf5dfsW?F z)y6LvmCVq_3^z>fL#el&R|*dweHhG{SwiaYyy#Um`OE$QJD_CuKB4%O^muyyEZUO@{gqHXFUhTDdbDhk|Z z8=A#e&}nySL)lWpJvS@0Ig84fpaBE2%wmtRx!nOvdKEjp=tb#8Eo2#}a*eugU n@X}-IGw2yz1wQZbd9ngno>{s%m<2RpwwJaIpZ~wH?O=s}5?vWW delta 9 QcmeyQ@?UO49X}%j02c29asU7T diff --git a/output/identifiers-1.20.5.nbt b/output/identifiers-1.20.5.nbt index 39f30a9d3b545b254d70ff72c7a9682eccaaffb6..84cbd575c2523c74d4f8eaa516d89dfd0d94a2d6 100644 GIT binary patch delta 769 zcmY*X%WfMn4CKK`YCEXoxIutkdg{5KBMztnR-p#7~+B9D~|7Ik{4_z3`hz%ovvJi7h>ZjvAUfUulOXy|u7WV@VS z6h9)&GB<=fEb-YF9gR!iF8bnX_7NQynD^UTHEg_Uqi~!Q-N=cygiT<5<}(EIsqfP> zC3HR|QsUyXQ|7ExVcD>HYNlKi9-?VddPOIh)n$%5`1(PK8#0+Ue#O>|4<7C2%RonS z;cDX-j7nx`V}=_h_n}l^kq!n$Hh(Z5eLWv<`jHZ>`afahW(v3nY&uX)R%ebVLS=xB zrP2oDxpWg)9m7(z2Xs;)|T{e3i}~UaffR5FW5TtG_Rlq711{J5yNf6NEHR{ zvklGSE9kU4wV`aO;hvin|E!tCe8K!36S%b`4%?pkePLUJQy*bV1XjV9g3VQ16Kt00 oB6#UB^%?Yxt^%L;_&iwwEYB?69LxfmFxyMphR^@s*mkhOKc6fa8~^|S delta 9 Qcmdm`dR%_PF@8n{02G}AOaK4? diff --git a/src/main/java/com/viaversion/mappingsgenerator/MappingsGenerator.java b/src/main/java/com/viaversion/mappingsgenerator/MappingsGenerator.java index af2e023..a6a780c 100644 --- a/src/main/java/com/viaversion/mappingsgenerator/MappingsGenerator.java +++ b/src/main/java/com/viaversion/mappingsgenerator/MappingsGenerator.java @@ -162,6 +162,7 @@ public final class MappingsGenerator { addArray(viaMappings, registries, "minecraft:menu", "menus"); addArray(viaMappings, registries, "minecraft:attribute", "attributes"); addArray(viaMappings, registries, "minecraft:recipe_serializer", "recipe_serializers"); + addArray(viaMappings, registries, "minecraft:data_component_type", "data_component_type"); // Save new File("mappings").mkdir(); diff --git a/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java b/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java index b35c65f..cfa7f22 100644 --- a/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java +++ b/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java @@ -165,6 +165,7 @@ public final class MappingsOptimizer { mappings(false, "menus"); mappings(false, "attributes"); mappings(false, "recipe_serializers"); + mappings(false, "data_component_type"); if (diffObject != null) { names("items", "itemnames"); @@ -234,6 +235,7 @@ public final class MappingsOptimizer { storeIdentifiers(identifiers, object, "particles"); storeIdentifiers(identifiers, object, "argumenttypes"); storeIdentifiers(identifiers, object, "recipe_serializers"); + storeIdentifiers(identifiers, object, "data_component_type"); if (SAVED_IDENTIFIER_FILES.add(version)) { write(identifiers, OUTPUT_DIR.resolve(OUTPUT_IDENTIFIERS_FILE_FORMAT.formatted(version))); }