From 05277af3866e5c01fe8d7c567443dc9bcf5d2f05 Mon Sep 17 00:00:00 2001 From: Novampr Date: Tue, 19 May 2026 20:49:55 +0100 Subject: [PATCH] Start on 26.2 mappings --- .../src/main/resources/mappings/sounds.json | 188 +++++++++++++ .../sounds.json.asset_mapper_meta.yml | 246 ++++++++++++++++++ .../src/main/resources/mappings/textures.json | 42 --- .../textures.json.asset_mapper_meta.yml | 36 +++ 4 files changed, 470 insertions(+), 42 deletions(-) diff --git a/converter/src/main/resources/mappings/sounds.json b/converter/src/main/resources/mappings/sounds.json index 5cf3836..15c4b4d 100644 --- a/converter/src/main/resources/mappings/sounds.json +++ b/converter/src/main/resources/mappings/sounds.json @@ -326,6 +326,38 @@ "pale_hanging_moss8": "ambient8", "pale_hanging_moss9": "ambient9" }, + "potent_sulfur": { + "noxious_gas/ambient1": "ambient1", + "noxious_gas/ambient10": "ambient10", + "noxious_gas/ambient11": "ambient11", + "noxious_gas/ambient12": "ambient12", + "noxious_gas/ambient13": "ambient13", + "noxious_gas/ambient14": "ambient14", + "noxious_gas/ambient2": "ambient2", + "noxious_gas/ambient3": "ambient3", + "noxious_gas/ambient4": "ambient4", + "noxious_gas/ambient5": "ambient5", + "noxious_gas/ambient6": "ambient6", + "noxious_gas/ambient7": "ambient7", + "noxious_gas/ambient8": "ambient8", + "noxious_gas/ambient9": "ambient9", + "sulfur_spring/eruption1": "eruption1", + "sulfur_spring/eruption2": "eruption2", + "sulfur_spring/eruption3": "eruption3", + "sulfur_spring/eruption4": "eruption4", + "sulfur_spring/eruption5": "eruption5", + "sulfur_spring/eruption6": "eruption6", + "sulfur_spring/eruption7": "eruption7", + "sulfur_spring/eruption8": "eruption8", + "sulfur_spring/eruption_active1": "eruption_active1", + "sulfur_spring/eruption_active2": "eruption_active2", + "sulfur_spring/eruption_active3": "eruption_active3", + "sulfur_spring/eruption_active4": "eruption_active4", + "sulfur_spring/eruption_active5": "eruption_active5", + "sulfur_spring/eruption_active6": "eruption_active6", + "sulfur_spring/eruption_active7": "eruption_active7", + "sulfur_spring/eruption_active8": "eruption_active8" + }, "resin": { "resin_break1": "break1", "resin_break2": "break2", @@ -960,6 +992,9 @@ "item/bucket/empty_lava3": "bucket/empty_lava3", "item/bucket/empty_powder_snow1": "bucket/empty_powder_snow1", "item/bucket/empty_powder_snow2": "bucket/empty_powder_snow2", + "item/bucket/emptysulfurcube1": "mob/sulfur_cube/emptysulfurcube1", + "item/bucket/emptysulfurcube2": "mob/sulfur_cube/emptysulfurcube2", + "item/bucket/emptysulfurcube3": "mob/sulfur_cube/emptysulfurcube3", "item/bucket/fill1": "bucket/fill1", "item/bucket/fill2": "bucket/fill2", "item/bucket/fill3": "bucket/fill3", @@ -971,6 +1006,9 @@ "item/bucket/fill_lava3": "bucket/fill_lava3", "item/bucket/fill_powder_snow1": "bucket/fill_powder_snow1", "item/bucket/fill_powder_snow2": "bucket/fill_powder_snow2", + "item/bucket/fillsulfurcube1": "mob/sulfur_cube/fillsulfurcube1", + "item/bucket/fillsulfurcube2": "mob/sulfur_cube/fillsulfurcube2", + "item/bucket/fillsulfurcube3": "mob/sulfur_cube/fillsulfurcube3", "item/crossbow/loading_end": "crossbow/loading_end", "item/crossbow/loading_middle1": "crossbow/loading_middle1", "item/crossbow/loading_middle2": "crossbow/loading_middle2", @@ -990,6 +1028,8 @@ "item/crossbow/shoot2": "crossbow/shoot2", "item/crossbow/shoot3": "crossbow/shoot3", "item/elytra/elytra_loop": "elytra/elytra_loop", + "item/golden_dandelion/unuse": "mob/resetgrowth", + "item/golden_dandelion/use": "mob/pausegrowth", "item/shovel/flatten1": "block/grass/flatten1", "item/shovel/flatten2": "block/grass/flatten2", "item/shovel/flatten3": "block/grass/flatten3", @@ -1248,6 +1288,154 @@ "retreat4": "panic4", "retreat5": "panic5" }, + "sulfur_cube": { + "ball/bounce1": "bounce1", + "ball/bounce2": "bounce2", + "ball/bounce3": "bounce3", + "ball/bounce4": "bounce4", + "ball/bounce5": "bounce5", + "ball/bounce6": "bounce6", + "ball/bounce7": "bounce7", + "ball/bounce8": "bounce8", + "ball/hit1": [ + "bouncy_hit1", + "explosive_hit1", + "fastflat_hit1", + "fastsliding_hit1", + "highresistance_hit1", + "hot_hit1", + "light_hit1", + "regular_hit1", + "slowbouncy_hit1", + "slowflat_hit1", + "slowsliding_hit1", + "sticky_hit1" + ], + "ball/hit2": [ + "bouncy_hit2", + "explosive_hit2", + "fastflat_hit2", + "fastsliding_hit2", + "highresistance_hit2", + "hot_hit2", + "light_hit2", + "regular_hit2", + "slowbouncy_hit2", + "slowflat_hit2", + "slowsliding_hit2", + "sticky_hit2" + ], + "ball/hit3": [ + "bouncy_hit3", + "explosive_hit3", + "fastflat_hit3", + "fastsliding_hit3", + "highresistance_hit3", + "hot_hit3", + "light_hit3", + "regular_hit3", + "slowbouncy_hit3", + "slowflat_hit3", + "slowsliding_hit3", + "sticky_hit3" + ], + "ball/hit4": [ + "regular_hit4", + "fastsliding_hit4", + "slowflat_hit4", + "slowbouncy_hit4", + "explosive_hit4", + "hot_hit4", + "highresistance_hit4", + "fastflat_hit4", + "light_hit4", + "bouncy_hit4", + "slowsliding_hit4", + "sticky_hit4" + ], + "ball/push1": [ + "bouncy_push1", + "explosive_push1", + "fastflat_push1", + "fastsliding_push1", + "highresistance_push1", + "hot_push1", + "light_push1", + "regular_push1", + "slowbouncy_push1", + "slowflat_push1", + "slowsliding_push1", + "sticky_push1" + ], + "ball/push2": [ + "bouncy_push2", + "explosive_push2", + "fastflat_push2", + "fastsliding_push2", + "highresistance_push2", + "hot_push2", + "light_push2", + "regular_push2", + "slowbouncy_push2", + "slowflat_push2", + "slowsliding_push2", + "sticky_push2" + ], + "ball/push3": [ + "slowbouncy_push3", + "explosive_push3", + "bouncy_push3", + "regular_push3", + "hot_push3", + "fastsliding_push3", + "highresistance_push3", + "fastflat_push3", + "light_push3", + "slowflat_push3", + "slowsliding_push3", + "sticky_push3" + ], + "ball/push4": [ + "bouncy_push4", + "explosive_push4", + "fastflat_push4", + "fastsliding_push4", + "highresistance_push4", + "hot_push4", + "light_push4", + "regular_push4", + "slowbouncy_push4", + "slowflat_push4", + "slowsliding_push4", + "sticky_push4" + ], + "small_sulfur_cube/death": "small/death", + "small_sulfur_cube/hit1": "small/hit1", + "small_sulfur_cube/hit2": "small/hit2", + "small_sulfur_cube/hit3": "small/hit3", + "small_sulfur_cube/hit4": "small/hit4", + "small_sulfur_cube/jump1": "small/jump1", + "small_sulfur_cube/jump10": "small/jump10", + "small_sulfur_cube/jump11": "small/jump11", + "small_sulfur_cube/jump2": "small/jump2", + "small_sulfur_cube/jump3": "small/jump3", + "small_sulfur_cube/jump4": "small/jump4", + "small_sulfur_cube/jump5": "small/jump5", + "small_sulfur_cube/jump6": "small/jump6", + "small_sulfur_cube/jump7": "small/jump7", + "small_sulfur_cube/jump8": "small/jump8", + "small_sulfur_cube/jump9": "small/jump9", + "small_sulfur_cube/squish1": "small/squish1", + "small_sulfur_cube/squish10": "small/squish10", + "small_sulfur_cube/squish2": "small/squish2", + "small_sulfur_cube/squish3": "small/squish3", + "small_sulfur_cube/squish4": "small/squish4", + "small_sulfur_cube/squish5": "small/squish5", + "small_sulfur_cube/squish6": "small/squish6", + "small_sulfur_cube/squish7": "small/squish7", + "small_sulfur_cube/squish8": "small/squish8", + "small_sulfur_cube/squish9": "small/squish9" + }, "turtle/baby/death1": "turtle_baby/death1", "turtle/baby/death2": "turtle_baby/death2", "turtle/baby/egg_hatched1": "turtle_baby/egg_hatched1", diff --git a/converter/src/main/resources/mappings/sounds.json.asset_mapper_meta.yml b/converter/src/main/resources/mappings/sounds.json.asset_mapper_meta.yml index 9da3ec7..7a4789d 100644 --- a/converter/src/main/resources/mappings/sounds.json.asset_mapper_meta.yml +++ b/converter/src/main/resources/mappings/sounds.json.asset_mapper_meta.yml @@ -3066,6 +3066,129 @@ java: - mob/baby_nautilus/death_land - mob/baby_nautilus/hurt_land3 - mob/baby_nautilus/ambient_land1 + - block/cinnabar_bricks + - mob/sulfur_cube/absorb1 + - mob/sulfur_cube/absorb2 + - mob/sulfur_cube/death + - mob/sulfur_cube/eject1 + - mob/sulfur_cube/eject2 + - mob/sulfur_cube/jump1 + - mob/sulfur_cube/jump10 + - mob/sulfur_cube/jump11 + - mob/sulfur_cube/jump2 + - mob/sulfur_cube/jump3 + - mob/sulfur_cube/jump4 + - mob/sulfur_cube/jump5 + - mob/sulfur_cube/jump6 + - mob/sulfur_cube/jump7 + - mob/sulfur_cube/jump8 + - mob/sulfur_cube/jump9 + - mob/sulfur_cube/hit1 + - mob/sulfur_cube/hit2 + - mob/sulfur_cube/hit3 + - mob/sulfur_cube/hit4 + - mob/sulfur_cube/squish1 + - mob/sulfur_cube/squish10 + - mob/sulfur_cube/squish11 + - mob/sulfur_cube/squish2 + - mob/sulfur_cube/squish3 + - mob/sulfur_cube/squish4 + - mob/sulfur_cube/squish5 + - mob/sulfur_cube/squish6 + - mob/sulfur_cube/squish7 + - mob/sulfur_cube/squish8 + - mob/sulfur_cube/squish9 + - music/game/ebb + - music/game/home + - music/game/memories + - music/game/nightly + - music/game/shores + - block/cinnabar/break1 + - block/cinnabar/break2 + - block/cinnabar/break3 + - block/cinnabar/break4 + - block/cinnabar/break5 + - block/cinnabar/break6 + - block/cinnabar/break7 + - block/cinnabar/hit1 + - block/cinnabar/hit2 + - block/cinnabar/hit3 + - block/cinnabar/hit4 + - block/cinnabar/hit5 + - block/cinnabar/hit6 + - block/cinnabar/hit7 + - block/cinnabar/place1 + - block/cinnabar/place2 + - block/cinnabar/place3 + - block/cinnabar/place4 + - block/cinnabar/place5 + - block/cinnabar/place6 + - block/cinnabar/place7 + - block/cinnabar/step1 + - block/cinnabar/step2 + - block/cinnabar/step3 + - block/cinnabar/step4 + - block/cinnabar/step5 + - block/cinnabar/step6 + - block/cinnabar/step7 + - block/potent_sulfur/break1 + - block/potent_sulfur/break2 + - block/potent_sulfur/break3 + - block/potent_sulfur/break4 + - block/potent_sulfur/break5 + - block/potent_sulfur/break6 + - block/potent_sulfur/break7 + - block/potent_sulfur/hit1 + - block/potent_sulfur/hit2 + - block/potent_sulfur/hit3 + - block/potent_sulfur/hit4 + - block/potent_sulfur/hit5 + - block/potent_sulfur/hit6 + - block/potent_sulfur/hit7 + - block/potent_sulfur/place1 + - block/potent_sulfur/place2 + - block/potent_sulfur/place3 + - block/potent_sulfur/place4 + - block/potent_sulfur/place5 + - block/potent_sulfur/place6 + - block/potent_sulfur/place7 + - block/potent_sulfur/place8 + - block/potent_sulfur/step1 + - block/potent_sulfur/step2 + - block/potent_sulfur/step3 + - block/potent_sulfur/step4 + - block/potent_sulfur/step5 + - block/potent_sulfur/step6 + - block/potent_sulfur/step7 + - block/sulfur/break1 + - block/sulfur/break2 + - block/sulfur/break3 + - block/sulfur/break4 + - block/sulfur/break5 + - block/sulfur/break6 + - block/sulfur/break7 + - block/sulfur/hit1 + - block/sulfur/hit2 + - block/sulfur/hit3 + - block/sulfur/hit4 + - block/sulfur/hit5 + - block/sulfur/hit6 + - block/sulfur/hit7 + - block/sulfur/place1 + - block/sulfur/place2 + - block/sulfur/place3 + - block/sulfur/place4 + - block/sulfur/place5 + - block/sulfur/place6 + - block/sulfur/place7 + - block/sulfur/place8 + - block/sulfur/step1 + - block/sulfur/step2 + - block/sulfur/step3 + - block/sulfur/step4 + - block/sulfur/step5 + - block/sulfur/step6 + - block/sulfur/step7 transformed-paths: [] relative-path: sounds bedrock: @@ -6134,5 +6257,128 @@ bedrock: - mob/baby_nautilus/hurt_land2 - mob/baby_nautilus/hurt_land3 - mob/baby_nautilus/hurt_land4 + - blocks/cinnabar_bricks + - mob/sulfur_cube/absorb1 + - mob/sulfur_cube/absorb2 + - mob/sulfur_cube/death + - mob/sulfur_cube/eject1 + - mob/sulfur_cube/eject2 + - mob/sulfur_cube/jump1 + - mob/sulfur_cube/jump10 + - mob/sulfur_cube/jump11 + - mob/sulfur_cube/jump2 + - mob/sulfur_cube/jump3 + - mob/sulfur_cube/jump4 + - mob/sulfur_cube/jump5 + - mob/sulfur_cube/jump6 + - mob/sulfur_cube/jump7 + - mob/sulfur_cube/jump8 + - mob/sulfur_cube/jump9 + - mob/sulfur_cube/hit1 + - mob/sulfur_cube/hit2 + - mob/sulfur_cube/hit3 + - mob/sulfur_cube/hit4 + - mob/sulfur_cube/squish1 + - mob/sulfur_cube/squish10 + - mob/sulfur_cube/squish11 + - mob/sulfur_cube/squish2 + - mob/sulfur_cube/squish3 + - mob/sulfur_cube/squish4 + - mob/sulfur_cube/squish5 + - mob/sulfur_cube/squish6 + - mob/sulfur_cube/squish7 + - mob/sulfur_cube/squish8 + - mob/sulfur_cube/squish9 + - music/game/ebb + - music/game/home + - music/game/memories + - music/game/nightly + - music/game/shores + - block/cinnabar/break1 + - block/cinnabar/break2 + - block/cinnabar/break3 + - block/cinnabar/break4 + - block/cinnabar/break5 + - block/cinnabar/break6 + - block/cinnabar/break7 + - block/cinnabar/hit1 + - block/cinnabar/hit2 + - block/cinnabar/hit3 + - block/cinnabar/hit4 + - block/cinnabar/hit5 + - block/cinnabar/hit6 + - block/cinnabar/hit7 + - block/cinnabar/place1 + - block/cinnabar/place2 + - block/cinnabar/place3 + - block/cinnabar/place4 + - block/cinnabar/place5 + - block/cinnabar/place6 + - block/cinnabar/place7 + - block/cinnabar/step1 + - block/cinnabar/step2 + - block/cinnabar/step3 + - block/cinnabar/step4 + - block/cinnabar/step5 + - block/cinnabar/step6 + - block/cinnabar/step7 + - block/potent_sulfur/break1 + - block/potent_sulfur/break2 + - block/potent_sulfur/break3 + - block/potent_sulfur/break4 + - block/potent_sulfur/break5 + - block/potent_sulfur/break6 + - block/potent_sulfur/break7 + - block/potent_sulfur/hit1 + - block/potent_sulfur/hit2 + - block/potent_sulfur/hit3 + - block/potent_sulfur/hit4 + - block/potent_sulfur/hit5 + - block/potent_sulfur/hit6 + - block/potent_sulfur/hit7 + - block/potent_sulfur/place1 + - block/potent_sulfur/place2 + - block/potent_sulfur/place3 + - block/potent_sulfur/place4 + - block/potent_sulfur/place5 + - block/potent_sulfur/place6 + - block/potent_sulfur/place7 + - block/potent_sulfur/place8 + - block/potent_sulfur/step1 + - block/potent_sulfur/step2 + - block/potent_sulfur/step3 + - block/potent_sulfur/step4 + - block/potent_sulfur/step5 + - block/potent_sulfur/step6 + - block/potent_sulfur/step7 + - block/sulfur/break1 + - block/sulfur/break2 + - block/sulfur/break3 + - block/sulfur/break4 + - block/sulfur/break5 + - block/sulfur/break6 + - block/sulfur/break7 + - block/sulfur/hit1 + - block/sulfur/hit2 + - block/sulfur/hit3 + - block/sulfur/hit4 + - block/sulfur/hit5 + - block/sulfur/hit6 + - block/sulfur/hit7 + - block/sulfur/place1 + - block/sulfur/place2 + - block/sulfur/place3 + - block/sulfur/place4 + - block/sulfur/place5 + - block/sulfur/place6 + - block/sulfur/place7 + - block/sulfur/place8 + - block/sulfur/step1 + - block/sulfur/step2 + - block/sulfur/step3 + - block/sulfur/step4 + - block/sulfur/step5 + - block/sulfur/step6 + - block/sulfur/step7 transformed-paths: [] relative-path: sounds diff --git a/converter/src/main/resources/mappings/textures.json b/converter/src/main/resources/mappings/textures.json index 39e1a49..995047a 100644 --- a/converter/src/main/resources/mappings/textures.json +++ b/converter/src/main/resources/mappings/textures.json @@ -980,24 +980,6 @@ "polarbear" ], "bear/polarbear_baby": "polar_bear/polar_bear_baby", - "bed": { - "black": "black", - "blue": "blue", - "brown": "brown", - "cyan": "cyan", - "gray": "gray", - "green": "green", - "light_blue": "light_blue", - "light_gray": "silver", - "lime": "lime", - "magenta": "magenta", - "orange": "orange", - "pink": "pink", - "purple": "purple", - "red": "red", - "white": "white", - "yellow": "yellow" - }, "bee": { "bee": "bee", "bee_angry": "bee_angry", @@ -1247,30 +1229,6 @@ "shulker": "shulker_undyed", "spark": "spark" }, - "signs/acacia": "sign_acacia", - "signs/bamboo": "bamboo_sign", - "signs/birch": "sign_birch", - "signs/cherry": "cherry_sign", - "signs/crimson": "sign_crimson", - "signs/dark_oak": "sign_darkoak", - "signs/hanging/acacia": "acacia_hanging_sign", - "signs/hanging/bamboo": "bamboo_hanging_sign", - "signs/hanging/birch": "birch_hanging_sign", - "signs/hanging/cherry": "cherry_hanging_sign", - "signs/hanging/crimson": "crimson_hanging_sign", - "signs/hanging/dark_oak": "dark_oak_hanging_sign", - "signs/hanging/jungle": "jungle_hanging_sign", - "signs/hanging/mangrove": "mangrove_hanging_sign", - "signs/hanging/oak": "oak_hanging_sign", - "signs/hanging/pale_oak": "pale_oak_hanging_sign", - "signs/hanging/spruce": "spruce_hanging_sign", - "signs/hanging/warped": "warped_hanging_sign", - "signs/jungle": "sign_jungle", - "signs/mangrove": "mangrove_sign", - "signs/oak": "sign", - "signs/pale_oak": "pale_oak_sign", - "signs/spruce": "sign_spruce", - "signs/warped": "sign_warped", "silverfish/silverfish": "silverfish", "skeleton": { "bogged_overlay": "bogged_clothes" diff --git a/converter/src/main/resources/mappings/textures.json.asset_mapper_meta.yml b/converter/src/main/resources/mappings/textures.json.asset_mapper_meta.yml index ad1b9f0..d1ab2f0 100644 --- a/converter/src/main/resources/mappings/textures.json.asset_mapper_meta.yml +++ b/converter/src/main/resources/mappings/textures.json.asset_mapper_meta.yml @@ -552,6 +552,24 @@ java: - entity/panda/panda_baby - entity/hoglin/hoglin_baby - entity/sniffer/snifflet + - entity/sulfur_cube/sulfur_cube_inner + - entity/sulfur_cube/sulfur_cube_outer + - block/sulfur + - block/sulfur_bricks + - block/sulfur_spike_down_base + - block/sulfur_spike_down_frustum + - block/sulfur_spike_down_middle + - block/sulfur_spike_down_tip + - block/sulfur_spike_down_tip_merge + - block/sulfur_spike_up_base + - block/sulfur_spike_up_frustum + - block/sulfur_spike_up_middle + - block/sulfur_spike_up_tip + - block/sulfur_spike_up_tip_merge + - block/cinnabar + - block/chiseled_cinnabar + - block/chiseled_sulfur + - block/cinnabar_bricks transformed-paths: - block/copper_chain - entity/conduit/base @@ -1848,6 +1866,24 @@ bedrock: - entity/panda/panda_baby - entity/hoglin/hoglin_baby - entity/sniffer/snifflet + - entity/sulfur_cube/sulfur_cube_inner + - entity/sulfur_cube/sulfur_cube_outer + - blocks/sulfur + - blocks/sulfur_bricks + - blocks/sulfur_spike_down_base + - blocks/sulfur_spike_down_frustum + - blocks/sulfur_spike_down_middle + - blocks/sulfur_spike_down_tip + - blocks/sulfur_spike_down_tip_merge + - blocks/sulfur_spike_up_base + - blocks/sulfur_spike_up_frustum + - blocks/sulfur_spike_up_middle + - blocks/sulfur_spike_up_tip + - blocks/sulfur_spike_up_tip_merge + - blocks/cinnabar + - blocks/chiseled_cinnabar + - blocks/chiseled_sulfur + - blocks/cinnabar_bricks transformed-paths: - blocks/chest_front - blocks/chest_side