Change legacy_smiting to anvil in 1.20->1.19.4 (#22)

last_snapshot.txt

@@ -1 +1 @@
-1.20.6
+24w18a

mappings/diff/mapping-1.19.4to1.20.json

@@ -62,7 +62,7 @@
     "suspicious_sand": ""
   },
   "menus": {
-    "legacy_smithing": "furnace"
+    "legacy_smithing": "anvil"
   },
   "tags": {
     "block": {
@@ -152,4 +152,4 @@
       ]
     }
   }
-}
+}

mappings/diff/mapping-1.20.5to1.21.json

@@ -0,0 +1,6 @@
+{
+  "sounds": {
+    "block.trial_spawner.charge_activate": "block.trial_spawner.ominous_activate",
+    "block.trial_spawner.ambient_charged": "block.trial_spawner.ambient_ominous"
+  }
+}

mappings/diff/mapping-1.21to1.20.5.json

@@ -0,0 +1,30 @@
+{
+  "items": {
+    "music_disc_creator": "music_disc_far",
+    "music_disc_creator_music_box": "music_disc_blocks",
+    "music_disc_precipice": "music_disc_ward"
+  },
+  "itemnames": {
+    "music_disc_creator": "1.21 Music Disc Creator",
+    "music_disc_creator_music_box": "1.21 Music Disc Creator (Music Box)",
+    "music_disc_precipice": "1.21 Music Disc Precipice"
+  },
+  "sounds": {
+    "block.trial_spawner.ominous_activate": "block.trial_spawner.charge_activate",
+    "block.trial_spawner.ambient_ominous": "block.trial_spawner.ambient_charged",
+    "music_disc.creator": "",
+    "music_disc.creator_music_box": "",
+    "music_disc.precipice": ""
+  },
+  "attributes": {
+    "generic.burning_time": "",
+    "generic.explosion_knockback_resistance": "",
+    "player.mining_efficiency": "",
+    "generic.movement_efficiency": "",
+    "generic.oxygen_bonus": "",
+    "player.sneaking_speed": "",
+    "player.submerged_mining_speed": "",
+    "player.sweeping_damage_ratio": "",
+    "generic.water_movement_efficiency": ""
+  }
+}

mappings/identifier-table.json

@@ -1352,7 +1352,10 @@
     "red_key",
     "blue_key",
     "yellow_key",
-    "3d"
+    "3d",
+    "music_disc_creator",
+    "music_disc_creator_music_box",
+    "music_disc_precipice"
   ],
   "particles": [
     "ambient_entity_effect",

mappings/mapping-1.21.json

@@ -28920,6 +28920,8 @@
     "music_disc_cat",
     "music_disc_blocks",
     "music_disc_chirp",
+    "music_disc_creator",
+    "music_disc_creator_music_box",
     "music_disc_far",
     "music_disc_mall",
     "music_disc_mellohi",
@@ -28932,6 +28934,7 @@
     "music_disc_relic",
     "music_disc_5",
     "music_disc_pigstep",
+    "music_disc_precipice",
     "disc_fragment_5",
     "trident",
     "phantom_membrane",
@@ -29763,9 +29766,9 @@
     "block.trial_spawner.spawn_item",
     "block.trial_spawner.spawn_item_begin",
     "block.trial_spawner.detect_player",
-    "block.trial_spawner.charge_activate",
+    "block.trial_spawner.ominous_activate",
     "block.trial_spawner.ambient",
-    "block.trial_spawner.ambient_charged",
+    "block.trial_spawner.ambient_ominous",
     "block.trial_spawner.open_shutter",
     "block.trial_spawner.close_shutter",
     "block.trial_spawner.eject_item",
@@ -29966,6 +29969,9 @@
     "music_disc.ward",
     "music_disc.otherside",
     "music_disc.relic",
+    "music_disc.creator",
+    "music_disc.creator_music_box",
+    "music_disc.precipice",
     "music.dragon",
     "music.end",
     "music.game",
@@ -30901,50 +30907,6 @@
     "loot_modifier",
     "uuid"
   ],
-  "enchantments": [
-    "protection",
-    "fire_protection",
-    "feather_falling",
-    "blast_protection",
-    "projectile_protection",
-    "respiration",
-    "aqua_affinity",
-    "thorns",
-    "depth_strider",
-    "frost_walker",
-    "binding_curse",
-    "soul_speed",
-    "swift_sneak",
-    "sharpness",
-    "smite",
-    "bane_of_arthropods",
-    "knockback",
-    "fire_aspect",
-    "looting",
-    "sweeping_edge",
-    "efficiency",
-    "silk_touch",
-    "unbreaking",
-    "fortune",
-    "power",
-    "punch",
-    "flame",
-    "infinity",
-    "luck_of_the_sea",
-    "lure",
-    "loyalty",
-    "impaling",
-    "riptide",
-    "channeling",
-    "multishot",
-    "quick_charge",
-    "piercing",
-    "density",
-    "breach",
-    "wind_burst",
-    "mending",
-    "vanishing_curse"
-  ],
   "entities": [
     "allay",
     "area_effect_cloud",
@@ -31077,38 +31039,6 @@
     "player",
     "fishing_bobber"
   ],
