Skip to content

Commit

Permalink
Pulling in new jmc2obj textxure mappings for 1.16.?+
Browse files Browse the repository at this point in the history
  • Loading branch information
TheDuckCow committed Jan 18, 2021
1 parent c08a638 commit fa18837
Show file tree
Hide file tree
Showing 2 changed files with 136 additions and 0 deletions.
107 changes: 107 additions & 0 deletions MCprep_addon/MCprep_resources/mcprep_data_update.json
Expand Up @@ -21,9 +21,12 @@
]
},
"block_mapping_jmc": {
"acacia_planks": "acacia_planks",
"acacia_trapdoor": "acacia_trapdoor",
"alban_painting": "painting/alban",
"allium": "allium",
"ancient_debris_side": "ancient_debris_side",
"ancient_debris_top": "ancient_debris_top",
"andesite": "andesite",
"anvil_side": "anvil",
"anvil_top": "anvil_top",
Expand Down Expand Up @@ -105,23 +108,35 @@
"barrel_side": "barrel_side",
"barrel_top": "barrel_top",
"barrel_top_open": "barrel_top_open",
"basalt_side": "basalt_side",
"basalt_top": "basalt_top",
"beacon": "beacon",
"beacon_beam": "entity/beacon_beam",
"bedrock": "bedrock",
"bee_nest_bottom": "bee_nest_bottom",
"bee_nest_front": "bee_nest_front",
"bee_nest_side": "bee_nest_side",
"bee_nest_top": "bee_nest_top",
"beehive_end": "beehive_end",
"beehive_front": "beehive_front",
"beehive_side": "beehive_side",
"beetroots_stage0": "beetroots_stage0",
"beetroots_stage1": "beetroots_stage1",
"beetroots_stage2": "beetroots_stage2",
"beetroots_stage3": "beetroots_stage3",
"bell_bottom": "bell_bottom",
"bell_side": "bell_side",
"bell_top": "bell_top",
"birch_planks": "birch_planks",
"birch_trapdoor": "birch_trapdoor",
"black_bed": "entity/bed/black",
"black_concrete": "black_concrete",
"black_concrete_powder": "black_concrete_powder",
"black_glazed_terracotta": "black_glazed_terracotta",
"black_shulker_box": "black_shulker_box",
"black_terracotta": "black_terracotta",
"blackstone": "blackstone",
"blackstone_top": "blackstone_top",
"blast_furnace_front": "blast_furnace_front",
"blast_furnace_front_on": "blast_furnace_front_on",
"blast_furnace_side": "blast_furnace_side",
Expand Down Expand Up @@ -161,6 +176,7 @@
"cactus_side": "cactus_side",
"cactus_top": "cactus_top",
"cake_bottom": "cake_bottom",
"cake_inner": "cake_inner",
"cake_inside": "cake_inner",
"cake_side": "cake_side",
"cake_top": "cake_top",
Expand All @@ -175,18 +191,29 @@
"cartography_table_side2": "cartography_table_side2",
"cartography_table_side3": "cartography_table_side3",
"cartography_table_top": "cartography_table_top",
"cauldron_bottom": "cauldron_bottom",
"cauldron_feet": "cauldron_bottom",
"cauldron_inner": "cauldron_inner",
"cauldron_inside": "cauldron_inner",
"cauldron_side": "cauldron_side",
"cauldron_top": "cauldron_top",
"chain": "chain",
"chain_command_block": "chain_command_block_back",
"chest": "entity/chest/normal",
"chest_ender": "entity/chest/ender",
"chest_left": "entity/chest/normal_left",
"chest_right": "entity/chest/normal_right",
"chest_trapped": "entity/chest/trapped",
"chest_trapped_left": "entity/chest/trapped_left",
"chest_trapped_right": "entity/chest/trapped_right",
"chipped_anvil_top": "chipped_anvil_top",
"chiseled_nether_bricks": "chiseled_nether_bricks",
"chiseled_polished_blackstone": "chiseled_polished_blackstone",
"chiseled_quartz_block": "chiseled_quartz_block",
"chiseled_quartz_block_top": "chiseled_quartz_block_top",
"chiseled_red_sandstone": "chiseled_red_sandstone",
"chiseled_sandstone": "chiseled_sandstone",
"chiseled_stone_bricks": "chiseled_stone_bricks",
"chorus_flower": "chorus_flower",
"chorus_flower_dead": "chorus_flower_dead",
"chorus_plant": "chorus_plant",
Expand All @@ -208,7 +235,20 @@
"conduit": "conduit",
"cornflower": "cornflower",
"courbet_painting": "painting/courbet",
"cracked_nether_bricks": "cracked_nether_bricks",
"cracked_polished_blackstone_bricks": "cracked_polished_blackstone_bricks",
"cracked_stone_bricks": "cracked_stone_bricks",
"creebet_painting": "painting/creebet",
"crimson_door_bottom": "crimson_door_bottom",
"crimson_door_top": "crimson_door_top",
"crimson_fungus": "crimson_fungus",
"crimson_nylium": "crimson_nylium",
"crimson_nylium_side": "crimson_nylium_side",
"crimson_planks": "crimson_planks",
"crimson_roots": "crimson_roots",
"crimson_stem": "crimson_stem",
"crimson_stem_top": "crimson_stem_top",
"crimson_trapdoor": "crimson_trapdoor",
"crops_1": "wheat_stage0",
"crops_2": "wheat_stage1",
"crops_3": "wheat_stage2",
Expand All @@ -217,6 +257,7 @@
"crops_6": "wheat_stage5",
"crops_7": "wheat_stage6",
"crops_8": "wheat_stage7",
"crying_obsidian": "crying_obsidian",
"cut_red_sandstone": "cut_red_sandstone",
"cut_sandstone": "cut_sandstone",
"cyan_bed": "entity/bed/cyan",
Expand All @@ -227,6 +268,7 @@
"cyan_terracotta": "cyan_terracotta",
"damaged_anvil_top": "damaged_anvil_top",
"dandelion": "dandelion",
"dark_oak_planks": "dark_oak_planks",
"dark_oak_trapdoor": "dark_oak_trapdoor",
"daylight_sensor_inv_top": "daylight_detector_inverted_top",
"daylight_sensor_side": "daylight_detector_side",
Expand Down Expand Up @@ -320,6 +362,7 @@
"furnace_lit_front": "furnace_front_on",
"furnace_side": "furnace_side",
"furnace_top": "furnace_top",
"gilded_blackstone": "gilded_blackstone",
"glass": "glass",
"glass_black": "black_stained_glass",
"glass_blue": "blue_stained_glass",
Expand Down Expand Up @@ -379,6 +422,10 @@
"grindstone_side": "grindstone_side",
"hay_block_side": "hay_block_side",
"hay_block_top": "hay_block_top",
"honey_block_bottom": "honey_block_bottom",
"honey_block_side": "honey_block_side",
"honey_block_top": "honey_block_top",
"honeycomb_block": "honeycomb_block",
"hopper_inside": "hopper_inside",
"hopper_outside": "hopper_outside",
"hopper_top": "hopper_top",
Expand All @@ -394,6 +441,7 @@
"item_frame": "item_frame",
"jukebox_side": "jukebox_side",
"jukebox_top": "jukebox_top",
"jungle_planks": "jungle_planks",
"jungle_trapdoor": "jungle_trapdoor",
"kebab_painting": "painting/kebab",
"kelp": "kelp_plant",
Expand Down Expand Up @@ -439,6 +487,8 @@
"lime_glazed_terracotta": "lime_glazed_terracotta",
"lime_shulker_box": "lime_shulker_box",
"lime_terracotta": "lime_terracotta",
"lodestone_side": "lodestone_side",
"lodestone_top": "lodestone_top",
"log_acacia_side": "acacia_log",
"log_acacia_top": "acacia_log_top",
"log_birch_side": "birch_log",
Expand Down Expand Up @@ -484,13 +534,19 @@
"mushroom_red": "red_mushroom",
"mushroom_stem": "mushroom_stem",
"nether_bricks": "nether_bricks",
"nether_gold_ore": "nether_gold_ore",
"nether_quartz_ore": "nether_quartz_ore",
"nether_sprouts": "nether_sprouts",
"nether_wart_block": "nether_wart_block",
"netherite_block": "netherite_block",
"netherrack": "netherrack",
"netherwart_1": "nether_wart_stage0",
"netherwart_2": "nether_wart_stage1",
"netherwart_3": "nether_wart_stage2",
"noteblock": "note_block",
"oak_door_bottom": "oak_door_bottom",
"oak_door_top": "oak_door_top",
"oak_planks": "oak_planks",
"oak_trapdoor": "oak_trapdoor",
"observer_back": "observer_back",
"observer_back_on": "observer_back_on",
Expand Down Expand Up @@ -530,6 +586,10 @@
"plant_painting": "painting/plant",
"pointer_painting": "painting/pointer",
"polished_andesite": "polished_andesite",
"polished_basalt_side": "polished_basalt_side",
"polished_basalt_top": "polished_basalt_top",
"polished_blackstone": "polished_blackstone",
"polished_blackstone_bricks": "polished_blackstone_bricks",
"polished_diorite": "polished_diorite",
"polished_granite": "polished_granite",
"pool_painting": "painting/pool",
Expand Down Expand Up @@ -557,7 +617,13 @@
"purpur_block": "purpur_block",
"purpur_pillar": "purpur_pillar",
"purpur_pillar_top": "purpur_pillar_top",
"quartz_block_bottom": "quartz_block_bottom",
"quartz_block_side": "quartz_block_side",
"quartz_block_top": "quartz_block_top",
"quartz_bottom": "quartz_block_bottom",
"quartz_bricks": "quartz_bricks",
"quartz_pillar": "quartz_pillar",
"quartz_pillar_top": "quartz_pillar_top",
"quartz_side": "quartz_block_side",
"quartz_side_chiseled": "chiseled_quartz_block",
"quartz_side_lines": "quartz_pillar",
Expand Down Expand Up @@ -601,9 +667,18 @@
"redstone_wire_off": "redstone_dust_line0",
"redstone_wire_on": "redstone_dust_line0",
"repeating_command_block": "repeating_command_block_back",
"respawn_anchor_bottom": "respawn_anchor_bottom",
"respawn_anchor_side0": "respawn_anchor_side0",
"respawn_anchor_side1": "respawn_anchor_side1",
"respawn_anchor_side2": "respawn_anchor_side2",
"respawn_anchor_side3": "respawn_anchor_side3",
"respawn_anchor_side4": "respawn_anchor_side4",
"respawn_anchor_top": "respawn_anchor_top",
"respawn_anchor_top_off": "respawn_anchor_top_off",
"rose_bush_bottom": "rose_bush_bottom",
"rose_bush_top": "rose_bush_top",
"sand": "sand",
"sandstone": "sandstone",
"sandstone_bottom": "sandstone_bottom",
"sandstone_side": "sandstone",
"sandstone_side_carved": "chiseled_sandstone",
Expand All @@ -621,13 +696,16 @@
"sea_painting": "painting/sea",
"sea_pickle": "sea_pickle",
"seagrass": "seagrass",
"shroomlight": "shroomlight",
"shulker_box": "shulker_box",
"sign_acacia": "entity/signs/acacia",
"sign_birch": "entity/signs/birch",
"sign_crimson": "entity/signs/crimson",
"sign_dark_oak": "entity/signs/dark_oak",
"sign_jungle": "entity/signs/jungle",
"sign_oak": "entity/signs/oak",
"sign_spruce": "entity/signs/spruce",
"sign_warped": "entity/signs/warped",
"skeleton_painting": "painting/skeleton",
"skull_and_roses_painting": "painting/skull_and_roses",
"slime": "slime_block",
Expand All @@ -642,10 +720,18 @@
"smooth_stone": "smooth_stone",
"smooth_stone_slab_side": "smooth_stone_slab_side",
"snow": "snow",
"soul_campfire_fire": "soul_campfire_fire",
"soul_campfire_log_lit": "soul_campfire_log_lit",
"soul_fire_0": "soul_fire_0",
"soul_fire_1": "soul_fire_1",
"soul_lantern": "soul_lantern",
"soul_soil": "soul_soil",
"soul_torch": "soul_torch",
"soulsand": "soul_sand",
"spawner": "spawner",
"sponge": "sponge",
"sponge_wet": "wet_sponge",
"spruce_planks": "spruce_planks",
"spruce_trapdoor": "spruce_trapdoor",
"stage_painting": "painting/stage",
"stone": "stone",
Expand All @@ -660,6 +746,8 @@
"stripped_acacia_log_top": "stripped_acacia_log_top",
"stripped_birch_log": "stripped_birch_log",
"stripped_birch_log_top": "stripped_birch_log_top",
"stripped_crimson_stem": "stripped_crimson_stem",
"stripped_crimson_stem_top": "stripped_crimson_stem_top",
"stripped_dark_oak_log": "stripped_dark_oak_log",
"stripped_dark_oak_log_top": "stripped_dark_oak_log_top",
"stripped_jungle_log": "stripped_jungle_log",
Expand All @@ -668,6 +756,8 @@
"stripped_oak_log_top": "stripped_oak_log_top",
"stripped_spruce_log": "stripped_spruce_log",
"stripped_spruce_log_top": "stripped_spruce_log_top",
"stripped_warped_stem": "stripped_warped_stem",
"stripped_warped_stem_top": "stripped_warped_stem_top",
"structure_block": "structure_block",
"structure_block_corner": "structure_block_corner",
"structure_block_data": "structure_block_data",
Expand All @@ -686,6 +776,8 @@
"tall_grass": "grass",
"tall_seagrass_bottom": "tall_seagrass_bottom",
"tall_seagrass_top": "tall_seagrass_top",
"target_side": "target_side",
"target_top": "target_top",
"terracotta": "terracotta",
"tnt_bottom": "tnt_bottom",
"tnt_side": "tnt_side",
Expand All @@ -700,13 +792,28 @@
"turtle_egg": "turtle_egg",
"turtle_egg_slightly_cracked": "turtle_egg_slightly_cracked",
"turtle_egg_very_cracked": "turtle_egg_very_cracked",
"twisting_vines": "twisting_vines",
"twisting_vines_plant": "twisting_vines_plant",
"vines": "vine",
"void_painting": "painting/void",
"wanderer_painting": "painting/wanderer",
"warped_door_bottom": "warped_door_bottom",
"warped_door_top": "warped_door_top",
"warped_fungus": "warped_fungus",
"warped_nylium": "warped_nylium",
"warped_nylium_side": "warped_nylium_side",
"warped_planks": "warped_planks",
"warped_roots": "warped_roots",
"warped_stem": "warped_stem",
"warped_stem_top": "warped_stem_top",
"warped_trapdoor": "warped_trapdoor",
"warped_wart_block": "warped_wart_block",
"wasteland_painting": "painting/wasteland",
"water": "water_still",
"water_flowing": "water_flow",
"water_overlay": "water_overlay",
"weeping_vines": "weeping_vines",
"weeping_vines_plant": "weeping_vines_plant",
"white_bed": "entity/bed/white",
"white_concrete": "white_concrete",
"white_concrete_powder": "white_concrete_powder",
Expand Down
29 changes: 29 additions & 0 deletions mcprep_data_refresh.py
Expand Up @@ -75,6 +75,35 @@ def jmc2obj_extras():
outlist = {
"vines":"vine",

# removed ~ Jan 15 2021,
# added back to maintain longer backwards compatibility
"cake_inside": "cake_inner",
"cauldron_feet": "cauldron_bottom",
"cauldron_inside": "cauldron_inner",
"door_wood_bottom": "oak_door_bottom",
"door_wood_top": "oak_door_top",
"enderchest": "entity/chest/ender",
"largechest": "entity/chest/normal_double",
"largechest_trapped": "entity/chest/trapped_double",
"plank_acacia": "acacia_planks",
"plank_birch": "birch_planks",
"plank_dark_oak": "dark_oak_planks",
"plank_jungle": "jungle_planks",
"plank_oak": "oak_planks",
"plank_spruce": "spruce_planks",
"quartz_bottom": "quartz_block_bottom",
"quartz_side": "quartz_block_side",
"quartz_side_chiseled": "chiseled_quartz_block",
"quartz_side_lines": "quartz_pillar",
"quartz_top": "quartz_block_top",
"quartz_top_chiseled": "chiseled_quartz_block_top",
"quartz_top_lines": "quartz_pillar_top",
"red_sandstone_carved": "chiseled_red_sandstone",
"sandstone_side": "sandstone",
"sandstone_side_carved": "chiseled_sandstone",
"stone_brick_circle": "chiseled_stone_bricks",
"stone_brick_cracked": "cracked_stone_bricks",

}
return outlist

Expand Down

0 comments on commit fa18837

Please sign in to comment.