From 476d05ecd02e61fb6e03f7c66dc57d5f5da1284e Mon Sep 17 00:00:00 2001 From: CoryBorek Date: Sun, 23 Jan 2022 15:09:24 -0500 Subject: [PATCH 1/4] Block Folder Conversion --- .../bedrock/impl/NameConverter.java | 98 ++++++++++++++++++- 1 file changed, 97 insertions(+), 1 deletion(-) diff --git a/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java b/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java index 08029ab..ffc1fa9 100644 --- a/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java +++ b/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java @@ -32,7 +32,13 @@ public void convert(Pack pack) throws IOException { if (textures_old.toFile().exists()) Util.copyDir(textures_old, textures); + blocks(textures); + + + } + + private void blocks(Path textures) throws IOException { Path blocks = textures.resolve("block"); //TODO: Find what images need to be renamed, and rename them @@ -43,6 +49,86 @@ public void convert(Pack pack) throws IOException { renameAll(blockMapping, ".png", textures.resolve("blocks")); renameAll(blockTGAMapping, ".png", ".tga", textures.resolve("blocks")); + Path candles = blocks.resolve("candles"); + + if (!candles.toFile().exists()) candles.toFile().mkdir(); + moveFile(blocks, candles, "black_candle.png"); + moveFile(blocks, candles, "black_candle_lit.png"); + moveFile(blocks, candles, "blue_candle.png"); + moveFile(blocks, candles, "blue_candle_lit.png"); + moveFile(blocks, candles, "brown_candle.png"); + moveFile(blocks, candles, "brown_candle_lit.png"); + moveFile(blocks, candles, "candle.png"); + moveFile(blocks, candles, "candle_lit.png"); + moveFile(blocks, candles, "cyan_candle.png"); + moveFile(blocks, candles, "cyan_candle_lit.png"); + moveFile(blocks, candles, "gray_candle.png"); + moveFile(blocks, candles, "gray_candle_lit.png"); + moveFile(blocks, candles, "green_candle.png"); + moveFile(blocks, candles, "green_candle_lit.png"); + moveFile(blocks, candles, "light_blue_candle.png"); + moveFile(blocks, candles, "light_blue_candle_lit.png"); + moveFile(blocks, candles, "light_gray_candle.png"); + moveFile(blocks, candles, "light_gray_candle_lit.png"); + moveFile(blocks, candles, "lime_candle.png"); + moveFile(blocks, candles, "lime_candle_lit.png"); + moveFile(blocks, candles, "magenta_candle.png"); + moveFile(blocks, candles, "magenta_candle_lit.png"); + moveFile(blocks, candles, "orange_candle.png"); + moveFile(blocks, candles, "orange_candle_lit.png"); + moveFile(blocks, candles, "pink_candle.png"); + moveFile(blocks, candles, "pink_candle_lit.png"); + moveFile(blocks, candles, "purple_candle.png"); + moveFile(blocks, candles, "purple_candle_lit.png"); + moveFile(blocks, candles, "red_candle.png"); + moveFile(blocks, candles, "red_candle_lit.png"); + moveFile(blocks, candles, "white_candle.png"); + moveFile(blocks, candles, "white_candle_lit.png"); + moveFile(blocks, candles, "yellow_candle.png"); + moveFile(blocks, candles, "yellow_candle_lit.png"); + + Path deepslate = blocks.resolve("deepslate"); + if (!deepslate.toFile().exists()) deepslate.toFile().mkdir(); + moveFile(blocks, deepslate, "chiseled_deepslate.png" ); + moveFile(blocks, deepslate, "cobbled_deepslate.png" ); + moveFile(blocks, deepslate, "cracked_deepslate_bricks.png" ); + moveFile(blocks, deepslate, "cracked_deepslate_tiles.png" ); + moveFile(blocks, deepslate, "deepslate.png" ); + moveFile(blocks, deepslate, "deepslate_bricks.png" ); + moveFile(blocks, deepslate, "deepslate_coal_ore.png" ); + moveFile(blocks, deepslate, "deepslate_copper_ore.png" ); + moveFile(blocks, deepslate, "deepslate_diamond_ore.png" ); + moveFile(blocks, deepslate, "deepslate_emerald_ore.png" ); + moveFile(blocks, deepslate, "deepslate_gold_ore.png" ); + moveFile(blocks, deepslate, "deepslate_iron_ore.png" ); + moveFile(blocks, deepslate, "deepslate_lapis_ore.png" ); + moveFile(blocks, deepslate, "deepslate_redstone_ore.png" ); + moveFile(blocks, deepslate, "deepslate_tiles.png" ); + moveFile(blocks, deepslate, "deepslate_top.png" ); + moveFile(blocks, deepslate, "polished_deepslate.png" ); + + Path hugeFungus = blocks.resolve("huge_fungus"); + if (!hugeFungus.toFile().exists()) hugeFungus.toFile().mkdir(); + moveFile(blocks, hugeFungus, "crimson_door_bottom.png", "crimson_door_lower.png"); + moveFile(blocks, hugeFungus, "crimson_door_top.png"); + moveFile(blocks, hugeFungus, "crimson_stem.png", "crimson_log_side.png"); + moveFile(blocks, hugeFungus, "crimson_stem_top.png", "crimson_log_top.png"); + moveFile(blocks, hugeFungus, "crimson_planks.png"); + moveFile(blocks, hugeFungus, "crimson_trapdoor.png"); + moveFile(blocks, hugeFungus, "stripped_crimson_stem.png", "stripped_crimson_stem_side.png"); + moveFile(blocks, hugeFungus, "stripped_crimson_stem_top.png"); + moveFile(blocks, hugeFungus, "stripped_warped_stem.png", "stripped_warped_stem_side.png"); + moveFile(blocks, hugeFungus, "stripped_warped_stem_top.png"); + moveFile(blocks, hugeFungus, "warped_door_bottom.png", "warped_door_lower.png"); + moveFile(blocks, hugeFungus, "warped_door_top.png"); + moveFile(blocks, hugeFungus, "warped_planks.png"); + moveFile(blocks, hugeFungus, "warped_stem.png", "warped_stem_side.png"); + moveFile(blocks, hugeFungus, "warped_stem_top.png"); + moveFile(blocks, hugeFungus, "warped_trapdoor.png"); + + + + //grass_block_side_overlay -> grass_side if (textures.resolve("blocks").resolve("grass_block_side_overlay.png").toFile().exists()) { ImageConverter grass = new ImageConverter(16, 16, textures.resolve("blocks").resolve("grass_block_side_overlay.png")); @@ -50,11 +136,21 @@ public void convert(Pack pack) throws IOException { System.out.println("Grass Conversion: " + grass.storeTGA()); Util.renameFile(textures.resolve("blocks").resolve("grass_block_side_overlay.png"), "grass_side.tga"); } - } + } + } + private void moveFile(Path oldDir, Path newDir, String name) throws IOException { + Path old = oldDir.resolve(name); + Path newF = newDir.resolve(name); + if (old.toFile().exists()) Files.move(old, newF); } + private void moveFile(Path oldDir, Path newDir, String name, String newName) throws IOException { + Path old = oldDir.resolve(name); + Path newF = newDir.resolve(newName); + if (old.toFile().exists()) Files.move(old, newF); + } protected void renameAll(Mapping mapping, String extension, String newExtension, Path path) throws IOException { From 082494d0515577930fe658b4d0ccb06adfc0db6e Mon Sep 17 00:00:00 2001 From: CoryBorek Date: Sun, 23 Jan 2022 15:17:42 -0500 Subject: [PATCH 2/4] Added folder conversion --- .../agentdid127/resourcepack/bedrock/impl/NameConverter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java b/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java index ffc1fa9..cbd4bc1 100644 --- a/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java +++ b/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java @@ -212,10 +212,12 @@ protected void renameAll(Mapping mapping, String extension, Path path) throws IO else if (!ret) { packConverter.log(" Failed to Rename: " + path1.getFileName().toString() + "->" + newName + extension); } + } }); } + protected abstract static class Mapping { protected final Map mapping = new HashMap<>(); From 5543eacab995b194136b5c77fa6967661ebed7e4 Mon Sep 17 00:00:00 2001 From: CoryBorek Date: Sun, 23 Jan 2022 20:23:17 -0500 Subject: [PATCH 3/4] Item Conversion, Use Pack File names as Pack Name --- bedrock-conversion/pom.xml | 2 +- .../bedrock/impl/NameConverter.java | 35 +- .../bedrock/impl/PackMetaConverter.java | 2 +- .../src/main/resources/items.json | 313 ++++++++++++++++++ console/pom.xml | 4 +- 5 files changed, 347 insertions(+), 9 deletions(-) create mode 100644 bedrock-conversion/src/main/resources/items.json diff --git a/bedrock-conversion/pom.xml b/bedrock-conversion/pom.xml index 21ae0ee..7c20e6d 100644 --- a/bedrock-conversion/pom.xml +++ b/bedrock-conversion/pom.xml @@ -6,7 +6,7 @@ com.agentdid127.resourcepack bedrock-conversion - 1.0-SNAPSHOT + ${parent.version} RPC-Bedrock diff --git a/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java b/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java index cbd4bc1..1bcd2d1 100644 --- a/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java +++ b/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/NameConverter.java @@ -19,6 +19,7 @@ public class NameConverter extends Converter { protected final Mapping blockMapping = new BlockMapping(); protected final Mapping blockTGAMapping = new BlockTGAMapping(); + protected final Mapping itemMapping = new ItemMapping(); public NameConverter(PackConverter packConverter) { super(packConverter); @@ -33,21 +34,32 @@ public void convert(Pack pack) throws IOException { Util.copyDir(textures_old, textures); blocks(textures); + items(textures); + + } + + private void items(Path textures) throws IOException { + Path items = textures.resolve("items"); + + if (textures.resolve("item").toFile().exists()) { + Files.move(textures.resolve("item"), items); + renameAll(itemMapping, ".png", items); + } } private void blocks(Path textures) throws IOException { - Path blocks = textures.resolve("block"); + Path blocks = textures.resolve("blocks"); //TODO: Find what images need to be renamed, and rename them - if (blocks.toFile().exists()) { + if (textures.resolve("block").toFile().exists()) { - Files.move(blocks, textures.resolve("blocks")); - renameAll(blockMapping, ".png", textures.resolve("blocks")); - renameAll(blockTGAMapping, ".png", ".tga", textures.resolve("blocks")); + Files.move(textures.resolve("block"), blocks); + renameAll(blockMapping, ".png", blocks); + renameAll(blockTGAMapping, ".png", ".tga", blocks); Path candles = blocks.resolve("candles"); @@ -261,6 +273,19 @@ protected void load() { } } } + + protected class ItemMapping extends Mapping { + + @Override + protected void load() { + JsonObject blocks = Util.readJsonResource(packConverter.getGson(), "/items.json").getAsJsonObject("items"); + if (blocks != null) { + for (Map.Entry entry : blocks.entrySet()) { + this.mapping.put(entry.getKey(), entry.getValue().getAsString()); + } + } + } + } } diff --git a/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/PackMetaConverter.java b/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/PackMetaConverter.java index 98a9156..f45a9ab 100644 --- a/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/PackMetaConverter.java +++ b/bedrock-conversion/src/main/java/com/agentdid127/resourcepack/bedrock/impl/PackMetaConverter.java @@ -39,7 +39,7 @@ public void convert(Pack pack) throws IOException { JsonObject header = new JsonObject(); //header properties header.addProperty("description", json.get("pack").getAsJsonObject().get("description").getAsString()); - header.addProperty("name", "Converted Pack"); + header.addProperty("name", pack.getFileName()); header.addProperty("uuid", UUID.randomUUID().toString()); //version diff --git a/bedrock-conversion/src/main/resources/items.json b/bedrock-conversion/src/main/resources/items.json new file mode 100644 index 0000000..ccc2d07 --- /dev/null +++ b/bedrock-conversion/src/main/resources/items.json @@ -0,0 +1,313 @@ +{ + "items": { + "amethyst_shard": "amethyst_shard", + "apple": "apple", + "golden_apple": "apple_golden", + "armor_stand": "armor_stand", + "arrow": "arrow", + "bamboo": "bamboo", + "cooked_beef": "beef_cooked", + "beef": "beef_raw", + "beetroot": "beetroot", + "beetroot_soup": "beetroot_soup", + "blaze_powder": "blaze_powder", + "blaze_rod": "blaze_rod", + "acacia_boat": "boat_acacia", + "birch_boat": "boat_birch", + "dark_oak_boat": "boat_darkoak", + "jungle_boat": "boat_jungle", + "oak_boat": "boat_oak", + "spruce_boat": "boat_spruce", + "bone": "bone", + "enchanted_book": "book_enchanted", + "knowledge_book": "book_knowledge", + "book": "book_normal", + "writable_book": "book_writable", + "written_book": "book_written", + "bow_pulling_0": "bow_pulling_0", + "bow_pulling_1": "bow_pulling_1", + "bow_pulling_2": "bow_pulling_2", + "bow": "bow_standby", + "bowl": "bowl", + "bread": "bread", + "brewing_stand": "brewing_stand", + "brick": "brick", + "broken_elytra": "broken_elytra", + "axolotl_bucket": "bucket_axolotl", + "cod_bucket": "bucket_cod", + "bucket": "bucket_empty", + "lava_bucket": "bucket_lava", + "milk_bucket": "bucket_milk", + "powder_snow_bucket": "bucket_powder_snow", + "pufferfish_bucket": "bucket_pufferfish", + "salmon_bucket": "bucket_salmon", + "tropical_fish_bucket": "bucket_tropical", + "water_bucket": "bucket_water", + "bundle": "bundle", + "bundle_filled": "bundle_filled", + "cake": "cake", + "campfire": "campfire", + "carrot": "carrot", + "golden_carrot": "carrot_golden", + "carrot_on_a_stick": "carrot_on_a_stick", + "cauldron": "cauldron", + "chain": "chain", + "chainmail_boots": "chainmail_boots", + "chainmail_chestplate": "chainmail_chestplate", + "chainmail_helmet": "chainmail_helmet", + "chainmail_leggings": "chainmail_leggings", + "charcoal": "charcoal", + "cooked_chicken": "chicken_cooked", + "chicken": "chicken_raw", + "chorus_fruit": "chorus_fruit", + "popped_chorus_fruit": "chorus_fruit_popped", + "clay_ball": "clay_ball", + "clock_00": "clock_item", + "coal": "coal", + "comparator": "comparator", + "compass_00": "compass_item", + "cookie": "cookie", + "copper_ingot": "copper_ingot", + "creeper_banner_pattern": "creeper_banner_pattern", + "crimson_door": "crimson_door", + "crossbow_arrow": "crossbow_arrow", + "crossbow_firework": "crossbow_firework", + "crossbow_pulling_0": "crossbow_pulling_0", + "crossbow_pulling_1": "crossbow_pulling_1", + "crossbow_pulling_2": "crossbow_pulling_2", + "crossbow_standby": "crossbow_standby", + "diamond": "diamond", + "diamond_axe": "diamond_axe", + "diamond_boots": "diamond_boots", + "diamond_chestplate": "diamond_chestplate", + "diamond_helmet": "diamond_helmet", + "diamond_hoe": "diamond_hoe", + "diamond_horse_armor": "diamond_horse_armor", + "diamond_leggings": "diamond_leggings", + "diamond_pickaxe": "diamond_pickaxe", + "diamond_shovel": "diamond_shovel", + "diamond_sword": "diamond_sword", + "acacia_door": "door_acacia", + "birch_door": "door_birch", + "dark_oak_door": "door_dark_oak", + "iron_door": "door_iron", + "jungle_door": "door_jungle", + "spruce_door": "door_spruce", + "oak_door": "door_wood", + "dragon_breath": "dragons_breath", + "dried_kelp": "dried_kelp", + "ink_sac": "dye_powder_black", + "black_dye": "dye_powder_black_new", + "lapis_lazuli": "dye_powder_blue", + "blue_dye": "dye_powder_blue_new", + "cocoa_beans": "dye_powder_brown", + "brown_dye": "dye_powder_brown_new", + "cyan_dye": "dye_powder_cyan", + "glow_ink_sac": "dye_powder_glow", + "gray_dye": "dye_powder_gray", + "green_dye": "dye_powder_green", + "light_blue_dye": "dye_powder_light_blue", + "lime_dye": "dye_powder_lime", + "magenta_dye": "dye_powder_magenta", + "orange_dye": "dye_powder_orange", + "pink_dye": "dye_powder_pink", + "purple_dye": "dye_powder_purple", + "red_dye": "dye_powder_red", + "light_gray_dye": "dye_powder_silver", + "bone_meal": "dye_powder_white", + "white_dye": "dye_powder_white_new", + "yellow_dye": "dye_powder_yellow", + "egg": "egg", + "elytra": "elytra", + "emerald": "emerald", + "empty_armor_slot_boots": "empty_armor_slot_boots", + "empty_armor_slot_chestplate": "empty_armor_slot_chestplate", + "empty_armor_slot_helmet": "empty_armor_slot_helmet", + "empty_armor_slot_leggings": "empty_armor_slot_leggings", + "empty_armor_slot_shield": "empty_armor_slot_shield", + "end_crystal": "end_crystal", + "ender_eye": "ender_eye", + "ender_pearl": "ender_pearl", + "experience_bottle": "experience_bottle", + "feather": "feather", + "fire_charge": "fireball", + "firework_rocket": "fireworks", + "tropical_fish": "fish_clownfish_raw", + "cooked_cod": "fish_cooked", + "pufferfish": "fish_pufferfish_raw", + "cod": "fish_raw", + "cooked_salmon": "fish_salmon_cooked", + "salmon": "fish_salmon_raw", + "fishing_rod": "fishing_rod_uncast", + "fishing_rod_cast": "fishing_rod_cast", + "flint": "flint", + "flint_and_steel": "flint_and_steel", + "flower_banner_pattern": "flower_banner_pattern", + "flower_pot": "flower_pot", + "ghast_tear": "ghast_tear", + "glass_bottle": "glass_bottle", + "globe_banner_pattern": "globe_banner_pattern", + "glow_berries": "glow_berries", + "glow_item_frame": "glow_item_frame", + "glowstone_dust": "glowstone_dust", + "golden_axe": "gold_axe", + "golden_boots": "gold_boots", + "golden_chestplate": "gold_chestplate", + "golden_helmet": "gold_helmet", + "golden_hoe": "gold_hoe", + "golden_horse_armor": "gold_horse_armor", + "gold_ingot": "gold_ingot", + "golden_leggings": "gold_leggings", + "gold_nugget": "gold_nugget", + "golden_pickaxe": "gold_pickaxe", + "golden_shovel": "gold_shovel", + "golden_sword": "gold_sword", + "gunpowder": "gunpowder", + "heart_of_the_sea": "heartofthesea_closed", + "honey_bottle": "honey_bottle", + "honeycomb": "honeycomb", + "hopper": "hopper", + "iron_axe": "iron_axe", + "iron_boots": "iron_boots", + "iron_chestplate": "iron_chestplate", + "iron_helmet": "iron_helmet", + "iron_hoe": "iron_hoe", + "iron_horse_armor": "iron_horse_armor", + "iron_ingot": "iron_ingot", + "iron_leggings": "iron_leggings", + "iron_nugget": "iron_nugget", + "iron_pickaxe": "iron_pickaxe", + "iron_shovel": "iron_shovel", + "iron_sword": "iron_sword", + "item_frame": "item_frame", + "kelp": "kelp", + "lantern": "lantern", + "lead": "lead", + "leather": "leather", + "leather_chestplate": "leather_chestplate", + "light_00": "light_block_0", + "light_15": "light_block_15", + "magma_cream": "magma_cream", + "map": "map_empty", + "filled_map": "map_filled", + "melon_slice": "melon", + "glistering_melon_slice": "melon_speckle", + "chest_minecart": "minecart_chest", + "command_block_minecart": "minecart_command_block", + "furnace_minecart": "minecart_furnace", + "hopper_minecart": "minecart_hopper", + "minecart": "minecart_normal", + "tnt_minecart": "minecart_tnt", + "mojang_banner_pattern": "mojang_banner_pattern", + "mushroom_stew": "mushroom_stew", + "cooked_mutton": "mutton_cooked", + "mutton": "mutton_raw", + "name_tag": "name_tag", + "nautilus_shell": "nautilus", + "nether_sprouts": "nether_sprouts", + "nether_star": "nether_star", + "nether_wart": "nether_wart", + "nether_brick": "netherbrick", + "netherite_axe": "netherite_axe", + "netherite_boots": "netherite_boots", + "netherite_chestplate": "netherite_chestplate", + "netherite_helmet": "netherite_helmet", + "netherite_hoe": "netherite_hoe", + "netherite_ingot": "netherite_ingot", + "netherite_leggings": "netherite_leggings", + "netherite_pickaxe": "netherite_pickaxe", + "netherite_scrap": "netherite_scrap", + "netherite_shovel": "netherite_shovel", + "netherite_sword": "netherite_sword", + "painting": "painting", + "paper": "paper", + "phantom_membrane": "phantom_membrane", + "piglin_banner_pattern": "piglin_banner_pattern", + "cooked_porkchop": "porkchop_cooked", + "porkchop": "porkchop_raw", + "potato": "potato", + "baked_potato": "potato_baked", + "poisonous_potato": "potato_poisonous", + "prismarine_crystals": "prismarine_crystals", + "prismarine_shard": "prismarine_shard", + "pumpkin_pie": "pumpkin_pie", + "quartz": "quartz", + "cooked_rabbit": "rabbit_cooked", + "rabbit_foot": "rabbit_foot", + "rabbit_hide": "rabbit_hide", + "rabbit": "rabbit_raw", + "rabbit_stew": "rabbit_stew", + "raw_copper": "raw_copper", + "raw_gold": "raw_gold", + "raw_iron": "raw_iron", + "music_disc_11": "record_11", + "music_disc_13": "record_13", + "music_disc_blocks": "record_blocks", + "music_disc_cat": "record_cat", + "music_disc_chirp": "record_chirp", + "music_disc_far": "record_far", + "music_disc_mall": "record_mall", + "music_disc_mellohi": "record_mellohi", + "music_disc_otherside": "record_otherside", + "music_disc_pigstep": "record_pigstep", + "music_disc_stal": "record_stal", + "music_disc_strad": "record_strad", + "music_disc_wait": "record_wait", + "music_disc_ward": "record_ward", + "redstone": "redstone_dust", + "sugar_cane": "reeds", + "repeater": "repeater", + "rotten_flesh": "rotten_flesh", + "saddle": "saddle", + "sea_pickle": "sea_pickle", + "beetroot_seeds": "seeds_beetroot", + "melon_seeds": "seeds_melon", + "pumpkin_seeds": "seeds_pumpkin", + "wheat_seeds": "seeds_wheat", + "shears": "shears", + "shulker_shell": "shulker_shell", + "oak_sign": "sign", + "acacia_sign": "sign_acacia", + "birch_sign": "sign_birch", + "crimson_sign": "sign_crimson", + "dark_oak_sign": "sign_darkoak", + "jungle_sign": "sign_jungle", + "spruce_sign": "sign_spruce", + "warped_sign": "sign_warped", + "skull_banner_pattern": "skull_banner_pattern", + "slime_ball": "slime_ball", + "snowball": "snowball", + "soul_campfire": "soul_campfire", + "soul_lantern": "soul_lantern", + "spawn_egg": "spawn_egg", + "spawn_egg_overlay": "spawn_egg_overlay", + "spectral_arrow": "spectral_arrow", + "spider_eye": "spider_eye", + "fermented_spider_eye": "spider_eye_fermented", + "spyglass": "spyglass", + "stick": "stick", + "stone_axe": "stone_axe", + "stone_hoe": "stone_hoe", + "stone_pickaxe": "stone_pickaxe", + "stone_shovel": "stone_shovel", + "stone_sword": "stone_sword", + "string": "string", + "sugar": "sugar", + "suspicious_stew": "suspicious_stew", + "sweet_berries": "sweet_berries", + "totem_of_undying": "totem", + "trident": "trident", + "turtle_egg": "turtle_egg", + "turtle_helmet": "turtle_helmet", + "scute": "turtle_shell_piece", + "bell": "villagebell", + "warped_door": "warped_door", + "warped_fungus_on_a_stick": "warped_fungus_on_a_stick", + "wheat": "wheat", + "wooden_axe": "wood_axe", + "wooden_hoe": "wood_hoe", + "wooden_pickaxe": "wood_pickaxe", + "wooden_shovel": "wood_shovel", + "wooden_sword": "wood_sword" + } +} \ No newline at end of file diff --git a/console/pom.xml b/console/pom.xml index 4f1318e..e61c445 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -5,7 +5,7 @@ 4.0.0 console - ${parent.version} + ${project.parent.version} RPC-Bedrock @@ -17,7 +17,7 @@ com.agentdid127.resourcepack bedrock-conversion - 1.0-SNAPSHOT + ${project.parent.version} From 23cfad34979741c7b86915a0d7c3de922df4315c Mon Sep 17 00:00:00 2001 From: CoryBorek Date: Sun, 23 Jan 2022 20:29:58 -0500 Subject: [PATCH 4/4] Bump Version number to 0.0.2 --- bedrock-conversion/pom.xml | 2 +- console/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bedrock-conversion/pom.xml b/bedrock-conversion/pom.xml index 7c20e6d..6ca4c67 100644 --- a/bedrock-conversion/pom.xml +++ b/bedrock-conversion/pom.xml @@ -11,7 +11,7 @@ RPC-Bedrock com.agentdid127.resourcepack - 0.0.1 + 0.0.2 \ No newline at end of file diff --git a/console/pom.xml b/console/pom.xml index e61c445..2fa03d8 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -10,7 +10,7 @@ RPC-Bedrock com.agentdid127.resourcepack - 0.0.1 + 0.0.2 diff --git a/pom.xml b/pom.xml index 3158d3a..b8428af 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.agentdid127.resourcepack RPC-Bedrock - 0.0.1 + 0.0.2 pom RPC-Bedrock