-  "paintings": [
-    "kebab",
-    "aztec",
-    "alban",
-    "aztec2",
-    "bomb",
-    "plant",
-    "wasteland",
-    "pool",
-    "courbet",
-    "sea",
-    "sunset",
-    "creebet",
-    "wanderer",
-    "graham",
-    "match",
-    "bust",
-    "stage",
-    "void",
-    "skull_and_roses",
-    "wither",
-    "fighters",
-    "pointer",
-    "pigscene",
-    "burning_skull",
-    "skeleton",
-    "earth",
-    "wind",
-    "water",
-    "fire",
-    "donkey_kong"
-  ],
   "menus": [
     "generic_9x1",
     "generic_9x2",
@@ -31144,6 +31074,8 @@
     "generic.attack_speed",
     "player.block_break_speed",
     "player.block_interaction_range",
+    "generic.burning_time",
+    "generic.explosion_knockback_resistance",
     "player.entity_interaction_range",
     "generic.fall_damage_multiplier",
     "generic.flying_speed",
@@ -31154,11 +31086,18 @@
     "generic.luck",
     "generic.max_absorption",
     "generic.max_health",
+    "player.mining_efficiency",
+    "generic.movement_efficiency",
     "generic.movement_speed",
+    "generic.oxygen_bonus",
     "generic.safe_fall_distance",
     "generic.scale",
+    "player.sneaking_speed",
     "zombie.spawn_reinforcements",
-    "generic.step_height"
+    "generic.step_height",
+    "player.submerged_mining_speed",
+    "player.sweeping_damage_ratio",
+    "generic.water_movement_efficiency"
   ],
   "recipe_serializers": [
     "crafting_shaped",

output_hashes.json

@@ -1,70 +1,70 @@
 {
   "1.13": {
-    "object-hash": 1835999558,
+    "object-hash": 1835999553,
     "size": 94
   },
   "1.13.2": {
-    "object-hash": 214381667,
+    "object-hash": 214381662,
     "size": 192
   },
   "1.14": {
-    "object-hash": 1631090930,
+    "object-hash": 1631090925,
     "size": 570
   },
   "1.15": {
-    "object-hash": 667164485,
+    "object-hash": 667164480,
     "size": 594
   },
   "1.16": {
-    "object-hash": 978512762,
+    "object-hash": 978512757,
     "size": 1210
   },
   "1.16.2": {
-    "object-hash": 1064891088,
+    "object-hash": 1064891083,
     "size": 1394
   },
   "1.17": {
-    "object-hash": -1238441101,
+    "object-hash": -1238441106,
     "size": 2594
   },
   "1.18": {
-    "object-hash": 521012559,
+    "object-hash": 521012554,
     "size": 2707
   },
   "1.19": {
-    "object-hash": -929747200,
+    "object-hash": -929747205,
     "size": 3444
   },
   "1.19.3": {
-    "object-hash": 537457037,
+    "object-hash": 537457032,
     "size": 3583
   },
   "1.19.4": {
-    "object-hash": -2120264184,
+    "object-hash": -2120264189,
     "size": 4215
   },
   "1.20": {
-    "object-hash": 1019999243,
+    "object-hash": 1019999238,
     "size": 4287
   },
   "1.20.2": {
-    "object-hash": 1019999243,
+    "object-hash": 1019999238,
     "size": 4287
   },
   "1.20.3": {
-    "object-hash": -898988321,
+    "object-hash": -898988326,
     "size": 4568
   },
   "1.20.5": {
-    "object-hash": 123791910,
+    "object-hash": 123791905,
     "size": 4840
   },
   "3D_Shareware": {
-    "object-hash": -639482332,
+    "object-hash": -639482337,
     "size": 972
   },
   "20w14infinite": {
-    "object-hash": 682358467,
+    "object-hash": 682358462,
     "size": 1522
   },
   "1.10:1.9.4": {
@@ -216,15 +216,15 @@
     "size": 94
   },
   "1.21": {
-    "object-hash": 123791910,
-    "size": 4840
+    "object-hash": -193969417,
+    "size": 4864
   },
   "1.20.5:1.21": {
-    "object-hash": 653141963,
-    "size": 67
+    "object-hash": -1185141951,
+    "size": 312
   },
   "1.21:1.20.5": {
-    "object-hash": 653141963,
-    "size": 67
+    "object-hash": 655633032,
+    "size": 794
   }
 }

src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java

@@ -296,13 +296,14 @@ public final class MappingsOptimizer {
         if (updatedGlobalIdentifiers) {
             // Also keep a json file around for easier viewing
             writeJson(globalIdentifiersObject, MAPPINGS_DIR.resolve("identifier-table.json"));
-
-            final Path outputPath = OUTPUT_DIR.resolve(OUTPUT_GLOBAL_IDENTIFIERS_FILE);
-            final CompoundTag globalIdentifiersTag = (CompoundTag) JsonConverter.toTag(globalIdentifiersObject);
-            write(globalIdentifiersTag, outputPath);
-            updatedGlobalIdentifiers = false;
             LOGGER.info("Updated global identifiers file");
         }
+
+        // Always create output file
+        final Path outputPath = OUTPUT_DIR.resolve(OUTPUT_GLOBAL_IDENTIFIERS_FILE);
+        final CompoundTag globalIdentifiersTag = (CompoundTag) JsonConverter.toTag(globalIdentifiersObject);
+        write(globalIdentifiersTag, outputPath);
+        updatedGlobalIdentifiers = false;
     }
 
     private static void addFileData(final String key, final int hash, final Path path) throws IOException {
@@ -552,6 +553,7 @@ public final class MappingsOptimizer {
         }
 
         // Use the same compact storage on the identifier->global identifier files, just about halves the size
+        // TODO Omit mapped size?
         final MappingsResult result = MappingsLoader.map(identifiers, globalIdentifiersArray, null, errorStrategy);
         serialize(result, tag, key, true);
     }