From 9493ca8548231ca1c57a69b505094fa117acbccc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Nov 2019 15:14:10 -0600 Subject: [PATCH] More cleaning --- .../vazkii/botania/common/lib/LibLexicon.java | 275 ------------------ .../vazkii/botania/common/lib/LibMisc.java | 10 - .../vazkii/botania/common/lib/LibOreDict.java | 31 -- 3 files changed, 316 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/lib/LibLexicon.java delete mode 100644 src/main/java/vazkii/botania/common/lib/LibOreDict.java diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java deleted file mode 100644 index cf59b086f..000000000 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ /dev/null @@ -1,275 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 14, 2014, 9:14:08 PM (GMT)] - */ -package vazkii.botania.common.lib; - -public final class LibLexicon { - - public static final String CATEGORY_PREFIX = "botania.category."; - - public static final String CATEGORY_BASICS = "basics"; - public static final String CATEGORY_MANA = "mana"; - public static final String CATEGORY_FUNCTIONAL_FLOWERS = "functionalflowers"; - public static final String CATEGORY_GENERATION_FLOWERS = "generationflowers"; - public static final String CATEGORY_DEVICES = "devices"; - public static final String CATEGORY_TOOLS = "tools"; - public static final String CATEGORY_BAUBLES = "baubles"; - public static final String CATEGORY_ENDER = "ender"; - public static final String CATEGORY_ALFHOMANCY = "alfhomancy"; - public static final String CATEGORY_MISC = "misc"; - - public static final String BASICS_WELCOME = "welcome"; - public static final String BASICS_TUTORIAL = "tutorial"; - public static final String BASICS_INTRO_VIDEO = "introVideo"; - - public static final String BASICS_FLOWERS = "flowers"; - public static final String BASICS_APOTHECARY = "apothecary"; - public static final String BASICS_LEXICON = "lexicon"; - public static final String BASICS_WAND = "wand"; - public static final String BASICS_PURE_DAISY = "pureDaisy"; - public static final String BASICS_RUNE_ALTAR = "runeAltar"; - public static final String BASICS_TERRASTEEL = "terrasteel"; - public static final String BASICS_BLACK_LOTUS = "blackLotus"; - public static final String BASICS_FLOWER_BAG = "flowerBag"; - public static final String BASICS_GARDEN_OF_GLASS = "gardenOfGlass"; - - public static final String MANA_INTRO = "mIntro"; - public static final String MANA_SPREADER = "spreader"; - public static final String MANA_POOL = "pool"; - public static final String MANA_DISTRIBUTOR = "distributor"; - public static final String MANA_LENSES = "lens"; - public static final String MANA_VOID = "manaVoid"; - public static final String MANA_RF_GENERATOR = "rfGenerator"; - public static final String MANA_TABLET = "manaTablet"; - public static final String MANA_MIRROR = "manaMirror"; - public static final String MANA_DETECTOR = "manaDetector"; - public static final String MANA_COMPOSITE_LENS = "compositeLens"; - public static final String MANA_REDSTONE_SPREADER = "redstoneSpreader"; - public static final String MANA_MANASTAR = "manastar"; - public static final String MANA_DREAMWOOD_SPREADER = "dreamwoodSpreader"; - public static final String MANA_ELVEN_LENSES = "elvenLenses"; - public static final String MANA_SPARKS = "sparks"; - public static final String MANA_SPARK_UPGRADES = "sparkUpgrades"; - public static final String MANA_PRISM = "prism"; - public static final String MANA_POOL_CART = "poolCart"; - public static final String MANA_SPARK_CHANGER = "sparkChanger"; - public static final String MANA_BELLOWS = "bellows"; - - public static final String FFLOWER_INTRO = "fIntro"; - public static final String FFLOWER_SHRINKING = "flowerShrinking"; - public static final String FFLOWER_SPEED = "flowerSpeed"; - public static final String FFLOWER_JADED_AMARANTHUS = "jadedAmaranthus"; - public static final String FFLOWER_BELLETHORNE = "bellethorne"; - public static final String FFLOWER_DREADTHORNE = "dreadthorne"; - public static final String FFLOWER_HEISEI_DREAM = "heiseiDream"; - public static final String FFLOWER_TIGERSEYE = "tigerseye"; - public static final String FFLOWER_ORECHID = "orechid"; - public static final String FFLOWER_ORECHID_IGNEM = "orechidIgnem"; - public static final String FFLOWER_FALLEN_KANADE = "fallenKanade"; - public static final String FFLOWER_EXOFLAME = "exoflame"; - public static final String FFLOWER_AGRICARNATION = "agricarnation"; - public static final String FFLOWER_HOPPERHOCK = "hopperhock"; - public static final String FFLOWER_TANGLEBERRIE = "tangleberrie"; - public static final String FFLOWER_JIYUULIA = "jiyuulia"; - public static final String FFLOWER_RANNUNCARPUS = "rannuncarpus"; - public static final String FFLOWER_HYACIDUS = "hyacidus"; - public static final String FFLOWER_POLLIDISIAC = "pollidisiac"; - public static final String FFLOWER_CLAYCONIA = "clayconia"; - public static final String FFLOWER_LOONIUM = "loonium"; - public static final String FFLOWER_DAFFOMILL = "daffomill"; - public static final String FFLOWER_VINCULOTUS = "vinculotus"; - public static final String FFLOWER_SPECTRANTHEMUN = "spectranthemum"; - public static final String FFLOWER_MEDUMONE = "medumone"; - public static final String FFLOWER_MARIMORPHOSIS = "marimorphosis"; - public static final String FFLOWER_BUBBELL = "bubbell"; - public static final String FFLOWER_SOLEGNOLIA = "solegnolia"; - public static final String FFLOWER_BERGAMUTE = "bergamute"; - - public static final String GFLOWER_INTRO = "gIntro"; - public static final String GFLOWER_PASSIVE_GENERATION = "passiveGen"; - public static final String GFLOWER_PRIMUS_LOCI = "primusLoci"; - public static final String GFLOWER_DAYBLOOM = "daybloom"; - public static final String GFLOWER_NIGHTSHADE = "nightshade"; - public static final String GFLOWER_ENDOFLAME = "endoflame"; - public static final String GFLOWER_HYDROANGEAS = "hydroangeas"; - public static final String GFLOWER_THERMALILY = "thermalily"; - public static final String GFLOWER_ARCANE_ROSE = "arcanerose"; - public static final String GFLOWER_MUNCHDEW = "munchdew"; - public static final String GFLOWER_ENTROPINNYUM = "entropinnyum"; - public static final String GFLOWER_KEKIMURUS = "kekimurus"; - public static final String GFLOWER_GOURMARYLLIS = "gourmaryllis"; - public static final String GFLOWER_NARSLIMMUS = "narslimmus"; - public static final String GFLOWER_SPECTROLUS = "spectrolus"; - public static final String GFLOWER_RAFFLOWSIA = "rafflowsia"; - public static final String GFLOWER_SHULK_ME_NOT = "shulk_me_not"; - public static final String GFLOWER_DANDELIFEON = "dandelifeon"; - - public static final String DEVICE_PYLON = "pylon"; - public static final String DEVICE_MANA_ENCHANTING = "manaEnchanting"; - public static final String DEVICE_TURNTABLE = "turntable"; - public static final String DEVICE_ALCHEMY = "manaAlchemy"; - public static final String DEVICE_OPEN_CRATE = "openCrate"; - public static final String DEVICE_FOREST_EYE = "forestEye"; - public static final String DEVICE_FOREST_DRUM = "forestDrum"; - public static final String DEVICE_PLATFORM = "platform"; - public static final String DEVICE_MANA_CONJURATION = "manaConjuration"; - public static final String DEVICE_SPECTRAL_PLATFORM = "spectralPlatform"; - public static final String DEVICE_GATHER_DRUM = "gatherDrum"; - public static final String DEVICE_CRAFT_CRATE = "craftCrate"; - public static final String DEVICE_BREWERY = "brewery"; - public static final String DEVICE_FLASKS = "flasks"; - public static final String DEVICE_COMPLEX_BREWS = "complexBrews"; - public static final String DEVICE_INCENSE = "incense"; - public static final String DEVICE_HOURGLASS = "hourglass"; - public static final String DEVICE_GHOST_RAIL = "ghostRail"; - public static final String DEVICE_CANOPY_DRUM = "canopyDrum"; - public static final String DEVICE_COCOON = "cocoon"; - public static final String DEVICE_MANA_BOMB = "manaBomb"; - public static final String DEVICE_TERU_TERU_BOZU = "teruTeruBozu"; - public static final String DEVICE_AVATAR = "avatar"; - public static final String DEVICE_FEL_PUMPKIN = "felPumpkin"; - public static final String DEVICE_ANIMATED_TORCH = "animatedTorch"; - - public static final String TOOL_MANA_BLASTER = "manaBlaster"; - public static final String TOOL_GRASS_SEEDS = "grassSeeds"; - public static final String TOOL_DIRT_ROD = "dirtRod"; - public static final String TOOL_TERRAFORM_ROD = "terraformRod"; - public static final String TOOL_MANASTEEL_GEAR = "manaGear"; - public static final String TOOL_TERRASTEEL_ARMOR = "terrasteelArmor"; - public static final String TOOL_GRASS_HORN = "grassHorn"; - public static final String TOOL_TERRA_SWORD = "terraSword"; - public static final String TOOL_TERRA_PICK = "terraPick"; - public static final String TOOL_WATER_ROD = "waterRod"; - public static final String TOOL_ELF_GEAR = "elfGear"; - public static final String TOOL_OPEN_BUCKET = "openBucket"; - public static final String TOOL_RAINBOW_ROD = "rainbowRod"; - public static final String TOOL_TORNADO_ROD = "tornadoRod"; - public static final String TOOL_FIRE_ROD = "fireRod"; - public static final String TOOL_VINE_BALL = "vineBall"; - public static final String TOOL_LAPUTA_SHARD = "laputaShard"; - public static final String TOOL_VIRUS = "virus"; - public static final String TOOL_SKY_DIRT_ROD = "skyDirtRod"; - public static final String TOOL_GLASS_PICK = "glassPick"; - public static final String TOOL_DIVINING_ROD = "diviningRod"; - public static final String TOOL_GRAVITY_ROD = "gravityRod"; - public static final String TOOL_MISSILE_ROD = "missileRod"; - public static final String TOOL_CRAFTING_HALO = "craftingHalo"; - public static final String TOOL_CLIP = "clip"; - public static final String TOOL_COBBLE_ROD = "cobbleRod"; - public static final String TOOL_SMELT_ROD = "smeltRod"; - public static final String TOOL_WORLD_SEED = "worldSeed"; - public static final String TOOL_SPELL_CLOTH = "spellCloth"; - public static final String TOOL_THORN_CHAKRAM = "thornChakram"; - public static final String TOOL_FIRE_CHAKRAM = "fireChakram"; - public static final String TOOL_OVERGROWTH_SEED = "overgrowthSeed"; - public static final String TOOL_LIVINGWOOD_BOW = "livingwoodBow"; - public static final String TOOL_CRYSTAL_BOW = "crystalBow"; - public static final String TOOL_TEMPERANCE_STONE = "temperanceStone"; - public static final String TOOL_TERRA_AXE = "terraAxe"; - public static final String TOOL_OBEDIENCE_STICK = "obedienceStick"; - public static final String TOOL_SLIME_BOTTLE = "slimeBottle"; - public static final String TOOL_EXCHANGE_ROD = "exchangeRod"; - public static final String TOOL_MANAWEAVE = "manaweave"; - public static final String TOOL_AUTOCRAFTING_HALO = "autocraftingHalo"; - public static final String TOOL_SEXTANT = "sextant"; - public static final String TOOL_ASTROLABE = "astrolabe"; - - public static final String ENDER_AIR = "enderAir"; - public static final String ENDER_ENDER_EYE_BLOCK = "enderEyeBlock"; - public static final String ENDER_PISTON_RELAY = "pistonRelay"; - public static final String ENDER_ENDER_HAND = "enderHand"; - public static final String ENDER_ENDER_DAGGER = "enderDagger"; - public static final String ENDER_SPAWNER_CLAW = "spawnerClaw"; - public static final String ENDER_RED_STRING = "redString"; - public static final String ENDER_FLIGHT_TIARA = "flightTiara"; - public static final String ENDER_CORPOREA = "corporea"; - public static final String ENDER_CORPOREA_INDEX = "corporeaIndex"; - public static final String ENDER_CORPOREA_FUNNEL = "corporeaFunnel"; - public static final String ENDER_CORPOREA_INTERCEPTOR = "corporeaInterceptor"; - public static final String ENDER_END_STONE_DECOR = "endStoneDecor"; - public static final String ENDER_SPAWNER_MOVER = "spawnerMover"; - public static final String ENDER_KEEP_IVY = "keepIvy"; - public static final String ENDER_BLACK_HOLE_TALISMAN = "blackHoleTalisman"; - public static final String ENDER_CORPOREA_CRYSTAL_CUBE = "corporeaCrystalCube"; - public static final String ENDER_LUMINIZER_TRANSPORT = "luminizerTransport"; - public static final String ENDER_STAR_SWORD = "starSword"; - public static final String ENDER_THUNDER_SWORD = "thunderSword"; - public static final String ENDER_CORPOREA_RETAINER = "corporeaRetainer"; - - public static final String BAUBLE_INTRO = "bIntro"; - public static final String BAUBLE_COSMETIC = "cosmeticBaubles"; - public static final String BAUBLE_TINY_PLANET = "tinyPlanet"; - public static final String BAUBLE_MANA_RING = "manaRing"; - public static final String BAUBLE_AURA_RING = "auraRing"; - public static final String BAUBLE_TRAVEL_BELT = "travelBelt"; - public static final String BAUBLE_KNOCKBACK_BELT = "knockbackBelt"; - public static final String BAUBLE_ICE_PENDANT = "icePendant"; - public static final String BAUBLE_LAVA_PENDANT = "lavaPendant"; - public static final String BAUBLE_GOLDEN_LAUREL = "goldenLaurel"; - public static final String BAUBLE_WATER_RING = "waterRing"; - public static final String BAUBLE_MINING_RING = "miningRing"; - public static final String BAUBLE_MAGNET_RING = "magnetRing"; - public static final String BAUBLE_DIVA_CHARM = "divaCharm"; - public static final String BAUBLE_PIXIE_RING = "pixieRing"; - public static final String BAUBLE_SUPER_TRAVEL_BELT = "superTravelBelt"; - public static final String BAUBLE_REACH_RING = "reachRing"; - public static final String BAUBLE_ITEM_FINDER = "itemFinder"; - public static final String BAUBLE_SUPER_LAVA_PENDANT = "superLavaPendant"; - public static final String BAUBLE_BLOOD_PENDANT = "bloodPendant"; - public static final String BAUBLE_JUDGEMENT_CLOAKS = "judgementCloaks"; - public static final String BAUBLE_MONOCLE = "monocle"; - public static final String BAUBLE_SWAP_RING = "swapRing"; - public static final String BAUBLE_SPEED_UP_BELT = "speedUpBelt"; - public static final String BAUBLE_BOX = "baubleBox"; - public static final String BAUBLE_DODGE_RING = "dodgeRing"; - public static final String BAUBLE_INVISIBILITY_CLOAK = "invisibilityCloak"; - public static final String BAUBLE_CLOUD_PENDANT = "cloudPendant"; - public static final String BAUBLE_SUPER_CLOUD_PENDANT = "superCloudPendant"; - public static final String BAUBLE_THIRD_EYE = "thirdEye"; - public static final String BAUBLE_GODDESS_CHARM = "goddessCharm"; - - public static final String ALF_INTRO = "aIntro"; - public static final String ALF_MESSAGE = "elfMessage"; - public static final String ALF_RESOURCES = "elfResources"; - public static final String ALF_GAIA_RITUAL = "gaiaRitual"; - public static final String ALF_GAIA_RITUAL_HARDMODE = "gaiaRitualHardmode"; - public static final String ALF_LORE = "elvenLore"; - public static final String ALF_RELICS = "relics"; - public static final String ALF_RELIC_INFO = "relicInfo"; - public static final String ALF_INFINITE_FRUIT = "infiniteFruit"; - public static final String ALF_KING_KEY = "kingKey"; - public static final String ALF_FLUGEL_EYE = "flugelEye"; - public static final String ALF_THOR_RING = "thorRing"; - public static final String ALF_LOKI_RING = "lokiRing"; - public static final String ALF_ODIN_RING = "odinRing"; - - public static final String MISC_DECORATIVE_BLOCKS = "decorativeBlocks"; - public static final String MISC_DISPENSER_TWEAKS = "dispenserTweaks"; - public static final String MISC_SHINY_FLOWERS = "shinyFlowers"; - public static final String MISC_PRISMARINE = "prismarine"; - public static final String MISC_SHEDDING = "shedding"; - public static final String MISC_TINY_POTATO = "tinyPotato"; - public static final String MISC_HEAD_CREATING = "headCreating"; - public static final String MISC_AZULEJO = "azulejo"; - public static final String MISC_STARFIELD = "starfield"; - public static final String MISC_MUSHROOMS = "mushrooms"; - public static final String MISC_PHANTOM_INK = "phantomInk"; - public static final String MISC_BLAZE_BLOCK = "blazeBlock"; - public static final String MISC_CHALLENGES = "challenges"; - public static final String MISC_CACOPHONIUM = "cacophonium"; - public static final String MISC_PAVEMENT = "pavement"; - public static final String MISC_PRENTING_DECAY = "preventingDecay"; - - public static final String MISC_TC_INTEGRATION = "tcIntegration"; - public static final String MISC_BC_INTEGRATION = "bcIntegration"; - public static final String MISC_BANNERS = "banners"; - -} - diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index c431a00ed..810977c8b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -12,20 +12,10 @@ package vazkii.botania.common.lib; public final class LibMisc { - // Mod Constants public static final String MOD_ID = "botania"; public static final String MOD_NAME = "Botania"; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String MC_VERSION = "1.13.2"; - - public static final int[] CONTROL_CODE_COLORS = new int[] { - 0x000000, 0x0000AA, 0x00AA00, 0x00AAAA, - 0xAA0000, 0xAA00AA, 0xFFAA00, 0xAAAAAA, - 0x555555, 0x5555FF, 0x55FF55, 0x55FFFF, - 0xFF5555, 0xFF55FF, 0xFFFF55, 0xFFFFFF - }; - public static final int PASSIVE_FLOWER_DECAY = 72000; } diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java deleted file mode 100644 index 7f669fab1..000000000 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 19, 2014, 4:30:32 PM (GMT)] - */ -package vazkii.botania.common.lib; - -public final class LibOreDict { - public static final String MANA_STEEL = "ingotManasteel"; - public static final String MANA_PEARL = "manaPearl"; - public static final String MANA_DIAMOND = "manaDiamond"; - public static final String LIFE_ESSENCE = "eternalLifeEssence"; - public static final String REDSTONE_ROOT = "redstoneRoot"; - public static final String PIXIE_DUST = "elvenPixieDust"; - public static final String ROOT = "livingRoot"; - public static final String MANA_POWDER = "powderMana"; - - public static final String BLAZE_BLOCK = "blockBlaze"; - - public static final String[] RUNE = new String[] { - "runeWaterB", "runeFireB", "runeEarthB", "runeAirB", - "runeSpringB", "runeSummerB", "runeAutumnB", "runeWinterB", - "runeManaB", "runeLustB", "runeGluttonyB", "runeGreedB", - "runeSlothB", "runeWrathB", "runeEnvyB", "runePrideB" - }; -}