Add attributes to mappings

This commit is contained in:
Nassim Jahnke 2023-12-18 16:52:41 +01:00
parent 85889f1e81
commit 6cf6fdd78a
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
9 changed files with 76 additions and 8 deletions

View File

@ -1,5 +1,5 @@
{
"items": {
"scute": ""
"scute": "turtle_scute"
}
}

View File

@ -1,9 +1,15 @@
{
"items": {
"turtle_scute": "",
"armadillo_scute": "",
"wolf_armor": "",
"armadillo_spawn_egg": ""
"turtle_scute": "scute",
"armadillo_scute": "scute",
"wolf_armor": "leather_horse_armor",
"armadillo_spawn_egg": "horse_spawn_egg"
},
"itemnames": {
"turtle_scute": "1.20.5 Turtle Scute",
"armadillo_scute": "1.20.5 Armadillo Scute",
"wolf_armor": "1.20.5 Wolf Armor",
"armadillo_spawn_egg": "1.20.5 Armadillo Spawn Egg"
},
"sounds": {
"entity.armadillo.eat": "",
@ -23,6 +29,15 @@
"entity.breeze.whirl": ""
},
"entities": {
"armadillo": ""
"armadillo": "cow"
},
"entitynames": {
"armadillo": "Armadillo"
},
"attributes": {
"generic.block_interaction_range": "",
"generic.entity_interaction_range": "",
"generic.scale": "",
"generic.step_height": ""
}
}

View File

@ -30987,5 +30987,21 @@
"smoker",
"cartography_table",
"stonecutter"
],
"attributes": [
"generic.armor",
"generic.armor_toughness",
"generic.attack_damage",
"generic.attack_knockback",
"generic.attack_speed",
"generic.flying_speed",
"generic.follow_range",
"horse.jump_strength",
"generic.knockback_resistance",
"generic.luck",
"generic.max_absorption",
"generic.max_health",
"generic.movement_speed",
"zombie.spawn_reinforcements"
]
}

View File

@ -31006,5 +31006,25 @@
"smoker",
"cartography_table",
"stonecutter"
],
"attributes": [
"generic.armor",
"generic.armor_toughness",
"generic.attack_damage",
"generic.attack_knockback",
"generic.attack_speed",
"generic.block_interaction_range",
"generic.entity_interaction_range",
"generic.flying_speed",
"generic.follow_range",
"horse.jump_strength",
"generic.knockback_resistance",
"generic.luck",
"generic.max_absorption",
"generic.max_health",
"generic.movement_speed",
"generic.scale",
"zombie.spawn_reinforcements",
"generic.step_height"
]
}

Binary file not shown.

View File

@ -106,6 +106,6 @@ public final class ManualRunner {
mainClass.getDeclaredMethod("main", String[].class).invoke(null, (Object) new String[]{"--reports"});
}
MappingsGenerator.collectMappings("1.20");
MappingsGenerator.collectMappings("1.20.5");
}
}

View File

@ -160,6 +160,7 @@ public final class MappingsGenerator {
addArray(viaMappings, registries, "minecraft:motive", "paintings");
addArray(viaMappings, registries, "minecraft:painting_variant", "paintings");
addArray(viaMappings, registries, "minecraft:menu", "menus");
addArray(viaMappings, registries, "minecraft:attribute", "attributes");
// Save
new File("mappings").mkdir();

View File

@ -63,7 +63,22 @@ public final class MappingsOptimizer {
public static final String OUTPUT_IDENTIFIERS_FILE_FORMAT = "identifiers-%s.nbt";
private static final Logger LOGGER = LoggerFactory.getLogger(MappingsOptimizer.class.getSimpleName());
private static final Set<String> STANDARD_FIELDS = Set.of("blockstates", "blocks", "items", "menus", "sounds", "blockentities", "enchantments", "paintings", "entities", "particles", "argumenttypes", "statistics", "tags");
private static final Set<String> STANDARD_FIELDS = Set.of(
"blockstates",
"blocks",
"items",
"menus",
"sounds",
"blockentities",
"enchantments",
"paintings",
"entities",
"particles",
"argumenttypes",
"statistics",
"tags",
"attributes"
);
private static final Set<String> SAVED_IDENTIFIER_FILES = new HashSet<>();
private final Set<String> ignoreMissing = new HashSet<>(Arrays.asList("blocks", "statistics"));
@ -146,6 +161,7 @@ public final class MappingsOptimizer {
mappings(false, "argumenttypes");
mappings(false, "statistics");
mappings(false, "menus");
mappings(false, "attributes");
if (diffObject != null) {
names("items", "itemnames");