From 5a8c0e6c2414eefea7139cee57eaa9cdbb67629a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Mar 2019 00:08:24 -0500 Subject: [PATCH] Space out all block/item names and probably break a ton of stuff --- .../botania/common/lib/LibBlockNames.java | 2 - .../botania/common/lib/LibItemNames.java | 222 +++++++++--------- .../botania/tags/items/loonium_blacklist.json | 2 +- 3 files changed, 112 insertions(+), 114 deletions(-) diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index c90299725..f018985de 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -99,8 +99,6 @@ public final class LibBlockNames { public static final String MANA_FLAME = "mana_flame"; public static final String PRISM = "prism"; public static final String ENCHANTED_SOIL = "enchanted_soil"; - public static final String BIOME_STONE_A = "biomeStoneA"; - public static final String BIOME_STONE_B = "biomeStoneB"; public static final String PETAL_BLOCK_SUFFIX = "_petal_block"; public static final String CORPOREA_INDEX = "corporea_index"; public static final String CORPOREA_FUNNEL = "corporea_funnel"; diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 6632bb70c..d59f0ccfe 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -17,55 +17,55 @@ public final class LibItemNames { public static final String PETAL_SUFFIX = "_" + PETAL; public static final String DYE = "dye"; public static final String DYE_SUFFIX = "_" + DYE; - public static final String PESTLE_AND_MORTAR = "pestleandmortar"; - public static final String TWIG_WAND = "twigwand"; + public static final String PESTLE_AND_MORTAR = "pestle_and_mortar"; + public static final String TWIG_WAND = "twig_wand"; public static final String[] RUNE_NAMES = { "rune_water", "rune_fire", "rune_earth", "rune_air", "rune_spring", "rune_summer", "rune_autumn", "rune_winter", "rune_mana", "rune_lust", "rune_gluttony", "rune_greed", "rune_sloth", "rune_wrath", "rune_envy", "rune_pride" }; - public static final String MANA_TABLET = "manatablet"; - public static final String MANA_GUN = "managun"; - public static final String MANA_COOKIE = "manacookie"; + public static final String MANA_TABLET = "mana_tablet"; + public static final String MANA_GUN = "mana_gun"; + public static final String MANA_COOKIE = "mana_cookie"; public static final String FERTILIZER = "fertilizer"; public static final String GRASS_SEEDS = "seeds"; - public static final String DIRT_ROD = "dirtrod"; - public static final String TERRAFORM_ROD = "terraformrod"; - public static final String MANA_MIRROR = "manamirror"; + public static final String DIRT_ROD = "dirt_rod"; + public static final String TERRAFORM_ROD = "terraform_rod"; + public static final String MANA_MIRROR = "mana_mirror"; public static final String MANASTEEL_HELM = "manasteel_helmet"; - public static final String MANASTEEL_CHEST = "manasteelchest"; - public static final String MANASTEEL_LEGS = "manasteellegs"; - public static final String MANASTEEL_BOOTS = "manasteelboots"; - public static final String MANASTEEL_PICK = "manasteelpick"; - public static final String MANASTEEL_SHOVEL = "manasteelshovel"; - public static final String MANASTEEL_AXE = "manasteelaxe"; - public static final String MANASTEEL_SWORD = "manasteelsword"; - public static final String MANASTEEL_SHEARS = "manasteelshears"; + public static final String MANASTEEL_CHEST = "manasteel_chestplate"; + public static final String MANASTEEL_LEGS = "manasteel_leggings"; + public static final String MANASTEEL_BOOTS = "manasteel_boots"; + public static final String MANASTEEL_PICK = "manasteel_pick"; + public static final String MANASTEEL_SHOVEL = "manasteel_shovel"; + public static final String MANASTEEL_AXE = "manasteel_axe"; + public static final String MANASTEEL_SWORD = "manasteel_sword"; + public static final String MANASTEEL_SHEARS = "manasteel_shears"; public static final String GRASS_HORN = "horn_grass"; public static final String LEAVES_HORN = "horn_leaves"; public static final String SNOW_HORN = "horn_snow"; public static final String TERRASTEEL_HELM = "terrasteel_helmet"; - public static final String TERRASTEEL_CHEST = "terrasteelchest"; - public static final String TERRASTEEL_LEGS = "terrasteellegs"; - public static final String TERRASTEEL_BOOTS = "terrasteelboots"; - public static final String TERRA_SWORD = "terrasword"; - public static final String TINY_PLANET = "tinyplanet"; - public static final String MANA_RING = "manaring"; - public static final String AURA_RING = "auraring"; - public static final String MANA_RING_GREATER = "manaringgreater"; - public static final String AURA_RING_GREATER = "auraringgreater"; - public static final String TRAVEL_BELT = "travelbelt"; - public static final String KNOCKBACK_BELT = "knockbackbelt"; - public static final String ICE_PENDANT = "icependant"; - public static final String LAVA_PENDANT = "lavapendant"; - public static final String MAGNET_RING = "magnetring"; - public static final String WATER_RING = "waterring"; - public static final String MINING_RING = "miningring"; - public static final String TERRA_PICK = "terrapick"; - public static final String DIVA_CHARM = "divacharm"; - public static final String FLIGHT_TIARA = "flighttiara"; - public static final String ENDER_DAGGER = "enderdagger"; + public static final String TERRASTEEL_CHEST = "terrasteel_chestplate"; + public static final String TERRASTEEL_LEGS = "terrasteel_leggings"; + public static final String TERRASTEEL_BOOTS = "terrasteel_boots"; + public static final String TERRA_SWORD = "terra_sword"; + public static final String TINY_PLANET = "tiny_planet"; + public static final String MANA_RING = "mana_ring"; + public static final String AURA_RING = "aura_ring"; + public static final String MANA_RING_GREATER = "mana_ring_greater"; + public static final String AURA_RING_GREATER = "aura_ring_greater"; + public static final String TRAVEL_BELT = "travel_belt"; + public static final String KNOCKBACK_BELT = "knockback_belt"; + public static final String ICE_PENDANT = "ice_pendant"; + public static final String LAVA_PENDANT = "lava_pendant"; + public static final String MAGNET_RING = "magnet_ring"; + public static final String WATER_RING = "water_ring"; + public static final String MINING_RING = "mining_ring"; + public static final String TERRA_PICK = "terra_pick"; + public static final String DIVA_CHARM = "diva_charm"; + public static final String FLIGHT_TIARA = "flight_tiara"; + public static final String ENDER_DAGGER = "ender_dagger"; public static final String[] QUARTZ_NAMES = { "quartz_dark", "quartz_mana", @@ -75,64 +75,64 @@ public final class LibItemNames { "quartz_elven", "quartz_sunny" }; - public static final String WATER_ROD = "waterrod"; + public static final String WATER_ROD = "water_rod"; public static final String ELEMENTIUM_HELM = "elementium_helmet"; - public static final String ELEMENTIUM_CHEST = "elementiumchest"; - public static final String ELEMENTIUM_LEGS = "elementiumlegs"; - public static final String ELEMENTIUM_BOOTS = "elementiumboots"; - public static final String ELEMENTIUM_PICK = "elementiumpick"; - public static final String ELEMENTIUM_SHOVEL = "elementiumshovel"; - public static final String ELEMENTIUM_AXE = "elementiumaxe"; - public static final String ELEMENTIUM_SWORD = "elementiumsword"; - public static final String ELEMENTIUM_SHEARS = "elementiumshears"; - public static final String OPEN_BUCKET = "openbucket"; - public static final String SPAWNER_MOVER = "spawnermover"; - public static final String PIXIE_RING = "pixiering"; - public static final String SUPER_TRAVEL_BELT = "supertravelbelt"; - public static final String RAINBOW_ROD = "rainbowrod"; - public static final String TORNADO_ROD = "tornadorod"; - public static final String FIRE_ROD = "firerod"; - public static final String VINE_BALL = "vineball"; + public static final String ELEMENTIUM_CHEST = "elementium_chestplate"; + public static final String ELEMENTIUM_LEGS = "elementium_leggings"; + public static final String ELEMENTIUM_BOOTS = "elementium_boots"; + public static final String ELEMENTIUM_PICK = "elementium_pickaxe"; + public static final String ELEMENTIUM_SHOVEL = "elementium_shovel"; + public static final String ELEMENTIUM_AXE = "elementium_axe"; + public static final String ELEMENTIUM_SWORD = "elementium_sword"; + public static final String ELEMENTIUM_SHEARS = "elementium_shears"; + public static final String OPEN_BUCKET = "open_bucket"; + public static final String SPAWNER_MOVER = "spawner_mover"; + public static final String PIXIE_RING = "pixie_ring"; + public static final String SUPER_TRAVEL_BELT = "super_travel_belt"; + public static final String RAINBOW_ROD = "rainbow_rod"; + public static final String TORNADO_ROD = "tornado_rod"; + public static final String FIRE_ROD = "fire_rod"; + public static final String VINE_BALL = "vine_ball"; public static final String SLINGSHOT = "slingshot"; - public static final String MANA_BOTTLE = "manabottle"; - public static final String LAPUTA_SHARD = "laputashard"; + public static final String MANA_BOTTLE = "mana_bottle"; + public static final String LAPUTA_SHARD = "laputa_shard"; public static final String NECRO_VIRUS = "virus_necrodermal"; public static final String NULL_VIRUS = "virus_nullodermal"; - public static final String REACH_RING = "reachring"; - public static final String SKY_DIRT_ROD = "skydirtrod"; + public static final String REACH_RING = "reach_ring"; + public static final String SKY_DIRT_ROD = "skydirt_rod"; public static final String MANASTEEL_HELM_R = "manasteel_helmet_revealing"; public static final String TERRASTEEL_HELM_R = "terrasteel_helmet_revealing"; public static final String ELEMENTIUM_HELM_R = "elementium_helmet_revealing"; public static final String ITEM_FINDER = "itemfinder"; - public static final String SUPER_LAVA_PENDANT = "superlavapendant"; - public static final String ENDER_HAND = "enderhand"; - public static final String GLASS_PICK = "glasspick"; + public static final String SUPER_LAVA_PENDANT = "super_lava_pendant"; + public static final String ENDER_HAND = "ender_hand"; + public static final String GLASS_PICK = "glass_pickaxe"; public static final String SPARK = "spark"; public static final String SPARK_UPGRADE = "spark_upgrade"; - public static final String DIVINING_ROD = "diviningrod"; - public static final String GRAVITY_ROD = "gravityrod"; - public static final String MANA_INKWELL = "manainkwell"; + public static final String DIVINING_ROD = "divining_rod"; + public static final String GRAVITY_ROD = "gravity_rod"; + public static final String MANA_INKWELL = "mana_inkwell"; public static final String VIAL = "vial"; public static final String FLASK = "flask"; public static final String BREW_VIAL = "brew_vial"; public static final String BREW_FLASK = "brew_flask"; - public static final String BLOOD_PENDANT = "bloodpendant"; - public static final String MISSILE_ROD = "missilerod"; - public static final String HOLY_CLOAK = "holycloak"; - public static final String UNHOLY_CLOAK = "unholycloak"; - public static final String BALANCE_CLOAK = "balancecloak"; - public static final String CRAFTING_HALO = "craftinghalo"; + public static final String BLOOD_PENDANT = "blood_pendant"; + public static final String MISSILE_ROD = "missile_rod"; + public static final String HOLY_CLOAK = "holy_cloak"; + public static final String UNHOLY_CLOAK = "unholy_cloak"; + public static final String BALANCE_CLOAK = "balance_cloak"; + public static final String CRAFTING_HALO = "crafting_halo"; public static final String BLACK_LOTUS = "black_lotus"; public static final String BLACKER_LOTUS = "blacker_lotus"; public static final String MONOCLE = "monocle"; public static final String CLIP = "clip"; - public static final String COBBLE_ROD = "cobblerod"; - public static final String SMELT_ROD = "smeltrod"; - public static final String WORLD_SEED = "worldseed"; - public static final String SPELL_CLOTH = "spellcloth"; + public static final String COBBLE_ROD = "cobble_rod"; + public static final String SMELT_ROD = "smelt_rod"; + public static final String WORLD_SEED = "world_seed"; + public static final String SPELL_CLOTH = "spell_cloth"; public static final String THORN_CHAKRAM = "thorn_chakram"; public static final String FLARE_CHAKRAM = "flare_chakram"; - public static final String OVERGROWTH_SEED = "overgrowthseed"; + public static final String OVERGROWTH_SEED = "overgrowth_seed"; public static final String CRAFT_PATTERN_PREFIX = "pattern_"; public static final String ANCIENT_WILL_PREFIX = "ancient_will_"; public static final String CORPOREA_SPARK = "corporea_spark"; @@ -140,49 +140,49 @@ public final class LibItemNames { public static final String LIVINGWOOD_BOW = "livingwood_bow"; public static final String CRYSTAL_BOW = "crystal_bow"; public static final String COSMETIC_PREFIX = "cosmetic_"; - public static final String SWAP_RING = "swapring"; - public static final String FLOWER_BAG = "flowerbag"; - public static final String PHANTOM_INK = "phantomink"; - public static final String POOL_MINECART = "poolminecart"; + public static final String SWAP_RING = "swap_ring"; + public static final String FLOWER_BAG = "flower_bag"; + public static final String PHANTOM_INK = "phantom_ink"; + public static final String POOL_MINECART = "pool_minecart"; public static final String PINKINATOR = "pinkinator"; - public static final String INFINITE_FRUIT = "infinitefruit"; - public static final String KING_KEY = "kingkey"; - public static final String FLUGEL_EYE = "flugeleye"; - public static final String THOR_RING = "thorring"; - public static final String ODIN_RING = "odinring"; - public static final String LOKI_RING = "lokiring"; + public static final String INFINITE_FRUIT = "infinite_fruit"; + public static final String KING_KEY = "king_key"; + public static final String FLUGEL_EYE = "flugel_eye"; + public static final String THOR_RING = "thor_ring"; + public static final String ODIN_RING = "odin_ring"; + public static final String LOKI_RING = "loki_ring"; public static final String DICE = "dice"; - public static final String KEEP_IVY = "keepivy"; - public static final String BLACK_HOLE_TALISMAN = "blackholetalisman"; - public static final String RECORD_GAIA1 = "recordgaia1"; - public static final String RECORD_GAIA2 = "recordgaia2"; - public static final String TEMPERANCE_STONE = "temperancestone"; + public static final String KEEP_IVY = "keep_ivy"; + public static final String BLACK_HOLE_TALISMAN = "black_hole_talisman"; + public static final String RECORD_GAIA1 = "record_gaia_1"; + public static final String RECORD_GAIA2 = "record_gaia_2"; + public static final String TEMPERANCE_STONE = "temperance_stone"; public static final String INCENSE_STICK = "incense_stick"; - public static final String TERRA_AXE = "terraaxe"; - public static final String WATER_BOWL = "waterbowl"; - public static final String OBEDIENCE_STICK = "obediencestick"; + public static final String TERRA_AXE = "terra_axe"; + public static final String WATER_BOWL = "water_bowl"; + public static final String OBEDIENCE_STICK = "obedience_stick"; public static final String CACOPHONIUM = "cacophonium"; - public static final String SLIME_BOTTLE = "slimebottle"; - public static final String STAR_SWORD = "starsword"; - public static final String EXCHANGE_ROD = "exchangerod"; - public static final String MAGNET_RING_GREATER = "magnetringgreater"; - public static final String THUNDER_SWORD = "thundersword"; - public static final String MANAWEAVE_HELM = "manaweavehelm"; - public static final String MANAWEAVE_CHEST = "manaweavechest"; - public static final String MANAWEAVE_LEGS = "manaweavelegs"; - public static final String MANAWEAVE_BOOTS = "manaweaveboots"; - public static final String AUTOCRAFTING_HALO = "autocraftinghalo"; - public static final String GAIA_HEAD = "gaiahead"; + public static final String SLIME_BOTTLE = "slime_bottle"; + public static final String STAR_SWORD = "star_sword"; + public static final String EXCHANGE_ROD = "exchange_rod"; + public static final String MAGNET_RING_GREATER = "magnet_ring_greater"; + public static final String THUNDER_SWORD = "thunder_sword"; + public static final String MANAWEAVE_HELM = "manaweave_helmet"; + public static final String MANAWEAVE_CHEST = "manaweave_chestplate"; + public static final String MANAWEAVE_LEGS = "manaweave_leggings"; + public static final String MANAWEAVE_BOOTS = "manaweave_boots"; + public static final String AUTOCRAFTING_HALO = "auto_crafting_halo"; + public static final String GAIA_HEAD = "gaia_head"; public static final String SEXTANT = "sextant"; - public static final String SPEED_UP_BELT = "speedupbelt"; - public static final String BAUBLE_BOX = "baublebox"; - public static final String DODGE_RING = "dodgering"; - public static final String INVISIBILITY_CLOAK = "invisibilitycloak"; - public static final String CLOUD_PENDANT = "cloudpendant"; - public static final String SUPER_CLOUD_PENDANT = "supercloudpendant"; - public static final String THIRD_EYE = "thirdeye"; + public static final String SPEED_UP_BELT = "speed_up_belt"; + public static final String BAUBLE_BOX = "bauble_box"; + public static final String DODGE_RING = "dodge_ring"; + public static final String INVISIBILITY_CLOAK = "invisibility_cloak"; + public static final String CLOUD_PENDANT = "cloud_pendant"; + public static final String SUPER_CLOUD_PENDANT = "super_cloud_pendant"; + public static final String THIRD_EYE = "third_eye"; public static final String ASTROLABE = "astrolabe"; - public static final String GODDESS_CHARM = "goddesscharm"; + public static final String GODDESS_CHARM = "goddess_charm"; public static final String[] LENS_NAMES = new String[] { "lens_normal", diff --git a/src/main/resources/data/botania/tags/items/loonium_blacklist.json b/src/main/resources/data/botania/tags/items/loonium_blacklist.json index 242c67b36..9b1beff2f 100644 --- a/src/main/resources/data/botania/tags/items/loonium_blacklist.json +++ b/src/main/resources/data/botania/tags/items/loonium_blacklist.json @@ -2,7 +2,7 @@ "replace": false, "values": [ "botania:lexicon", - "botania:overgrowthseed", + "botania:overgrowth_seed", "botania:black_lotus", "botania:blacker_lotus", "minecraft:music_disc_13",