From 77a2fa15fedf1b6729b1ca1a003d87ebd2bfb4c9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 8 Jul 2020 22:04:48 -0500 Subject: [PATCH] Remove all thaumcraft stuff. F. --- .../vazkii/botania/common/brew/ModBrews.java | 5 - .../crafting/recipe/HelmRevealingRecipe.java | 157 ------ .../integration/thaumcraft/TCAspects.java | 512 ------------------ .../vazkii/botania/common/item/ModItems.java | 13 - .../armor/elementium/ItemElementiumArmor.java | 2 +- .../armor/manasteel/ItemManasteelArmor.java | 2 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 2 +- .../ItemElementiumHelmRevealing.java | 28 - .../thaumcraft/ItemManaInkwell.java | 114 ---- .../ItemManasteelHelmRevealing.java | 28 - .../ItemTerrasteelHelmRevealing.java | 28 - .../botania/common/lib/LibItemNames.java | 4 - .../data/recipes/ManaInfusionProvider.java | 7 - .../resources/assets/botania/lang/de_de.json | 4 - .../resources/assets/botania/lang/en_us.json | 11 - .../resources/assets/botania/lang/es_es.json | 18 - .../resources/assets/botania/lang/fr_fr.json | 5 - .../resources/assets/botania/lang/ja_jp.json | 15 - .../resources/assets/botania/lang/ko_kr.json | 5 - .../resources/assets/botania/lang/nl_nl.json | 20 - .../resources/assets/botania/lang/pt_br.json | 8 - .../resources/assets/botania/lang/ru_ru.json | 9 - .../resources/assets/botania/lang/zh_cn.json | 9 - .../resources/assets/botania/lang/zh_tw.json | 9 - .../item/elementium_helmet_revealing.json | 6 - .../botania/models/item/mana_inkwell.json | 6 - .../item/manasteel_helmet_revealing.json | 6 - .../item/terrasteel_helmet_revealing.json | 6 - .../item/elementium_helmet_reveal.png | Bin 610 -> 0 bytes .../botania/textures/item/mana_ink_well.png | Bin 946 -> 0 bytes .../textures/item/mana_ink_well.png.mcmeta | 19 - .../textures/item/manasteel_helmet_reveal.png | Bin 420 -> 0 bytes .../item/terrasteel_helmet_reveal.png | Bin 641 -> 0 bytes 33 files changed, 3 insertions(+), 1055 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java delete mode 100644 src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java delete mode 100644 src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java delete mode 100644 src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java delete mode 100644 src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java delete mode 100644 src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java delete mode 100644 src/main/resources/assets/botania/models/item/elementium_helmet_revealing.json delete mode 100644 src/main/resources/assets/botania/models/item/mana_inkwell.json delete mode 100644 src/main/resources/assets/botania/models/item/manasteel_helmet_revealing.json delete mode 100644 src/main/resources/assets/botania/models/item/terrasteel_helmet_revealing.json delete mode 100644 src/main/resources/assets/botania/textures/item/elementium_helmet_reveal.png delete mode 100644 src/main/resources/assets/botania/textures/item/mana_ink_well.png delete mode 100644 src/main/resources/assets/botania/textures/item/mana_ink_well.png.mcmeta delete mode 100644 src/main/resources/assets/botania/textures/item/manasteel_helmet_reveal.png delete mode 100644 src/main/resources/assets/botania/textures/item/terrasteel_helmet_reveal.png diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 0129350b9..01a05257a 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -93,11 +93,6 @@ public class ModBrews { register(r, LibBrewNames.BLOODTHIRST, bloodthirst); register(r, LibBrewNames.ALLURE, allure); register(r, LibBrewNames.CLEAR, clear); - - Registry.EFFECTS.getValue(new ResourceLocation("thaumcraft:warpward")).ifPresent(warpWardPotion -> { - warpWard = new Brew(0xFBBDFF, 25000, new EffectInstance(warpWardPotion, 12000, 0)).setNotBloodPendantInfusable(); - register(r, LibBrewNames.WARP_WARD, warpWard); - }); } private static Brew make(int cost, EffectInstance... effects) { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java deleted file mode 100644 index 65eae3b0c..000000000 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * This class is 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 - */ -package vazkii.botania.common.crafting.recipe; - -import com.google.gson.JsonObject; - -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.ICraftingRecipe; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.item.crafting.ShapelessRecipe; -import net.minecraft.nbt.ListNBT; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.World; -import net.minecraftforge.registries.ForgeRegistryEntry; - -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; - -public class HelmRevealingRecipe implements ICraftingRecipe { - private final ShapelessRecipe compose; - - public HelmRevealingRecipe(ShapelessRecipe compose) { - this.compose = compose; - } - - @Override - public boolean matches(@Nonnull CraftingInventory inv, @Nonnull World world) { - return compose.matches(inv, world); - } - - @Nonnull - @Override - public ItemStack getCraftingResult(@Nonnull CraftingInventory inv) { - ItemStack helm = ItemStack.EMPTY; - - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if (!stack.isEmpty() && Registry.ITEM.getKey(stack.getItem()).getNamespace().equals(LibMisc.MOD_ID)) { - helm = stack; - } - } - - if (helm.isEmpty()) { - return ItemStack.EMPTY; - } - - ItemStack newHelm = compose.getCraftingResult(inv); - - //Copy Ancient Wills - for (int i = 0; i < 6; i++) { - if (ItemNBTHelper.getBoolean(helm, "AncientWill" + i, false)) { - ItemNBTHelper.setBoolean(newHelm, "AncientWill" + i, true); - } - } - - //Copy Enchantments - ListNBT enchList = ItemNBTHelper.getList(helm, "ench", 10, true); - if (enchList != null) { - ItemNBTHelper.setList(newHelm, "ench", enchList); - } - copyTCData(helm, newHelm); - - return newHelm; - } - - @Override - public boolean canFit(int width, int height) { - return compose.canFit(width, height); - } - - @Nonnull - @Override - public ItemStack getRecipeOutput() { - return compose.getRecipeOutput(); - } - - @Nonnull - @Override - public NonNullList getIngredients() { - return compose.getIngredients(); - } - - @Override - public boolean isDynamic() { - return true; - } - - @Nonnull - @Override - public ResourceLocation getId() { - return compose.getId(); - } - - @Nonnull - @Override - public IRecipeSerializer getSerializer() { - return SERIALIZER; - } - - private static final String TAG_RUNIC = "TC.RUNIC"; - private static final String TAG_WARP = "TC.WARP"; - private static final String TAG_INFUSION_ENCH = "infench"; - - /** - * Copies Thaumcraft's infusion enchantments, runic shielding, - * and warping (which is sometimes added as a side effect of infusion enchanting) - */ - public static void copyTCData(ItemStack source, ItemStack destination) { - byte runicShielding = ItemNBTHelper.getByte(source, TAG_RUNIC, (byte) 0); - if (runicShielding != 0) { - ItemNBTHelper.setByte(destination, TAG_RUNIC, runicShielding); - } - - byte warp = ItemNBTHelper.getByte(source, TAG_WARP, (byte) 0); - if (warp != 0) { - ItemNBTHelper.setByte(destination, TAG_WARP, warp); - } - - ListNBT infEnchList = ItemNBTHelper.getList(source, TAG_INFUSION_ENCH, 10, true); - if (infEnchList != null) { - ItemNBTHelper.setList(destination, TAG_INFUSION_ENCH, infEnchList); - } - } - - public static final IRecipeSerializer SERIALIZER = new Serializer(); - - private static class Serializer extends ForgeRegistryEntry> implements IRecipeSerializer { - @Nonnull - @Override - public HelmRevealingRecipe read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) { - return new HelmRevealingRecipe(IRecipeSerializer.CRAFTING_SHAPELESS.read(recipeId, json)); - } - - @Override - public HelmRevealingRecipe read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) { - return new HelmRevealingRecipe(IRecipeSerializer.CRAFTING_SHAPELESS.read(recipeId, buffer)); - } - - @Override - public void write(@Nonnull PacketBuffer buffer, @Nonnull HelmRevealingRecipe recipe) { - IRecipeSerializer.CRAFTING_SHAPELESS.write(buffer, recipe.compose); - } - }; -} diff --git a/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java b/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java deleted file mode 100644 index 9a31ece0d..000000000 --- a/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java +++ /dev/null @@ -1,512 +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 @ [Jun 19, 2018, 8:25:10 PM (GMT)] - */ - -/* -package vazkii.botania.common.integration.thaumcraft; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectEventProxy; -import thaumcraft.api.aspects.AspectHelper; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.aspects.AspectRegistryEvent; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.common.crafting.RecipeBrew; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibEntityNames; -import vazkii.botania.common.lib.LibOreDict; - -import java.util.Arrays; -import java.util.List; - -import static thaumcraft.api.aspects.Aspect.*; - -public class TCAspects { - private static final int ANY = OreDictionary.WILDCARD_VALUE; - private final AspectEventProxy proxy; - - private TCAspects(AspectEventProxy proxy) { - this.proxy = proxy; - } - - @SubscribeEvent - public static void registerAspects(AspectRegistryEvent event) { - TCAspects handler = new TCAspects(event.register); - handler.registerFlowerAspects(); - handler.registerItemAspects(); - handler.registerBrewAspects(); - handler.registerEntityAspects(); - } - - private void registerFlowerAspects() { - registerFlower(LibBlockNames.SUBTILE_PUREDAISY, new AspectList().add(LIFE, 10).add(EXCHANGE, 5)); - registerFlower(LibBlockNames.SUBTILE_MANASTAR, new AspectList().add(SENSES, 5).add(AURA, 5)); - - registerFlower(LibBlockNames.SUBTILE_ENDOFLAME, new AspectList().add(FIRE, 10)); - registerFlower(LibBlockNames.SUBTILE_HYDROANGEAS, new AspectList().add(WATER, 10)); - registerFlower(LibBlockNames.SUBTILE_THERMALILY, new AspectList().add(FIRE, 5).add(EARTH, 5)); - registerFlower(LibBlockNames.SUBTILE_ARCANE_ROSE, new AspectList().add(MIND, 15)); - registerFlower(LibBlockNames.SUBTILE_MUNCHDEW, new AspectList().add(PLANT, 5).add(DESIRE, 5)); - registerFlower(LibBlockNames.SUBTILE_ENTROPINNYUM, new AspectList().add(ENTROPY, 5).add(ALCHEMY, 5)); - registerFlower(LibBlockNames.SUBTILE_KEKIMURUS, new AspectList().add(DESIRE, 10)); - registerFlower(LibBlockNames.SUBTILE_GOURMARYLLIS, new AspectList().add(DESIRE, 5).add(LIFE, 5)); - registerFlower(LibBlockNames.SUBTILE_NARSLIMMUS, new AspectList().add(WATER, 5).add(LIFE, 5)); - registerFlower(LibBlockNames.SUBTILE_SPECTROLUS, new AspectList().add(SENSES, 10).add(BEAST, 5)); - registerFlower(LibBlockNames.SUBTILE_RAFFLOWSIA, new AspectList().add(VOID, 10)); - registerFlower(LibBlockNames.SUBTILE_SHULK_ME_NOT, new AspectList().add(FLIGHT, 5).add(TRAP, 5)); - registerFlower(LibBlockNames.SUBTILE_DANDELIFEON, new AspectList().add(ORDER, 5).add(MECHANISM, 5).add(LIFE, 5)); - - registerFlower(LibBlockNames.SUBTILE_JADED_AMARANTHUS, new AspectList().add(LIFE, 5).add(PLANT, 5).add(SENSES, 5)); - registerFlower(LibBlockNames.SUBTILE_BELLETHORN, new AspectList().add(AVERSION, 10)); - registerFlower(LibBlockNames.SUBTILE_DREADTHORN, new AspectList().add(AVERSION, 5).add(BEAST, 5)); - registerFlower(LibBlockNames.SUBTILE_HEISEI_DREAM, new AspectList().add(SOUL, 5).add(BEAST, 5)); - registerFlower(LibBlockNames.SUBTILE_TIGERSEYE, new AspectList().add(MOTION, 5).add(TRAP, 5)); - registerFlower(LibBlockNames.SUBTILE_ORECHID, new AspectList().add(DESIRE, 10).add(METAL, 5).add(EARTH, 5)); - registerFlower(LibBlockNames.SUBTILE_ORECHID_IGNEM, new AspectList().add(DESIRE, 10).add(METAL, 5).add(FIRE, 5)); - registerFlower(LibBlockNames.SUBTILE_FALLEN_KANADE, new AspectList().add(LIFE, 10)); - registerFlower(LibBlockNames.SUBTILE_EXOFLAME, new AspectList().add(FIRE, 5).add(MOTION, 5)); - registerFlower(LibBlockNames.SUBTILE_AGRICARNATION, new AspectList().add(LIFE, 5).add(PLANT, 5)); - registerFlower(LibBlockNames.SUBTILE_HOPPERHOCK, new AspectList().add(VOID, 5).add(EXCHANGE, 5)); - registerFlower(LibBlockNames.SUBTILE_TANGLEBERRIE, new AspectList().add(TRAP, 10)); - registerFlower(LibBlockNames.SUBTILE_JIYUULIA, new AspectList().add(PROTECT, 5).add(TRAP, 5)); - registerFlower(LibBlockNames.SUBTILE_RANNUNCARPUS, new AspectList().add(MAN, 5).add(EXCHANGE, 5)); - registerFlower(LibBlockNames.SUBTILE_HYACIDUS, new AspectList().add(DEATH, 10)); - registerFlower(LibBlockNames.SUBTILE_POLLIDISIAC, new AspectList().add(BEAST, 5).add(DESIRE, 5)); - registerFlower(LibBlockNames.SUBTILE_CLAYCONIA, new AspectList().add(WATER, 5).add(EXCHANGE, 5)); - registerFlower(LibBlockNames.SUBTILE_LOONIUM, new AspectList().add(DESIRE, 10).add(BEAST, 5).add(UNDEAD, 5)); - registerFlower(LibBlockNames.SUBTILE_DAFFOMILL, new AspectList().add(MOTION, 10)); - registerFlower(LibBlockNames.SUBTILE_VINCULOTUS, new AspectList().add(ELDRITCH, 5).add(TRAP, 10)); - registerFlower(LibBlockNames.SUBTILE_SPECTRANTHEMUM, new AspectList().add(ELDRITCH, 5).add(MOTION, 5)); - registerFlower(LibBlockNames.SUBTILE_MEDUMONE, new AspectList().add(TRAP, 5).add(COLD, 5)); - registerFlower(LibBlockNames.SUBTILE_MARIMORPHOSIS, new AspectList().add(EARTH, 5).add(SENSES, 5)); - registerFlower(LibBlockNames.SUBTILE_BUBBELL, new AspectList().add(AIR, 5).add(VOID, 5)); - registerFlower(LibBlockNames.SUBTILE_SOLEGNOLIA, new AspectList().add(METAL, 5).add(TRAP, 5)); - registerFlower(LibBlockNames.SUBTILE_BERGAMUTE, new AspectList().add(SENSES, 5).add(TRAP, 5)); - } - - //Each category is mostly ordered by order of its recipe registration. - private void registerItemAspects() { - //Pure Daisy - register(LibOreDict.LIVING_WOOD, new AspectList().add(PLANT, 20).add(LIFE, 5)); - register(LibOreDict.LIVING_ROCK, new AspectList().add(EARTH, 5).add(LIFE, 3)); - - //Mana Infusion - register(LibOreDict.MANA_STEEL, new AspectList().add(METAL, 10).add(MAGIC, 5)); - register(LibOreDict.MANA_PEARL, new AspectList().add(ELDRITCH, 10).add(MAGIC, 5).add(MOTION, 5)); - register(LibOreDict.MANA_DIAMOND, new AspectList(new ItemStack(Items.DIAMOND)).add(MAGIC, 5)); - register(LibOreDict.MANA_POWDER, new AspectList().add(ENERGY, 3).add(MAGIC, 3)); - register(ModBlocks.pistonRelay, 0, new AspectList(new ItemStack(Blocks.PISTON)).add(AURA, 10)); - register(ModItems.manaCookie, 0, new AspectList(new ItemStack(Items.COOKIE)).merge(LIFE, 20).add(MAGIC, 5)); - - AspectList grassSeedAspects = new AspectList().add(PLANT, 5).add(LIFE, 5).add(EXCHANGE, 2); - register(ModItems.grassSeeds, 0, grassSeedAspects); - register(ModItems.podzolSeeds, 1, grassSeedAspects); - register(ModItems.mycelSeeds, 2, grassSeedAspects.copy().add(DARKNESS, 5).add(FLUX, 1)); - - register(ModItems.manaQuartz, 1, new AspectList(new ItemStack(Items.QUARTZ)).add(MAGIC, 2)); - register(ModBlocks.tinyPotato, ANY, new AspectList(new ItemStack(Items.POTATO)).add(LIFE, 5).add(MOTION, 2)); - register(ModItems.manaInkwell, ANY, new AspectList().add(SENSES, 5).add(MAGIC, 5).add(WATER, 2).add(BEAST, 1)); - register(ModBlocks.manaGlass, 0, new AspectList(new ItemStack(Blocks.GLASS)).add(LIGHT, 5).add(MAGIC, 1)); - register(ModItems.manaString, 16, new AspectList(new ItemStack(Items.STRING)).merge(CRAFT, 2).add(MAGIC, 2)); - register(ModItems.manaBottle, ANY, new AspectList().add(MAGIC, 5).add(CRYSTAL, 5)); - - //Elven Trade - register(LibOreDict.DREAM_WOOD, new AspectList().add(PLANT, 20).add(ELDRITCH, 3)); - register(LibOreDict.ELEMENTIUM, new AspectList().add(METAL, 10).add(ELDRITCH, 5)); - register(LibOreDict.PIXIE_DUST, new AspectList(new ItemStack(Items.ENDER_PEARL)).add(MAGIC, 10)); - register(LibOreDict.DRAGONSTONE, new AspectList(new ItemStack(Items.DIAMOND)).add(ELDRITCH, 10)); - register(ModItems.elfQuartz, 5, new AspectList(new ItemStack(Items.QUARTZ)).add(ELDRITCH, 1)); - register(ModBlocks.elfGlass, 0, new AspectList(new ItemStack(Blocks.GLASS)).add(LIGHT, 5).add(ELDRITCH, 1)); - - //Runic Altar - AspectList runeAspects = new AspectList().add(EARTH, 5).add(MAGIC, 5); - register(ModItems.runeWater, 0, runeAspects.copy().add(WATER, 25)); - register(ModItems.runeFire, 0, runeAspects.copy().add(FIRE, 25)); - register(ModItems.runeEarth, 0, runeAspects.copy().add(EARTH, 25)); - register(ModItems.runeAir, 0, runeAspects.copy().add(AIR, 25)); - register(ModItems.runeSpring, 0, runeAspects.copy().add(LIFE, 10).add(PLANT, 15)); - register(ModItems.runeSummer, 0, runeAspects.copy().add(LIFE, 10).add(FIRE, 15)); - register(ModItems.runeAutumn, 0, runeAspects.copy().add(LIFE, 10).add(DEATH, 15)); - register(ModItems.runeWinter, 0, runeAspects.copy().add(LIFE, 10).add(COLD, 15)); - register(ModItems.runeMana, 0, runeAspects.copy().add(AURA, 25)); - register(ModItems.runeLust, 0, runeAspects.copy().add(DESIRE, 10).add(MAN, 15)); - register(ModItems.runeGluttony, 0, runeAspects.copy().add(DESIRE, 10).add(LIFE, 15)); - register(ModItems.runeGreed, 0, runeAspects.copy().add(DESIRE, 25)); - register(ModItems.runeSloth, 0, runeAspects.copy().add(DESIRE, 10).add(TRAP, 15)); - register(ModItems.runeWrath, 0, runeAspects.copy().add(DESIRE, 10).add(AVERSION, 15)); - register(ModItems.runeEnvy, 0, runeAspects.copy().add(DESIRE, 10).add(EXCHANGE, 15)); - register(ModItems.runePride, 0, runeAspects.copy().add(DESIRE, 10).add(SENSES, 15)); - - //The rest - items with no recipes, loot, overrides of autoassigned aspects, etc. - //Ordered mostly by ModItems / ModBlocks - register(LibOreDict.TERRA_STEEL, new AspectList().add(METAL, 15).add(MAGIC, 20).add(EARTH, 10)); - register(LibOreDict.LIFE_ESSENCE, new AspectList().add(LIFE, 15).add(EARTH, 10).add(SOUL, 10).add(ORDER, 5).add(MAGIC, 5).add(ELDRITCH, 5)); - register(LibOreDict.ENDER_AIR_BOTTLE, new AspectList().add(ELDRITCH, 5).add(AIR, 5)); - register(LibOreDict.PLACEHOLDER, new AspectList().add(CRAFT, 1)); - - for(String name : LibOreDict.FLOWER) - register(name, new AspectList(new ItemStack(Blocks.RED_FLOWER))); - for(String name : LibOreDict.DOUBLE_FLOWER) - register(name, new AspectList(new ItemStack(Blocks.DOUBLE_PLANT))); - for(String name : LibOreDict.PETAL) - register(name, new AspectList().add(SENSES, 5).add(PLANT, 5)); - - for(Item dye : ModItems.dyes.values()) - register(dye, 0, new AspectList().add(SENSES, 5).add(PLANT, 1)); - registerComplex(ModItems.lexicon, 0, new AspectList().add(MAGIC, 5).add(MIND, 10)); - - registerComplex(ModItems.pestleAndMortar, 0, new AspectList().add(TOOL, 4)); - register(LibOreDict.LIVINGWOOD_TWIG, new AspectList().add(PLANT, 8).add(LIFE, 4)); - register(LibOreDict.DREAMWOOD_TWIG, new AspectList().add(PLANT, 8).add(ELDRITCH, 4)); - registerComplex(ModItems.twigWand, 0, new AspectList().add(TOOL, 8)); - - //Lenses - registerComplex(ModItems.lensSpeed, 1, new AspectList().add(MOTION, 10)); - registerComplex(ModItems.lensPower, 2, new AspectList().add(ENERGY, 10)); - registerComplex(ModItems.lensTime, 3, new AspectList().add(PROTECT, 10)); - registerComplex(ModItems.lensEfficiency, 4, new AspectList().add(TRAP, 10)); - registerComplex(ModItems.lensBounce, 5, new AspectList().add(MOTION, 10)); - registerComplex(ModItems.lensGravity, 6, new AspectList().add(EARTH, 10)); - registerComplex(ModItems.lensMine, 7, new AspectList().add(TOOL, 10)); - registerComplex(ModItems.lensDamage, 8, new AspectList().add(AVERSION, 10)); - registerComplex(ModItems.lensPhantom, 9, new AspectList().add(ELDRITCH, 10)); - registerComplex(ModItems.lensMagnet, 10, new AspectList().add(DESIRE, 10)); - registerComplex(ModItems.lensExplosive, 11, new AspectList().add(ENTROPY, 10)); - registerComplex(ModItems.lensInfluence, 12, new AspectList().add(DESIRE, 10)); - registerComplex(ModItems.lensWeight, 13, new AspectList().add(METAL, 10)); - registerComplex(ModItems.lensPaint, 14, new AspectList().add(SENSES, 10)); - registerComplex(ModItems.lensFire, 15, new AspectList().add(FIRE, 10)); - registerComplex(ModItems.lensPiston, 16, new AspectList().add(MECHANISM, 10)); - registerComplex(ModItems.lensWarp, 18, new AspectList().add(ELDRITCH, 10)); - registerComplex(ModItems.lensRedirect, 19, new AspectList().add(SOUL, 10)); - registerComplex(ModItems.lensFirework, 20, new AspectList().add(MAN, 10)); - registerComplex(ModItems.lensFlare, 21, new AspectList().add(LIGHT, 5).add(SENSES, 5)); - registerComplex(ModItems.lensMessenger, 22, new AspectList().add(MOTION, 10)); - registerComplex(ModItems.lensTripwire, 23, new AspectList().add(MAN, 10)); - - //Rods - registerComplex(ModItems.terraformRod, 0, new AspectList().add(EXCHANGE, 15)); - registerComplex(ModItems.rainbowRod, 0, new AspectList().add(SENSES, 10).add(LIGHT, 10)); - registerComplex(ModItems.tornadoRod, 0, new AspectList().add(FLIGHT, 20)); - registerComplex(ModItems.diviningRod, 0, new AspectList().add(SENSES, 20)); - registerComplex(ModItems.gravityRod, 0, new AspectList().add(MOTION, 20)); - registerComplex(ModItems.missileRod, 0, new AspectList().add(AVERSION, 30)); - registerComplex(ModItems.cobbleRod, 0, new AspectList().add(EARTH, 20)); - registerComplex(ModItems.exchangeRod, 0, new AspectList().add(EXCHANGE, 30)); - - register(LibOreDict.RED_STRING, new AspectList() - .add(ENERGY, 30).add(EXCHANGE, 20).add(ELDRITCH, 15).add(MECHANISM, 15).add(MAGIC, 10)); - registerComplex(ModItems.manaTablet, ANY, new AspectList().add(VOID, 5).add(MAGIC, 5)); - registerComplex(ModItems.fertilizer, 0, new AspectList().add(LIFE, 4)); - registerComplex(ModItems.grassHorn, 0, new AspectList().add(SENSES, 10).add(TOOL, 8)); - register(ModItems.manaMirror, ANY, new AspectList() - .add(EARTH, 10).add(PLANT, 10).add(ELDRITCH, 10).add(EXCHANGE, 5).add(MAGIC, 10).add(METAL, 10)); - registerComplex(ModItems.travelBelt, 0, new AspectList().add(MOTION, 10)); - registerComplex(ModItems.magnetRing, 0, new AspectList().add(DESIRE, 10)); - registerComplex(ModItems.flightTiara, ANY, new AspectList().add(FLIGHT, 38)); - - register(ModItems.darkQuartz, 0, new AspectList(new ItemStack(Items.QUARTZ)).add(ENERGY, 1).add(DARKNESS, 1)); - register(ModItems.blazeQuartz, 2, new AspectList(new ItemStack(Items.QUARTZ)).add(FIRE, 1).add(ALCHEMY, 1)); - register(ModItems.lavenderQuartz, 3, new AspectList(new ItemStack(Items.QUARTZ)).add(SENSES, 1).add(PLANT, 1)); - register(ModItems.redQuartz, 4, new AspectList(new ItemStack(Items.QUARTZ)).add(ENERGY, 2)); - register(ModItems.sunnyQuartz, 6, new AspectList(new ItemStack(Items.QUARTZ)).add(SENSES, 1).add(PLANT, 1)); - - registerComplex(ModItems.openBucket, 0, new AspectList().add(VOID, 15)); - registerComplex(ModItems.pixieRing, 0, new AspectList().add(AURA, 5).add(FLIGHT, 5)); - registerComplex(ModItems.superTravelBelt, 0, new AspectList().add(MOTION, 10)); - registerComplex(ModItems.laputaShard, ANY, new AspectList().add(FLIGHT, 20)); - registerComplex(ModItems.itemFinder, 0, new AspectList().add(SENSES, 20)); - register(ModItems.enderHand, 0, new AspectList(new ItemStack(Blocks.ENDER_CHEST)).add(BEAST, 15)); - register(ModItems.spark, 0, new AspectList().add(AURA, 15).add(MOTION, 15).add(FIRE, 10).add(SENSES, 10)); - register(ModItems.vial, 0, new AspectList(new ItemStack(ModBlocks.manaGlass)).add(VOID, 2)); - register(ModItems.vial, 1, new AspectList(new ItemStack(ModBlocks.elfGlass)).add(VOID, 3)); - registerComplex(ModItems.holyCloak, 0, new AspectList().add(PROTECT, 15)); - registerComplex(ModItems.unholyCloak, 0, new AspectList().add(AVERSION, 15)); - registerComplex(ModItems.balanceCloak, 0, new AspectList().add(PROTECT, 10).add(AVERSION, 10)); - registerComplex(ModItems.craftingHalo, 0, new AspectList().add(CRAFT, 15)); - register(ModItems.blackLotus, 0, new AspectList().add(MAGIC, 10).add(ORDER, 10).add(ELDRITCH, 5)); - register(ModItems.blackLotus, 1, new AspectList().add(MAGIC, 30).add(ORDER, 20).add(ELDRITCH, 10)); - registerComplex(ModItems.monocle, 0, new AspectList().add(SENSES, 10)); - register(ModItems.clip, 0, new AspectList(new ItemStack(ModBlocks.dreamwood)).add(VOID, 5).add(MECHANISM, 2)); - registerComplex(ModItems.worldSeed, 0, new AspectList().add(MOTION, 10).add(PLANT, 5).add(ELDRITCH, 3)); - registerComplex(ModItems.thornChakram, 0, new AspectList().add(AVERSION, 12).add(DEATH, 6)); - registerComplex(ModItems.thornChakram, 1, new AspectList().merge(AVERSION, 7)); //Flare Chakram - register(ModItems.overgrowthSeed, 0, new AspectList().add(LIFE, 30).add(MAGIC, 25)); - register(ModItems.craftPattern1_1, ANY, new AspectList().add(CRAFT, 10).add(ENERGY, 10)); - register(ModItems.craftPattern1_2, ANY, new AspectList().add(CRAFT, 10).add(ENERGY, 10)); - register(ModItems.craftPattern1_3, ANY, new AspectList().add(CRAFT, 10).add(ENERGY, 10)); - register(ModItems.craftPattern2_1, ANY, new AspectList().add(CRAFT, 10).add(ENERGY, 10)); - register(ModItems.craftPattern2_2, ANY, new AspectList().add(CRAFT, 10).add(ENERGY, 10)); - register(ModItems.craftPattern2_3, ANY, new AspectList().add(CRAFT, 10).add(ENERGY, 10)); - register(ModItems.craftPattern3_1, ANY, new AspectList().add(CRAFT, 10).add(ENERGY, 10)); - register(ModItems.craftPattern3_2, ANY, new AspectList().add(CRAFT, 10).add(ENERGY, 10)); - register(ModItems.craftPatternDonut, ANY, new AspectList().add(CRAFT, 10).add(ENERGY, 10)); - - registerComplex(ModItems.swapRing, 0, new AspectList().add(TOOL, 8).add(EXCHANGE, 8)); - registerComplex(ModItems.flowerBag, 0, new AspectList().add(VOID, 5)); - registerComplex(ModItems.phantomInk, 0, new AspectList().add(SENSES, 9).add(VOID, 4)); - register(ModItems.corporeaSpark, 0, new AspectList().add(AURA, 15).add(MOTION, 15).add(SENSES, 10).add(EXCHANGE, 15).add(ELDRITCH, 10)); - - AspectList willAspects = new AspectList().add(MAGIC, 10).add(AVERSION, 10).add(SOUL, 10); - register(ModItems.ancientWillAhrim, 0, willAspects.copy().add(PROTECT, 10)); //Ahrim - weakness - register(ModItems.ancientWillDharok, 1, willAspects.copy().add(BEAST, 10)); //Dharok - low HP damage boost - register(ModItems.ancientWillGuthan, 2, willAspects.copy().add(UNDEAD, 10)); //Guthan - lifesteal - register(ModItems.ancientWillTorag, 3, willAspects.copy().add(TRAP, 10)); //Torag - slowness - register(ModItems.ancientWillVerac, 4, willAspects.copy().add(DEATH, 10)); //Verac - armor pierce - register(ModItems.ancientWillKaril, 5, willAspects.copy().add(FLUX, 10)); //Karil - withering - - register(ModItems.pinkinator, 0, new AspectList().add(LIFE, 30).add(ORDER, 20).add(EXCHANGE, 20)); - - AspectList relicAspects = new AspectList().add(MAGIC, 30).add(DESIRE, 25).add(ELDRITCH, 15); - register(ModItems.dice, 0, relicAspects.copy().add(ELDRITCH, 15)); - register(ModItems.infiniteFruit, 0, relicAspects.copy().add(LIFE, 50).add(PLANT, 30)); - register(ModItems.kingKey, 0, relicAspects.copy().add(AVERSION, 50).add(TRAP, 30)); - register(ModItems.flugelEye, 0, relicAspects.copy().add(MOTION, 50).add(FLIGHT, 30)); - register(ModItems.thorRing, 0, relicAspects.copy().add(TOOL, 50).add(ENTROPY, 30)); - register(ModItems.odinRing, 0, relicAspects.copy().add(PROTECT, 50).add(LIFE, 30)); - register(ModItems.lokiRing, 0, relicAspects.copy().add(AURA, 50).add(MAN, 30)); - - register(ModItems.recordGaia1, 0, new AspectList().add(SENSES, 15).add(DESIRE, 10).add(AIR, 5).add(VOID, 5)); //Endure Emptiness - register(ModItems.recordGaia2, 0, new AspectList().add(SENSES, 15).add(DESIRE, 10).add(AIR, 5).add(AVERSION, 5)); //Fight For Quiescence - - registerComplex(ModItems.blackHoleTalisman, 0, new AspectList().add(VOID, 30)); - registerComplex(ModItems.temperanceStone, ANY, new AspectList().add(TRAP, 5)); - registerComplex(ModItems.obedienceStick, 0, new AspectList().add(TOOL, 4)); - registerComplex(ModItems.slimeBottle, 0, new AspectList(new ItemStack(Items.SLIME_BALL)).add(SENSES, 10)); - registerComplex(ModItems.magnetRingGreater, 0, new AspectList().add(DESIRE, 15)); - registerComplex(ModItems.thunderSword, 0, new AspectList().add(ENERGY, 15)); - registerComplex(ModItems.autocraftingHalo, 0, new AspectList().add(CRAFT, 15).add(EXCHANGE, 10)); - register(ModItems.gaiaHead, 0, new AspectList().add(DEATH, 10).add(SOUL, 15).add(ELDRITCH, 10).add(EARTH, 10)); - registerComplex(ModItems.sextant, 0, new AspectList().add(TOOL, 8)); - registerComplex(ModItems.speedUpBelt, 0, new AspectList().add(MOTION, 10)); - registerComplex(ModItems.baubleBox, 0, new AspectList().add(VOID, 5)); - registerComplex(ModItems.dodgeRing, 0, new AspectList().add(MOTION, 10)); - registerComplex(ModItems.invisibilityCloak, 0, new AspectList().add(SENSES, 15)); - - //Blocks - registerComplex(ModBlocks.defaultAltar, 0, new AspectList().add(CRAFT, 10)); - registerComplex(ModBlocks.runeAltar, 0, new AspectList().add(CRAFT, 10).add(MAGIC, 5)); - - registerComplex(ModBlocks.manaSpreader, 0, new AspectList().add(MOTION, 10).add(MAGIC, 10)); - registerComplex(ModBlocks.redstoneSpreader, 1, new AspectList(new ItemStack(ModBlocks.manaSpreader)).add(ENERGY, 10).add(MECHANISM, 5)); - registerComplex(ModBlocks.elvenSpreader, 2, new AspectList().add(MOTION, 15).add(MAGIC, 15)); - registerComplex(ModBlocks.gaiaSpreader, 3, new AspectList().add(MOTION, 8).add(MAGIC, 8).add(SENSES, 10)); - - registerComplex(ModBlocks.manaPool, 0, new AspectList().add(VOID, 10).add(MAGIC, 5)); - registerComplex(ModBlocks.dilutedPool, 2, new AspectList().add(VOID, 3).add(MAGIC, 3)); - //Next entry is made with shimmerrock, and proper autoassignment depends on this - register(ModBlocks.bifrostPerm, 0, new AspectList(new ItemStack(ModBlocks.elfGlass)).add(SENSES, 5)); - registerComplex(ModBlocks.fabulousPool, 3, new AspectList().add(VOID, 10).add(MAGIC, 5)); - - registerComplex(ModBlocks.distributor, 0, new AspectList().add(MECHANISM, 5).add(MAGIC, 5)); - registerComplex(ModBlocks.manaVoid, 0, new AspectList().add(VOID, 20)); - registerComplex(ModBlocks.manaDetector, 0, new AspectList().add(SENSES, 10)); - register(ModBlocks.enchanter, 0, new AspectList(new ItemStack(Blocks.LAPIS_BLOCK)).add(MAGIC, 25).add(CRAFT, 15)); - registerComplex(ModBlocks.tinyPlanet, 0, new AspectList().add(EARTH, 50)); - registerComplex(ModBlocks.openCrate, 0, new AspectList().add(VOID, 5)); - registerComplex(ModBlocks.craftCrate, 1, new AspectList().add(MECHANISM, 5)); - registerComplex(ModBlocks.forestEye, 0, new AspectList().add(SENSES, 10).add(BEAST, 10)); - registerComplex(ModBlocks.gatheringDrum, 1, new AspectList().add(SENSES, 5).add(TOOL, 5)); - register(ModBlocks.bifrost, 0, new AspectList(new ItemStack(ModBlocks.bifrostPerm))); - registerComplex(ModBlocks.floatingFlower, ANY, new AspectList().add(FLIGHT, 5)); - registerComplex(ModBlocks.spawnerClaw, 0, new AspectList().add(LIFE, 30)); - registerComplex(ModBlocks.alfPortal, 0, new AspectList().merge(EXCHANGE, 20).add(ELDRITCH, 20)); - - AspectList azulejo = new AspectList(new ItemStack(Blocks.QUARTZ_BLOCK)).add(SENSES, 3).add(DESIRE, 1).add(EARTH, 1); - register(ModBlocks.azulejo0, 0, azulejo); - register(ModBlocks.azulejo1, 0, azulejo); - register(ModBlocks.azulejo2, 0, azulejo); - register(ModBlocks.azulejo3, 0, azulejo); - register(ModBlocks.azulejo4, 0, azulejo); - register(ModBlocks.azulejo5, 0, azulejo); - register(ModBlocks.azulejo6, 0, azulejo); - register(ModBlocks.azulejo7, 0, azulejo); - register(ModBlocks.azulejo8, 0, azulejo); - register(ModBlocks.azulejo9, 0, azulejo); - register(ModBlocks.azulejo10, 0, azulejo); - register(ModBlocks.azulejo11, 0, azulejo); - register(ModBlocks.azulejo12, 0, azulejo); - register(ModBlocks.azulejo13, 0, azulejo); - register(ModBlocks.azulejo14, 0, azulejo); - register(ModBlocks.azulejo15, 0, azulejo); - registerComplex(ModBlocks.enderEye, 0, new AspectList().add(MECHANISM, 10)); - registerComplex(ModBlocks.starfield, 0, new AspectList().add(DARKNESS, 20).add(LIGHT, 20)); - registerComplex(ModBlocks.rfGenerator, 0, new AspectList().add(MECHANISM, 20)); - registerComplex(ModBlocks.terraPlate, 0, new AspectList().add(CRAFT, 20).add(EXCHANGE, 20)); - register(ModBlocks.enchantedSoil, 0, new AspectList().add(LIFE, 20).add(MAGIC, 15).add(EARTH, 10)); - - AspectList corporeaAspects = new AspectList(new ItemStack(ModItems.corporeaSpark)).add(MECHANISM, 15).merge(ELDRITCH, 15).remove(AURA); - register(ModBlocks.corporeaIndex, 0, corporeaAspects.copy().add(DESIRE, 25).add(MIND, 25)); - register(ModBlocks.corporeaCrystalCube, 0, corporeaAspects.copy().add(SENSES, 15).add(CRYSTAL, 15)); - register(ModBlocks.corporeaFunnel, 0, corporeaAspects.copy().add(DESIRE, 20)); - register(ModBlocks.corporeaInterceptor, 0, corporeaAspects.copy().add(ENERGY, 20)); - register(ModBlocks.corporeaRetainer, 0, corporeaAspects.copy().add(VOID, 20)); - - registerComplex(ModBlocks.pump, 0, new AspectList().add(MECHANISM, 10).add(EXCHANGE, 10)); - registerComplex(ModBlocks.incensePlate, 0, new AspectList().add(ALCHEMY, 15)); - registerComplex(ModBlocks.hourglass, 0, new AspectList().add(MECHANISM, 10)); - registerComplex(ModBlocks.ghostRail, 0, new AspectList().add(SOUL, 10)); - registerComplex(ModBlocks.sparkChanger, 0, new AspectList().add(MECHANISM, 10)); - register(ModBlocks.felPumpkin, 0, new AspectList().add(ENTROPY, 15).add(SOUL, 10).add(LIFE, 5).add(BEAST, 5).add(PLANT, 5)); - registerComplex(ModBlocks.cocoon, 0, new AspectList().add(LIFE, 10)); - registerComplex(ModBlocks.lightRelay, 0, new AspectList().add(MOTION, 15)); - register(ModBlocks.cacophonium, 0, new AspectList(new ItemStack(Blocks.NOTEBLOCK)).add(DESIRE, 10)); - registerComplex(ModBlocks.teruTeruBozu, 0, new AspectList().add(EXCHANGE, 10).add(SENSES, 10)); - registerComplex(ModBlocks.avatar, 0, new AspectList().add(MECHANISM, 15).add(MAN, 10)); - - register(ModBlocks.dryGrass, ANY, new AspectList(new ItemStack(Blocks.GRASS)).add(SENSES, 3)); - register(ModBlocks.goldenGrass, ANY, new AspectList(new ItemStack(Blocks.GRASS)).add(SENSES, 3)); - register(ModBlocks.vividGrass, ANY, new AspectList(new ItemStack(Blocks.GRASS)).add(SENSES, 3)); - register(ModBlocks.scorchedGrass, ANY, new AspectList(new ItemStack(Blocks.GRASS)).add(SENSES, 3)); - register(ModBlocks.infusedGrass, ANY, new AspectList(new ItemStack(Blocks.GRASS)).add(SENSES, 3)); - register(ModBlocks.mutatedGrass, ANY, new AspectList(new ItemStack(Blocks.GRASS)).add(SENSES, 3)); - registerComplex(ModBlocks.animatedTorch, 0, new AspectList().add(MOTION, 5)); - - //Livingrock Brick variants - register(ModBlocks.livingrock, 2, new AspectList(new ItemStack(ModBlocks.livingrock, 1, 1)).add(PLANT, 3)); //Mossy - register(ModBlocks.livingrock, 3, new AspectList(new ItemStack(ModBlocks.livingrock, 1, 1)).add(ENTROPY, 1)); //Cracked - register(ModBlocks.livingrock, 4, new AspectList(new ItemStack(ModBlocks.livingrock, 1, 1)).add(ORDER, 1)); //Chiseled - - //Metamorphic stone from the Marimorphosis - AspectList stoneAspects = new AspectList().add(EARTH, 5); - register(ModFluffBlocks.biomeStoneA, 0, stoneAspects.copy().add(PLANT, 1)); //Forest - register(ModFluffBlocks.biomeStoneA, 1, stoneAspects.copy().add(AIR, 1)); //Plains - register(ModFluffBlocks.biomeStoneA, 2, stoneAspects.copy().add(EARTH, 1)); //Mountain - register(ModFluffBlocks.biomeStoneA, 3, stoneAspects.copy().add(FLUX, 1)); //Fungal - register(ModFluffBlocks.biomeStoneA, 4, stoneAspects.copy().add(WATER, 1)); //Swamp - register(ModFluffBlocks.biomeStoneA, 5, stoneAspects.copy().add(ENTROPY, 1)); //Desert - register(ModFluffBlocks.biomeStoneA, 6, stoneAspects.copy().add(COLD, 1)); //Taiga - register(ModFluffBlocks.biomeStoneA, 7, stoneAspects.copy().add(FIRE, 1)); //Mesa - - //Metamorphic cobble and chiseled bricks - for(int i = 0; i < 8; i++) { - register(ModFluffBlocks.biomeStoneA, i + 8, - new AspectList(new ItemStack(ModFluffBlocks.biomeStoneA, 1, i)).add(ENTROPY, 1)); - register(ModFluffBlocks.biomeStoneB, i + 8, - new AspectList(new ItemStack(ModFluffBlocks.biomeStoneB, 1, i)).add(ORDER, 1)); - } - - //Garden of Glass - if(Botania.gardenOfGlassLoaded) { - register(ModItems.waterBowl, 0, new AspectList(new ItemStack(Items.BOWL)).add(WATER, 10)); - register(LibOreDict.PEBBLE, new AspectList().add(EARTH, 1)); - register(ModBlocks.root, 0, new AspectList().add(PLANT, 15).add(LIFE, 5)); - register(ModItems.livingroot, 20, new AspectList().add(PLANT, 5).add(LIFE, 2)); - } - } - - private final List brewContainers = Arrays.asList(new ItemStack(ModItems.vial), - new ItemStack(ModItems.vial, 1, 1), new ItemStack(ModItems.incenseStick), new ItemStack(ModItems.bloodPendant)); - - private void registerBrewAspects() { - for(RecipeBrew brewRecipe : BotaniaAPI.instance().brewRecipes) { - AspectList aspects = new AspectList(); - - for(Object input : brewRecipe.getInputs()) { - ItemStack toAdd = ItemStack.EMPTY; - if(input instanceof ItemStack) { - toAdd = (ItemStack) input; - } else if(input instanceof String) { - toAdd = OreDictionary.getOres((String) input).get(0); - } - AspectList ingredientAspects = AspectHelper.getObjectAspects(toAdd); - for (Aspect a : ingredientAspects.getAspects()) - aspects.add(a, ingredientAspects.getAmount(a)); - } - for(Aspect aspect : aspects.getAspects()) { - aspects.reduce(aspect, aspects.getAmount(aspect) / 2); - } - aspects.add(ALCHEMY, 8); - - for(ItemStack brewContainer : brewContainers) { - ItemStack brewed = brewRecipe.getOutput(brewContainer); - if(!brewed.isEmpty()) { - proxy.registerObjectTag(brewed, new AspectList().add(aspects)); - } - } - } - } - - private void registerEntityAspects() { - registerEntity(LibEntityNames.MANA_BURST, new AspectList().add(ENERGY, 5).add(MOTION, 5).add(AURA, 5)); - registerEntity(LibEntityNames.PIXIE, new AspectList().add(FLIGHT, 5).add(ELDRITCH, 5).add(LIGHT, 5)); - registerEntity(LibEntityNames.FLAME_RING, new AspectList().add(FIRE, 20)); - registerEntity(LibEntityNames.DOPPLEGANGER, new AspectList().add(MAN, 30).add(EARTH, 30).add(DARKNESS, 30).add(ELDRITCH, 30).add(PROTECT, 30)); - registerEntity(LibEntityNames.MAGIC_LANDMINE, new AspectList().add(AVERSION, 10).add(DEATH, 10)); - registerEntity(LibEntityNames.MAGIC_MISSILE, new AspectList().add(AVERSION, 5).add(MAGIC, 5)); - registerEntity(LibEntityNames.PINK_WITHER, new AspectList().add(LIFE, 50).add(UNDEAD, 30).add(ORDER, 25).add(FIRE, 25)); - registerEntity(LibEntityNames.PLAYER_MOVER, new AspectList().add(MOTION, 15).add(LIGHT, 5)); - registerEntity(LibEntityNames.MANA_STORM, new AspectList().add(ENTROPY, 150).add(FIRE, 100).add(MAGIC, 50).add(ALCHEMY, 50)); - registerEntity(LibEntityNames.BABYLON_WEAPON, new AspectList().add(AVERSION, 30).add(ELDRITCH, 20)); - registerEntity(LibEntityNames.FALLING_STAR, new AspectList().add(AVERSION, 10).add(ELDRITCH, 10).add(LIGHT, 5)); - } - - private void registerFlower(ResourceLocation flowerId, AspectList extraAspects) { - AspectList aspects = extraAspects.copy().add(PLANT, 15).add(SENSES, 15).add(MAGIC, 5); - AspectList floatingAspects = aspects.copy().add(FLIGHT, 5).add(LIGHT, 5); - - proxy.registerObjectTag(ItemBlockSpecialFlower.ofType(flowerId), aspects); - proxy.registerObjectTag(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), flowerId), floatingAspects); - - if (BotaniaAPI.instance().miniFlowers.containsKey(flowerId)) { - ResourceLocation miniFlowerId = BotaniaAPI.instance().miniFlowers.get(flowerId); - proxy.registerObjectTag(ItemBlockSpecialFlower.ofType(miniFlowerId), petiteAspects(aspects)); - proxy.registerObjectTag(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), miniFlowerId), petiteAspects(floatingAspects)); - } - } - - private static AspectList petiteAspects(AspectList aspects) { - AspectList list = new AspectList(); - for (Aspect a : aspects.getAspects()) - list.add(a, aspects.getAmount(a) / 2 + 1); - return list; - } - - //Convenience aspect registration methods - private void register(Item item, int meta, AspectList aspects) { - proxy.registerObjectTag(new ItemStack(item, 1, meta), aspects); - } - - private void register(Block block, int meta, AspectList aspects) { - proxy.registerObjectTag(new ItemStack(block, 1, meta), aspects); - } - - private void register(String oreDict, AspectList aspects) { - proxy.registerObjectTag(oreDict, aspects); - } - - private void registerComplex(Item item, int meta, AspectList aspects) { - proxy.registerComplexObjectTag(new ItemStack(item, 1, meta), aspects); - } - - private void registerComplex(Block block, int meta, AspectList aspects) { - proxy.registerComplexObjectTag(new ItemStack(block, 1, meta), aspects); - } - - private void registerEntity(String entityName, AspectList aspects) { - ThaumcraftApi.registerEntityTag(entityName, aspects); //Not in the event (as of TC beta 21) - } -} -*/ diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 442c55a73..f63d9586a 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -62,10 +62,6 @@ import vazkii.botania.common.item.equipment.tool.manasteel.*; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraAxe; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraSword; -import vazkii.botania.common.item.interaction.thaumcraft.ItemElementiumHelmRevealing; -import vazkii.botania.common.item.interaction.thaumcraft.ItemManaInkwell; -import vazkii.botania.common.item.interaction.thaumcraft.ItemManasteelHelmRevealing; -import vazkii.botania.common.item.interaction.thaumcraft.ItemTerrasteelHelmRevealing; import vazkii.botania.common.item.lens.*; import vazkii.botania.common.item.material.*; import vazkii.botania.common.item.record.ItemModRecord; @@ -190,7 +186,6 @@ public final class ModItems { public static final Item snowHorn = new ItemHorn(unstackable()); public static final Item manaMirror = new ItemManaMirror(unstackable()); public static final Item manasteelHelm = new ItemManasteelHelm(unstackable()); - public static final Item manasteelHelmRevealing = new ItemManasteelHelmRevealing(unstackable()); public static final Item manasteelChest = new ItemManasteelArmor(EquipmentSlotType.CHEST, unstackable()); public static final Item manasteelLegs = new ItemManasteelArmor(EquipmentSlotType.LEGS, unstackable()); public static final Item manasteelBoots = new ItemManasteelArmor(EquipmentSlotType.FEET, unstackable()); @@ -200,7 +195,6 @@ public final class ModItems { public static final Item manasteelSword = new ItemManasteelSword(unstackable()); public static final Item manasteelShears = new ItemManasteelShears(unstackable()); public static final Item terrasteelHelm = new ItemTerrasteelHelm(unstackable().func_234689_a_()); - public static final Item terrasteelHelmRevealing = new ItemTerrasteelHelmRevealing(unstackable().func_234689_a_()); public static final Item terrasteelChest = new ItemTerrasteelArmor(EquipmentSlotType.CHEST, unstackable().func_234689_a_()); public static final Item terrasteelLegs = new ItemTerrasteelArmor(EquipmentSlotType.LEGS, unstackable().func_234689_a_()); public static final Item terrasteelBoots = new ItemTerrasteelArmor(EquipmentSlotType.FEET, unstackable().func_234689_a_()); @@ -231,7 +225,6 @@ public final class ModItems { public static final Item sunnyQuartz = new Item(defaultBuilder()); public static final Item waterRod = new ItemWaterRod(unstackable()); public static final Item elementiumHelm = new ItemElementiumHelm(unstackable()); - public static final Item elementiumHelmRevealing = new ItemElementiumHelmRevealing(unstackable()); public static final Item elementiumChest = new ItemElementiumChest(unstackable()); public static final Item elementiumLegs = new ItemElementiumLegs(unstackable()); public static final Item elementiumBoots = new ItemElementiumBoots(unstackable()); @@ -266,7 +259,6 @@ public final class ModItems { public static final Item sparkUpgradeIsolated = new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.ISOLATED); public static final Item diviningRod = new ItemDiviningRod(unstackable()); public static final Item gravityRod = new ItemGravityRod(unstackable()); - public static final Item manaInkwell = new ItemManaInkwell(unstackable().setNoRepair()); public static final Item vial = new ItemVial(defaultBuilder()); public static final Item flask = new ItemVial(defaultBuilder()); public static final Item brewVial = new ItemBrewBase(unstackable(), 4, 32, () -> vial); @@ -500,7 +492,6 @@ public final class ModItems { register(r, LibItemNames.SNOW_HORN, snowHorn); register(r, LibItemNames.MANA_MIRROR, manaMirror); register(r, LibItemNames.MANASTEEL_HELM, manasteelHelm); - register(r, LibItemNames.MANASTEEL_HELM_R, manasteelHelmRevealing); register(r, LibItemNames.MANASTEEL_CHEST, manasteelChest); register(r, LibItemNames.MANASTEEL_LEGS, manasteelLegs); register(r, LibItemNames.MANASTEEL_BOOTS, manasteelBoots); @@ -510,7 +501,6 @@ public final class ModItems { register(r, LibItemNames.MANASTEEL_SWORD, manasteelSword); register(r, LibItemNames.MANASTEEL_SHEARS, manasteelShears); register(r, LibItemNames.TERRASTEEL_HELM, terrasteelHelm); - register(r, LibItemNames.TERRASTEEL_HELM_R, terrasteelHelmRevealing); register(r, LibItemNames.TERRASTEEL_CHEST, terrasteelChest); register(r, LibItemNames.TERRASTEEL_LEGS, terrasteelLegs); register(r, LibItemNames.TERRASTEEL_BOOTS, terrasteelBoots); @@ -541,7 +531,6 @@ public final class ModItems { register(r, LibItemNames.QUARTZ_SUNNY, sunnyQuartz); register(r, LibItemNames.WATER_ROD, waterRod); register(r, LibItemNames.ELEMENTIUM_HELM, elementiumHelm); - register(r, LibItemNames.ELEMENTIUM_HELM_R, elementiumHelmRevealing); register(r, LibItemNames.ELEMENTIUM_CHEST, elementiumChest); register(r, LibItemNames.ELEMENTIUM_LEGS, elementiumLegs); register(r, LibItemNames.ELEMENTIUM_BOOTS, elementiumBoots); @@ -576,7 +565,6 @@ public final class ModItems { register(r, LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.ISOLATED.name().toLowerCase(Locale.ROOT), sparkUpgradeIsolated); register(r, LibItemNames.DIVINING_ROD, diviningRod); register(r, LibItemNames.GRAVITY_ROD, gravityRod); - register(r, LibItemNames.MANA_INKWELL, manaInkwell); register(r, LibItemNames.VIAL, vial); register(r, LibItemNames.FLASK, flask); register(r, LibItemNames.BREW_VIAL, brewVial); @@ -702,7 +690,6 @@ public final class ModItems { register(r, "composite_lens", CompositeLensRecipe.SERIALIZER); register(r, "cosmetic_attach", CosmeticAttachRecipe.SERIALIZER); register(r, "cosmetic_remove", CosmeticRemoveRecipe.SERIALIZER); - register(r, "helm_revealing", HelmRevealingRecipe.SERIALIZER); register(r, "keep_ivy", KeepIvyRecipe.SERIALIZER); register(r, "lens_dye", LensDyeingRecipe.SERIALIZER); register(r, "mana_gun_add_clip", ManaGunClipRecipe.SERIALIZER); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 34bbae73f..5d3270961 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -71,7 +71,7 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor { switch (slot) { case HEAD: - return stack.getItem() == ModItems.elementiumHelm || stack.getItem() == ModItems.elementiumHelmRevealing; + return stack.getItem() == ModItems.elementiumHelm; case CHEST: return stack.getItem() == ModItems.elementiumChest; case LEGS: diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 9e086ae63..5e68128ae 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -162,7 +162,7 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh switch (slot) { case HEAD: - return stack.getItem() == ModItems.manasteelHelm || stack.getItem() == ModItems.manasteelHelmRevealing; + return stack.getItem() == ModItems.manasteelHelm; case CHEST: return stack.getItem() == ModItems.manasteelChest; case LEGS: diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 234abf2b9..d575f4494 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -95,7 +95,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { switch (slot) { case HEAD: - return stack.getItem() == ModItems.terrasteelHelm || stack.getItem() == ModItems.terrasteelHelmRevealing; + return stack.getItem() == ModItems.terrasteelHelm; case CHEST: return stack.getItem() == ModItems.terrasteelChest; case LEGS: diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java deleted file mode 100644 index 3878e25e9..000000000 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This class is 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 - */ -package vazkii.botania.common.item.interaction.thaumcraft; - -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; - -public class ItemElementiumHelmRevealing extends ItemElementiumHelm { - - public ItemElementiumHelmRevealing(Properties props) { - super(props); - } - - @Override - public String getArmorTextureAfterInk(ItemStack stack, EquipmentSlotType slot) { - return ConfigHandler.CLIENT.enableArmorModels.get() ? LibResources.MODEL_ELEMENTIUM_NEW : LibResources.MODEL_ELEMENTIUM_2; - } - -} diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java deleted file mode 100644 index cc6ff42f0..000000000 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * This class is 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 - */ -package vazkii.botania.common.item.interaction.thaumcraft; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import vazkii.botania.api.mana.IManaItem; -import vazkii.botania.common.core.helper.ItemNBTHelper; - -import javax.annotation.Nonnull; - -public class ItemManaInkwell extends Item implements IManaItem { - - private static final int COST_PER_USE = 50; - private static final int USES = 150; - protected static final int MAX_MANA = COST_PER_USE * USES; - - private static final String TAG_MANA = "mana"; - - public ItemManaInkwell(Properties props) { - super(props.defaultMaxDamage(USES)); - } - - @Override - public void fillItemGroup(@Nonnull ItemGroup tab, @Nonnull NonNullList list) { - if (isInGroup(tab)) { - list.add(new ItemStack(this)); - ItemStack full = new ItemStack(this); - setMana(full, MAX_MANA); - list.add(full); - } - } - - @Override - public int getDamage(ItemStack stack) { - float mana = getMana(stack); - return USES - (int) (mana / getMaxMana(stack) * USES); - } - - @Override - public void setDamage(ItemStack stack, int damage) { - int currentDamage = stack.getDamage(); - if (damage > currentDamage) { - int cost = (damage - currentDamage) * COST_PER_USE; - int mana = getMana(stack); - if (mana >= cost) { - addMana(stack, -cost); - return; - } - } - super.setDamage(stack, damage); - } - - @Override - public int getEntityLifespan(ItemStack itemStack, World world) { - return Integer.MAX_VALUE; - } - - public static void setMana(ItemStack stack, int mana) { - ItemNBTHelper.setInt(stack, TAG_MANA, mana); - } - - @Override - public int getMana(ItemStack stack) { - return ItemNBTHelper.getInt(stack, TAG_MANA, 0); - } - - @Override - public int getMaxMana(ItemStack stack) { - return MAX_MANA; - } - - @Override - public void addMana(ItemStack stack, int mana) { - setMana(stack, Math.min(getMana(stack) + mana, getMaxMana(stack))); - stack.setDamage(getDamage(stack)); - } - - @Override - public boolean canReceiveManaFromPool(ItemStack stack, TileEntity pool) { - return true; - } - - @Override - public boolean canReceiveManaFromItem(ItemStack stack, ItemStack otherStack) { - return false; - } - - @Override - public boolean canExportManaToPool(ItemStack stack, TileEntity pool) { - return false; - } - - @Override - public boolean canExportManaToItem(ItemStack stack, ItemStack otherStack) { - return false; - } - - @Override - public boolean isNoExport(ItemStack stack) { - return true; - } - -} diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java deleted file mode 100644 index 16c832f30..000000000 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This class is 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 - */ -package vazkii.botania.common.item.interaction.thaumcraft; - -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; - -public class ItemManasteelHelmRevealing extends ItemManasteelHelm { - - public ItemManasteelHelmRevealing(Properties props) { - super(props); - } - - @Override - public String getArmorTextureAfterInk(ItemStack stack, EquipmentSlotType slot) { - return ConfigHandler.CLIENT.enableArmorModels.get() ? LibResources.MODEL_MANASTEEL_NEW : LibResources.MODEL_MANASTEEL_2; - } - -} diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java deleted file mode 100644 index fd386d730..000000000 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This class is 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 - */ -package vazkii.botania.common.item.interaction.thaumcraft; - -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; - -public class ItemTerrasteelHelmRevealing extends ItemTerrasteelHelm { - - public ItemTerrasteelHelmRevealing(Properties props) { - super(props); - } - - @Override - public String getArmorTextureAfterInk(ItemStack stack, EquipmentSlotType slot) { - return ConfigHandler.CLIENT.enableArmorModels.get() ? LibResources.MODEL_TERRASTEEL_NEW : LibResources.MODEL_TERRASTEEL_2; - } - -} diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 239ea7348..7b16f6ccb 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -119,9 +119,6 @@ public final class LibItemNames { public static final String NULL_VIRUS = "virus_nullodermal"; 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 = "super_lava_pendant"; public static final String ENDER_HAND = "ender_hand"; @@ -130,7 +127,6 @@ public final class LibItemNames { public static final String SPARK_UPGRADE = "spark_upgrade"; 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"; diff --git a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java index 7f9790ed5..1846d97b7 100644 --- a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java @@ -75,13 +75,6 @@ public class ManaInfusionProvider extends RecipeProvider { consumer.accept(new FinishedRecipe(id("mana_quartz"), new ItemStack(ModItems.manaQuartz), ingr(Items.QUARTZ), 250)); consumer.accept(new FinishedRecipe(id("tiny_potato"), new ItemStack(ModBlocks.tinyPotato), ingr(Items.POTATO), 1337)); - /* todo 1.15 rip - if (Botania.thaumcraftLoaded) { - Item inkwell = ForgeRegistries.ITEMS.getValue(new ResourceLocation("thaumcraft", "scribing_tools")); - consumer.accept(new FinishedRecipe(id("mana_inkwell"), new ItemStack(ModItems.manaInkwell), ingr(inkwell), 35000)); - } - */ - consumer.accept(new FinishedRecipe(id("mana_glass"), new ItemStack(ModBlocks.manaGlass), ingr(Blocks.GLASS), 150)); consumer.accept(new FinishedRecipe(id("mana_string"), new ItemStack(ModItems.manaString), ingr(Items.STRING), 5000)); diff --git a/src/main/resources/assets/botania/lang/de_de.json b/src/main/resources/assets/botania/lang/de_de.json index f2531ef77..5fd3d2b25 100644 --- a/src/main/resources/assets/botania/lang/de_de.json +++ b/src/main/resources/assets/botania/lang/de_de.json @@ -781,9 +781,6 @@ "item.botania.virus_nullodermal": "Nullodermaler Virus", "item.botania.skydirt_rod": "Stab der hohen Länder", "item.botania.placeholder": "Herstellungsplatzhalter", - "item.botania.manasteel_helmet_revealing": "Manasteelhelm der Enthüllung", - "item.botania.terrasteel_helmet_revealing": "Terrasteelhelm der Enthüllung", - "item.botania.elementium_helmet_revealing": "Elementiumhelm der Enthüllung", "item.botania.itemfinder": "Der Zuschauer", "item.botania.super_lava_pendant": "Purpurroter Anhänger", "item.botania.ender_hand": "Enderhand", @@ -795,7 +792,6 @@ "item.botania.divining_rod": "Stab des üppigen Mantels", "item.botania.gravity_rod": "Stab der schattigen Mesa", "item.botania.regenivy": "Zeitloser Efeu", - "item.botania.mana_inkwell": "Tintenfass für Botaniker", "item.botania.vial": "Managlasampulle", "item.botania.flask": "Elfenglasflasche", "item.botania.brew_vial": "Ampulle der %s (%s)", diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index 96152f2d2..87705725e 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -275,8 +275,6 @@ "magnetRing.invert": "Inverted Magnet Ring Controls", "seasonalFeatures.enabled": "Seasonal Features", "shedding.enable": "Natural Shedding", - "thaumcraftAspects.enabled": "TC Aspects", - "thaumraftStabilizers.enabled": "TC Infusion Stabilizers", "botania.baubletype.amulet": "Equippable in the \u00a7aAmulet\u00a77 slot", "botania.baubletype.ring": "Equippable in the \u00a7aRing\u00a77 slot", @@ -1206,9 +1204,6 @@ "item.botania.virus_nullodermal": "Nullodermal Virus", "item.botania.skydirt_rod": "Rod of the Highlands", "item.botania.placeholder": "Crafting Placeholder", - "item.botania.manasteel_helmet_revealing": "Manasteel Helmet of Revealing", - "item.botania.terrasteel_helmet_revealing": "Terrasteel Helmet of Revealing", - "item.botania.elementium_helmet_revealing": "Elementium Helmet of Revealing", "item.botania.itemfinder": "The Spectator", "item.botania.super_lava_pendant": "Crimson Pendant", "item.botania.ender_hand": "Hand of Ender", @@ -1221,7 +1216,6 @@ "item.botania.divining_rod": "Rod of the Plentiful Mantle", "item.botania.gravity_rod": "Rod of the Shaded Mesa", "item.botania.regenivy": "Timeless Ivy", - "item.botania.mana_inkwell": "Botanurgist's Inkwell", "item.botania.vial": "Managlass Vial", "item.botania.flask": "Alfglass Flask", "item.botania.brew_vial": "Vial of %s (%s)", @@ -1375,7 +1369,6 @@ "botania.brew.bloodthirst": "Crimson Shade", "botania.brew.overload": "Overload", "botania.brew.allure": "Marine Allure", - "botania.brew.warp_ward": "Sane Thoughts", "botania.brew.clear": "Absolution", "effect.botania.soul_cross": "Soul Cross", @@ -1775,10 +1768,6 @@ "botania.page.flowerBag2": "Flowers won't be picked up by the pouch if the pouch is held in your dominant hand.$(p)Furthermore, sneak-right clicking the pouch on a $(item)Chest$(0) or other inventory will dump all flowers the pouch contains into said inventory.", "botania.page.flowerBag1": "It's about the same size on the inside (any colors work)", - "botania.entry.wrap": "Wrap", - "botania.tagline.wrap": "It's a wrap", - "botania.page.wrap0": "It seems like the creator of this mod has decided to add a strange game mechanic, in the form of $(item)Wrap$(0). I don't really know what it does, probably something bad. :/$(p)(What's this \"Fourth Wall\" you're talking about...?)", - "botania.entry.mIntro": "Introduction to Mana", "botania.tagline.mIntro": "Start off with Mana", "botania.page.mIntro0": "$(thing)Mana$(0) is an ethereal substance-- in essence, it's a mystical form of $(thing)energy$(0). Its existence is inconsistent to the senses, and its color depends on its surrounding environment.$(p)The manipulation of $(thing)Mana$(0) is likely the most important skill a botanist needs to master.", diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index d413a87bf..30fe640b6 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -1043,9 +1043,6 @@ "item.botania.virus_nullodermal": "virus nullodermal", "item.botania.skydirt_rod": "Vara de las tierras altas", "item.botania.placeholder": "Marcador de trabajo", - "item.botania.manasteel_helmet_revealing": "Casco de manacero de la revelación", - "item.botania.terrasteel_helmet_revealing": "Casco de terracero de la revelación", - "item.botania.elementium_helmet_revealing": "Casco de elementio de la revelación", "item.botania.itemfinder": "El Espectador", "item.botania.super_lava_pendant": "Colgante carmesí", "item.botania.ender_hand": "Mano del Fin", @@ -1058,7 +1055,6 @@ "item.botania.divining_rod": "Vara de manto abundante", "item.botania.gravity_rod": "Vara de mesa sombría", "item.botania.regenivy": "Hiedra eterna", - "item.botania.mana_inkwell": "Tintero del Botanurgista", "item.botania.vial": "Vial de manacristal", "item.botania.flask": "Matraz de alfcristal", "item.botania.brew_vial": "Vial de %s (%s)", @@ -1186,7 +1182,6 @@ "botania.brew.bloodthirst": "sombra carmesí", "botania.brew.overload": "sobrecarga", "botania.brew.allure": "atracción marina", - "botania.brew.warp_ward": "pensamientos cuerdos", "botania.brew.clear": "absolución", "effect.botania.soul_cross": "Cruz de alma", @@ -1326,9 +1321,6 @@ "botania.page.flowerBag2": "Las flores no se añadirán a la bolsa automáticamente si se está sosteniendo una de ese tipo.$(p)Además, haciendo shift-clic derecho con la bolsa en un $(item)cofre$(0) u otro inventario almacenará las flores que contenga en dicho inventario.", "botania.page.flowerBag1": "Saca un helicóptero de ella (cualquier color funciona)", - "botania.entry.wrap": "Wrap", - "botania.page.wrap0": "Parece que el creador de este mod decidió añadir una extraña mecánica en la forma de $(item)wrap$(0). No sé que hace, probablemente algo malo. :/$(p)¿Qué es esa \"cuarta pared\" de la que hablas...?", - "botania.entry.mIntro": "Introducción al maná", "botania.page.mIntro0": "El $(thing)maná$(0) es una sustancia etérea. En términos sencillos, es una forma de $(thing)enegía mística$(0). Su existencia sensorial es inconstante y su color depende del entorno donde se coloca.$(p)El dominio del $(thing)maná$(0) es uno de los talentos más importantes que un botanista tiene que controlar.", "botania.page.mIntro1": "Para generar $(thing)maná$(0), se requiere un conjunto de $(thing)flores generadoras$(0) (lee la sección correspondiente). Este $(thing)maná$(0) se puede dispersar utilizando $(item)esparcidores de maná$(0) y almacenarse en $(item)pilas de maná$(0). El $(thing)maná$(0) puede usarse para miles de cosas diferentes. Para empezar se puede usar para la $(item)flores funcionales$(0) (lee la sección correspondiente).", @@ -2491,16 +2483,6 @@ "botania.page.cacophonium0": "Este interesante instrumento, el $(item)cacófono$(0), tiene la habilidad de imitar casi todos los sonidos de los seres vivos, permitiendo al \"músico\" tocarlos a voluntad. Haz clic derecho con él en una entidad hace que aprenda el sonido. Entonces se puede tocar presionando el botón derecho.$(p)Por qué nadie querrá hacer esto, sin embargo, está más allá de todo entendimiento", "botania.page.cacophonium1": "Digno de Les Luthiers", - "botania.entry.tcIntegration": "Integración con Thaumcraft", - "botania.page.tcIntegration0": "A menudo, los caminos de la $(thing)botánica$(0) y $(thing)taumaturgia$(0) se cruzan. Mezclando algunos artefactos mencionados en este libro así como algunos de la escuela de $(5)Thaumcraft$(0) permite la creación de combinaciones.", - "botania.page.tcIntegration1": "Lo primero y principal, combinando cualquier casco de $(item)metal de maná$(0) con unas $(item)gafas de la revelación$(0) permite una combinación de ambos.$(p)La protección y regeneración de armadura funciona a la vez que las habilidades de las gafas, pero sin descuento de $(thing)vis$(0).", - "botania.page.tcIntegration2": "Cascos de la revelación (funciona con cualquier casco de Botania)", - "botania.page.tcIntegration3": "Sigamos, el $(thing)maná$(0) también puede servir como un tipo interesante de tinta. Infundiendo unas $(item)herramientas de escritura$(0) con $(thing)maná$(0) de una $(item)pila de maná$(0) les permite usar $(thing)maná$(0) como fuente de tinta.$(p)Se rellenan igual que una $(item)tableta de maná$(0), tirándolas sobre la pila. hay que reseñar que las herramientas no vienen rellenas de inicio.", - "botania.page.tcIntegration4": "Haciendo el $(item)tintero del Botanurgista", - "botania.page.tcIntegration5": "Continuando, existen una variedad de recursos y creaciones que sirven como parafernalia del $(item)altar de infusión$(0), para rebajar la inestabilidad, tales como $(item)flores centelleantes, flores flotantes y una serie de pilones$(0).$(p)Por último, se puede crear, usando recursos típicos de la taumaturgia, un $(thing)fermento$(0) que otorga un efecto de $(thing)defensa de warp$(0).", - "botania.page.tcIntegration6a": "Tal vez la locura no sea siempre la mejor herramienta. Cuando sea el caso, un buen baño generalmente lo soluciona. Un fermento probablemente sea la mejor forma, aunque...", - "botania.page.tcIntegration6b": "La carita triste oficial", - "botania.entry.bcIntegration": "Integración con Buildcraft", "botania.page.bcIntegration0": "Recientes avances en la tecnología de tuberías ha permitido $(item)compuertas$(0) para detectar $(thing)maná$(0) alrededor suyo. Una $(item)compuerta$(0) puede detectar si el contenedor de $(thing)maná$(0) está vacío, lleno o tiene algo de maná.$(p)Las $(item)compuertas$(0) pueden usar el disparador del $(item)detector de maná$(0) si pasa maná junto a la tubería. Además, pueden detectar si el $(item)altar rúnico$(0) está listo para crear runas." } diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index 0b6bcc073..c1486fbd0 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -910,9 +910,6 @@ "item.botania.virus_nullodermal": "Virus nullodermal", "item.botania.skydirt_rod": "Bâton des Highlands", "item.botania.placeholder": "Mainteneur d'artisanat", - "item.botania.manasteel_helmet_revealing": "Casque de révélation en manacier", - "item.botania.terrasteel_helmet_revealing": "Casque de révélation en terracier", - "item.botania.elementium_helmet_revealing": "Casque de révélation en élémentium", "item.botania.itemfinder": "Le spectateur", "item.botania.super_lava_pendant": "Pendentif Crimson", "item.botania.ender_hand": "Main du néant", @@ -925,7 +922,6 @@ "item.botania.divining_rod": "Bâton du manteau abondant", "item.botania.gravity_rod": "Bâton de la mesa hachurée", "item.botania.regenivy": "Lierre éternel", - "item.botania.mana_inkwell": "Encrier du botanurgiste", "item.botania.vial": "Fiole en verre de mana", "item.botania.flask": "Flasque en verre elfique", "item.botania.brew_vial": "Fiole de %s (%s)", @@ -1049,7 +1045,6 @@ "botania.brew.bloodthirst": "Ombre cramoisie", "botania.brew.overload": "Surcharge", "botania.brew.allure": "Charme marin", - "botania.brew.warp_ward": "Pensées saines", "botania.brew.clear": "Absolution", "effect.botania.soul_cross": "Croisée d'âme", diff --git a/src/main/resources/assets/botania/lang/ja_jp.json b/src/main/resources/assets/botania/lang/ja_jp.json index c810a59b0..1a2bb58ef 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.json +++ b/src/main/resources/assets/botania/lang/ja_jp.json @@ -985,9 +985,6 @@ "item.botania.virus_nullodermal": "表皮を溶かすウィルス", "item.botania.skydirt_rod": "高地の杖", "item.botania.placeholder": "クラフト空白", - "item.botania.manasteel_helmet_revealing": "洞察のマナスチールヘルメット", - "item.botania.terrasteel_helmet_revealing": "洞察のテラスチールヘルメット", - "item.botania.elementium_helmet_revealing": "洞察のエレメンチウムヘルメット", "item.botania.itemfinder": "観察者のバンド", "item.botania.super_lava_pendant": "クリムゾンペンダント", "item.botania.ender_hand": "エンダーの手", @@ -1000,7 +997,6 @@ "item.botania.divining_rod": "豊富なマントルの杖", "item.botania.gravity_rod": "暗がりのメサの杖", "item.botania.regenivy": "永遠のツタ", - "item.botania.mana_inkwell": "植物魔法学者のインク瓶", "item.botania.vial": "マナガラスの小瓶", "item.botania.flask": "アルフガラスのフラスコ", "item.botania.brew_vial": "%s (%s) の小瓶", @@ -1626,17 +1622,6 @@ "botania.page.pavement0": "$(item)ポルトガル式歩道$(0)は、詳細 な道路を作るための建材だ 。これは様々な色があり、 それら全てハーフブロック と階段にすることができる 。$(p)マルチパーツとマイクロブ ロックスによる作品の経験 を持つ人のために、これら のブロックは模様を作成す るための見栄えのよい方法 を提供する。", "botania.page.pavement1": "滑らない", - "botania.entry.tcIntegration": "Thaumcraft連携", - "botania.tagline.tcIntegration": "Thaumcraftとのちょっとした連携", - "botania.page.tcIntegration0": "しばしば、$(thing)植物学$(0)と$(thing)魔術$(0)の 道は互いに交わる。本書に 記された遺産の混合も、$(5)Th aumcraft$(0)の流派からのいく らかも、これらを築くため に組み合わせることが可能 だ。", - "botania.page.tcIntegration1": "まず第一に、$(item)マナ金属$(0)ヘル メットのいずれかと$(item)洞察の 眼鏡$(0)一式を組み合わせて、 一つにすることができる 。$(p)鎧の防御力と再生能力は眼 鏡の能力と一緒に機能する が、$(thing)Vis$(0)の消費量減少は失 われる。", - "botania.page.tcIntegration2": "洞察のヘルメット (ボタニ アの任意のヘルメットで)", - "botania.page.tcIntegration3": "続けて、$(thing)マナ$(0)はインクの興 味深い種類としての役割も 果たせる。黒い$(item)筆記具$(0)一式 へ、$(item)マナプール$(0)から$(thing)マナ$(0)を 注入することで、その$(thing)マナ$(0) を色の素として使うことを 可能にする。$(p)これらの道具の再充填は、 $(item)マナタブレット$(0)と同様にプ ールの上へ投げることで行 う。道具はあらかじめ充填 されてはいないことに注意 すること。", - "botania.page.tcIntegration4": "$(item)植物魔法学者のインク瓶$(0)の 作り方", - "botania.page.tcIntegration5": "次に、いくつかの素材、構 造物は、$(item)祭壇$(0)の不安定さを 低下させるための道具とし て働く。これらには$(item)光り輝 く花、浮遊している花、各 種支柱$(0)がある。", - "botania.page.tcIntegration6a": "おそらく、狂気はあらゆる 場面で最適な道具ではない かもしれない。これらの場 合、よい浴槽が一般的にそ れの手入れをする。醸造は おそらく、そのような作業 のためのよりよい方法だが …。", - "botania.page.tcIntegration6b": "公式しかめっ面", - "botania.entry.bcIntegration": "Buildcraft連携", "botania.tagline.bcIntegration": "ボタニア連携のためのゲート", "botania.page.bcIntegration0": "配管技術の進歩により、$(item)ゲ ート$(0)が周囲の$(thing)マナ$(0)を検出す ることができるようになっ た。$(item)ゲート$(0)は今や、$(thing)マナ$(0)容 器が空か、満タンか、ある いはマナが入っているかど うかを検知できる。$(p)$(item)ゲート$(0)はまた、マナがパイ プを通過したかどうかを検 出するトリガーとして$(item)マナ 検出器$(0)を使える。さらに、 $(item)ルーンの祭壇$(0)がルーンを作 成可能なことも検知できる 。", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index f8cf720ab..e478ad50e 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -1002,9 +1002,6 @@ "item.botania.virus_nullodermal": "Nullodermal 바이러스", "item.botania.skydirt_rod": "고지의 막대", "item.botania.placeholder": "제작 플레이스홀더", - "item.botania.manasteel_helmet_revealing": "발견의 마나스틸 핼맷", - "item.botania.terrasteel_helmet_revealing": "발견의 테라스틸 핼맷", - "item.botania.elementium_helmet_revealing": "발견의 엘레멘티움 핼맷", "item.botania.itemfinder": "스펙테이터", "item.botania.super_lava_pendant": "크림슨 펜던트", "item.botania.ender_hand": "엔더의 손", @@ -1017,7 +1014,6 @@ "item.botania.divining_rod": "나눗셈의 막대", "item.botania.gravity_rod": "블랙메사의 막대", "item.botania.regenivy": "시간을 초월한 아이비", - "item.botania.mana_inkwell": "식물학자의 잉크 통", "item.botania.vial": "마나유리병", "item.botania.flask": "엘프유리 플라스트", "item.botania.brew_vial": "%s의 물약 (%s)", @@ -1152,7 +1148,6 @@ "botania.brew.bloodthirst": "핏빛 안개", "botania.brew.overload": "과부화", "botania.brew.allure": "바다의 매력", - "botania.brew.warp_ward": "온전한 정신", "botania.brew.clear": "면죄", "effect.botania.soul_cross": "소울 크로스", diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index dfbdd7408..5b2b276ed 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -1086,9 +1086,6 @@ "item.botania.virus_nullodermal": "Nullodermaal Virus", "item.botania.skydirt_rod": "Staf van de Hooglanden", "item.botania.placeholder": "Vervaardig Plaatshouder", - "item.botania.manasteel_helmet_revealing": "Manastaal Helm der Onthulling", - "item.botania.terrasteel_helmet_revealing": "Terrastaal Helm der Onthulling", - "item.botania.elementium_helmet_revealing": "Elementium Helm der Onthulling", "item.botania.itemfinder": "De Toeschouwer", "item.botania.super_lava_pendant": "Crimson Hanger", "item.botania.ender_hand": "Hand van Ender", @@ -1101,7 +1098,6 @@ "item.botania.divining_rod": "Wichelroede", "item.botania.gravity_rod": "Staf van het Schaduw Plateau", "item.botania.regenivy": "Tijdloze Klimop", - "item.botania.mana_inkwell": "Botanisten Inktpot", "item.botania.vial": "Flacon Managlas", "item.botania.flask": "Flesje Elvenglas", "item.botania.brew_vial": "Flacon %s (%s)", @@ -1239,7 +1235,6 @@ "botania.brew.bloodthirst": "Crimson Schaduw", "botania.brew.overload": "Overbelasting", "botania.brew.allure": "Waterverleiding", - "botania.brew.warp_ward": "Verstandige Gedachten", "botania.brew.clear": "Totaalheid", "effect.botania.soul_cross": "Gekruisde Zielen", @@ -1643,10 +1638,6 @@ "botania.page.flowerBag2": "Voorwerpen worden niet vanzelf in de tas gedaan, als het in de hand wordt gehouden.$(p)Verder, door te shift-rechts klikken met de tas op een $(item)Kist$(0) of andere inventory, worden de bloemen uit de tas erin gestopt.", "botania.page.flowerBag1": "Handige uitvinding", - "botania.entry.wrap": "Wrap", - "botania.tagline.wrap": "Een wrap is geen grap", - "botania.page.wrap0": "Het lijkt erop dat de maker van deze mod een vreemd spelletje heeft toegevoegd met de naam $(item)Wrap$(0). Ik weet niet precies wat het doet, maar waarschijnlijk niet veel goeds.", - "botania.entry.mIntro": "Een introductie in Mana", "botania.tagline.mIntro": "Maak een begin met Mana", "botania.page.mIntro0": "$(thing)Mana$(0) is an vluchtige substantie. In leken taal, het is een vorm van $(thing)Mystieke Energie$(0). Het zintuiglijke bestaan ervan is inconsequent, en de kleur ervan hangt af van de omgeving waarin het zich bevindt.$(p)Het meester worden over $(thing)Mana$(0) is één van de belangrijkste vaardigheden die een botanist onder de knie moet krijgen.", @@ -3101,17 +3092,6 @@ "botania.page.pavement0": "$(item)Portugese Stoep$(0) is een soort bouwblok te gebruiken om gedetailleerde wegen te maken. Het komt in verscheidene kleuren, waarmee ook platen en trappen gemaakt kunnen worden.$(p)Voor degenen met ervaring in de kunst van of multiparts en microblokken, geven deze blokken een goed ogende manier om patronen te realiseren.", "botania.page.pavement1": "Deze zijn niet glad", - "botania.entry.tcIntegration": "Thaumcraft Integratie", - "botania.tagline.tcIntegration": "Feitjes over integratie met Thaumcraft", - "botania.page.tcIntegration0": "Vaak genoeg komen de wegen van $(thing)Botanica$(0) en $(thing)Magie$(0) elkaar tegen. Door sommige voorwerpen die genoemd worden in dit boek te mengen met die uit de school van $(5)Thaumcraft$(0) kunnen er combinaties ontstaan van beide.", - "botania.page.tcIntegration1": "Als belangrijkste, het combineren van elke $(item)Mana Metalen$(0) helm met een $(item)Bril der Onthulling$(0) laat een combinatie toe van beide.$(p)De bescherming en hergenereerbaarheid van het armor werkt samen met de eigenschappen van de Bril, maar de korting op $(thing)Vis$(0) is verloren.", - "botania.page.tcIntegration2": "Helmen der Onthulling (werkt met elke Botania helm)", - "botania.page.tcIntegration3": "Verder, $(thing)Mana$(0) kan ook dienen als een interessante Inkt. Het doordrenken van een set zwarte $(item)Schrijf Gereedschappen$(0) met $(thing)Mana$(0) uit een $(item)Mana Voorraad$(0) laat toe dat ze de $(thing)Mana$(0) gebruiken als bron van kleur.$(p)Het hervullen van de gereedschappen werkt net als het vullen van een $(item)Mana Tablet$(0), gedaan door hem bovenop de voorraad te werpen. Nieuwe gereedschappen moeten eerst gevuld worden.", - "botania.page.tcIntegration4": "Het maken van de $(item)Botanisten Inktpot$(0)", - "botania.page.tcIntegration5": "Vervolgens zijn er enkele gevarieerde grondstoffen die kunnen werken als uitrusting voor een $(item)Doordrenkings Altaar$(0). Om zijn instabiliteit te reduceren, komen deze in de vorm van $(item)Glinsterende Bloemen, Drijvende Bloemen en verschillende soorten Zuilen$(0).$(p)Tenslotte, een speciaal $(thing)Brouwsel$(0) kan gemaakt worden met typisch magische grondstoffen om een $(thing)Warp Ward$(0) effect toe te passen.", - "botania.page.tcIntegration6a": "Misschien is gekheid niet het beste middel voor elke gelegenheid. Voor die gevallen, is een goed bad meestal de oplossing. Een brouwsel zou alleen een beter formaat zijn voor zoiets..", - "botania.page.tcIntegration6b": "Het officiële fronsende gezicht", - "botania.entry.bcIntegration": "Buildcraft Integratie", "botania.tagline.bcIntegration": "Poorten voor interactie met Botania", "botania.page.bcIntegration0": "Recente ontwikkelingen in pijpleiding technologie hebben gezorgd dat $(item)Poorten$(0) gevoel hebben gekregen voor de $(thing)Mana$(0) in de buurt. Een $(item)Poort$(0) kan nu voelen of een $(thing)Mana$(0) houder leeg is, vol of dat er een beetje in zit. $(item)Poorten$(0) kunnen ook de $(item)Mana Detector$(0) trigger gebruiken om te detecteren of er mana langs het pijpverbinding blok komt. Ook kunnen ze voelen wanneer een $(item)Runen Altaar$(0) klaar is om runes te maken.", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index 3a985cc53..5fb7d7fad 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -1137,9 +1137,6 @@ "item.botania.virus_nullodermal": "Vírus Nullodermal", "item.botania.skydirt_rod": "Cajado de Highlands", "item.botania.placeholder": "Reservante de espaço", - "item.botania.manasteel_helmet_revealing": "Elmo de Manasteel da Revelação", - "item.botania.terrasteel_helmet_revealing": "Elmo de Terrasteel da Revelaçao", - "item.botania.elementium_helmet_revealing": "Elmo de Elementium da Revelação", "item.botania.itemfinder": "O Espectador", "item.botania.super_lava_pendant": "Pingente Carmesiano", "item.botania.ender_hand": "Mão do Fim", @@ -1152,7 +1149,6 @@ "item.botania.divining_rod": "Cajado do Manto Pleno", "item.botania.gravity_rod": "Cajado da Mesa Sombria", "item.botania.regenivy": "Hera Eterna", - "item.botania.mana_inkwell": "Tinteiro do Botanurgista", "item.botania.vial": "Frasco Pequeno", "item.botania.flask": "Frasco de Vidro Élfico", "item.botania.brew_vial": "Frasco Pequeno de %s (%s)", @@ -1298,7 +1294,6 @@ "botania.brew.bloodthirst": "Sombra Carmim", "botania.brew.overload": "Sobrecarga", "botania.brew.allure": "Sedução marinha", - "botania.brew.warp_ward": "Mente Sã", "botania.brew.clear": "Absolução", "effect.botania.soul_cross": "Almas Cruzadas", @@ -1434,9 +1429,6 @@ "botania.page.flowerBag0": "As leis da física sobre o $(thing)Inventário$(0) são um pouco rígidas nesse mundo. Graças a isso, carregar uma gama de flores diferentes pode ser uma dor de cabeça. Felizmente, um $(item)Cesto de Flores$(0) resolve esse problema. Ele pode guardar 64 de cada cor de $(item)Flor Mística$(0), não apenas isso, mas qualquer flor coletada automaticamente entra no cesto.", "botania.page.flowerBag1": "O tamanho é o mesmo por dentro (qualquer cor funciona)", - "botania.entry.wrap": "Wrap", - "botania.page.wrap0": "Parece que o autor do mod decidiu adicionar uma mecânica conhecida como $(item)Wrap$(0). Não se sabe o que significa, mas certamente é algo ruim. :/$(p)O que é essa 'barreira da realidade' a qual você se refere...?", - "botania.entry.mIntro": "Uma introdução à Mana", "botania.tagline.mIntro": "O básico", "botania.page.mIntro0": "$(thing)Mana$(0) é uma substância etérea. Em termos leigos, é uma forma de $(thing)energia mística$(0). Sua existência sensorial é oscilante, e sua cor depende do ambiente que é colocada.$(p)Dominar $(thing)Mana$(0) é a habilidade mais importante para um botanista.", diff --git a/src/main/resources/assets/botania/lang/ru_ru.json b/src/main/resources/assets/botania/lang/ru_ru.json index 5ea68bd30..4d1d13f6b 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.json +++ b/src/main/resources/assets/botania/lang/ru_ru.json @@ -1305,9 +1305,6 @@ "item.botania:virus1": "Наллодермальный вирус", "item.botania:skyDirtRod": "Жезл Высокогорья", "item.botania:placeholder": "Заполнитель сборщика", - "item.botania:manasteelHelmReveal": "Шлем откровения из манастали", - "item.botania:terrasteelHelmReveal": "Шлем откровения из террастали", - "item.botania:elementiumHelmReveal": "Шлем откровения из элементия", "item.botania:itemFinder": "Инспектор", "item.botania:superLavaPendant": "Багровый кулон", "item.botania:enderHand": "Рука Края", @@ -1320,7 +1317,6 @@ "item.botania:diviningRod": "Жезл Волхвов", "item.botania:gravityRod": "Жезл Чёрной Мессы", "item.botania:regenIvy": "Бессмертный плющ", - "item.botania:manaInkwell": "Ботаническая чернильница", "item.botania:vial0": "Пузырёк из манастали", "item.botania:vial1": "Колба из эльфийского стекла", "item.botania:brewVial": "Пузырёк %s (%s)", @@ -1473,7 +1469,6 @@ "botania.brew.bloodthirst": "Багровой тени", "botania.brew.overload": "Божественной силы", "botania.brew.allure": "Морского очарования", - "botania.brew.warp_ward": "Здравых мыслей", "botania.brew.clear": "Отпущения грехов", "botania.potion.soulCross": "Скрещивания душ", @@ -1879,10 +1874,6 @@ "botania.page.flowerBag2": "Items won't be added automatically to the pouch if the pouch is held in your dominant hand.$(p)Furthermore, shift-right clicking the pouch on a $(item)Chest$(0) or other inventory will store all flowers the pouch contains into said inventory.", "botania.page.flowerBag1": "It's about the same size on the inside (any colors work)", - "botania.entry.wrap": "Врап", - "botania.tagline.wrap": "Это конец...", - "botania.page.wrap0": "Похоже, что создатель мода решил добавить странную игровую механику, называемую... $(item)Врапом$(0). Понятия не имею, что она делает, но, скорее всего, что-то плохое. :/$(p)Да что за \"Четвертая стена\", о которой Вы все время говорите...?", - "botania.entry.mIntro": "Bступление к разделу", "botania.tagline.mIntro": "Начнем с маны!", "botania.page.mIntro0": "$(thing)Мана$(0) - это особое эфирное вещество. Проще говоря, это некая форма $(thing)мистической энергии$(0). Ее цвет способен меняться в зависимости от окружающей среды.$(p)Управление $(thing)Маной$(0) - это одно из самых важных умений, которыми должен овладеть ботаник.", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index b68b8db0c..3500adf6d 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -1236,9 +1236,6 @@ "item.botania.virus_nullodermal": "骷髅病毒", "item.botania.skydirt_rod": "高原法杖", "item.botania.placeholder": "合成占位符", - "item.botania.manasteel_helmet_revealing": "魔钢揭示头盔", - "item.botania.terrasteel_helmet_revealing": "泰拉钢揭示头盔", - "item.botania.elementium_helmet_revealing": "源质钢揭示头盔", "item.botania.itemfinder": "寻物者", "item.botania.super_lava_pendant": "绯红项链", "item.botania.ender_hand": "末影之手", @@ -1251,7 +1248,6 @@ "item.botania.divining_rod": "占矿法杖", "item.botania.gravity_rod": "黑山法杖", "item.botania.regenivy": "永恒常春藤", - "item.botania.mana_inkwell": "植物学家的笔墨", "item.botania.vial": "魔法玻璃小瓶", "item.botania.flask": "精灵玻璃烧瓶", "item.botania.brew_vial": "装有%s (%s)的小瓶", @@ -1405,7 +1401,6 @@ "botania.brew.bloodthirst": "腥红之影", "botania.brew.overload": "过载", "botania.brew.allure": "诱惑", - "botania.brew.warp_ward": "理智", "botania.brew.clear": "赦免", "effect.botania.soul_cross": "噬魂", @@ -1808,10 +1803,6 @@ "botania.page.flowerBag2": "手上拿着的物品不会被自动 放入袋子中.$(p)其次,用采花袋shift右击$(item)箱子$(0) 或其他容器会将储存的花装 入其中.", "botania.page.flowerBag1": "Pull a copter out of it (任意颜色均可)", - "botania.entry.wrap": "扭曲", - "botania.tagline.wrap": "这可是扭曲", - "botania.page.wrap0": "看样子这个模组的作者决心 以$(item)扭曲$(0)的形式增加种游戏机 制.我不太清楚它会怎样,很有 可能是什么坏的东西.:/$(p)你所说的\"第四面墙\"是什么 ...?(十八世纪的法国剧作家 提出了第四面墙Fourth Wall 的观念,他殷殷叮嘱营造幻觉 的重要性)", - "botania.entry.mIntro": "魔力的介绍", "botania.tagline.mIntro": "始于魔力", "botania.page.mIntro0": "$(thing)魔力$(0)是一种虚无的物质.通俗 的说,它是$(thing)神秘能量$(0)的一种形 态.感觉上来说它是变化无常 的,并且它的颜色由所在的环 境决定.$(p)控制$(thing)魔力$(0)是一个植物魔法师 所需掌握的最重要的技能之 一.", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index 130dd2708..a17c8a9e8 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -1173,9 +1173,6 @@ "item.botania.virus_nullodermal": "骷髏病毒", "item.botania.skydirt_rod": "高原法杖", "item.botania.placeholder": "合成佔位符", - "item.botania.manasteel_helmet_revealing": "魔鋼揭示頭盔", - "item.botania.terrasteel_helmet_revealing": "泰拉鋼揭示頭盔", - "item.botania.elementium_helmet_revealing": "源質鋼揭示頭盔", "item.botania.itemfinder": "尋物者", "item.botania.super_lava_pendant": "緋紅項鏈", "item.botania.ender_hand": "終界之手", @@ -1188,7 +1185,6 @@ "item.botania.divining_rod": "占礦法杖", "item.botania.gravity_rod": "黑山法杖", "item.botania.regenivy": "永恆常春籐", - "item.botania.mana_inkwell": "植物學家的筆墨", "item.botania.vial": "瑪那玻璃小瓶", "item.botania.flask": "精靈玻璃燒瓶", "item.botania.brew_vial": "裝有%s (%s)的小瓶", @@ -1333,7 +1329,6 @@ "botania.brew.bloodthirst": "腥紅之影", "botania.brew.overload": "過載", "botania.brew.allure": "誘惑", - "botania.brew.warp_ward": "理智", "botania.brew.clear": "赦免", "effect.botania.soul_cross": "噬魂", @@ -1733,10 +1728,6 @@ "botania.page.flowerBag2": "手上拿著的物品不會被自動 放入袋子中.$(p)其次,用採花袋shift右擊$(item)箱子$(0) 或其他容器會將儲存的花裝 入其中.", "botania.page.flowerBag1": "Pull a copter out of it (任意顏色均可)", - "botania.entry.wrap": "扭曲", - "botania.tagline.wrap": "這可是扭曲", - "botania.page.wrap0": "看樣子這個模組的作者決心 以$(item)扭曲$(0)的形式增加種遊戲機 制.我不太清楚它會怎樣,很有 可能是什麼壞的東西.:/$(p)你所說的\"第四面牆\"是什麼 ...?(十八世紀的法國劇作家 提出了第四面牆Fourth Wall 的觀念,他殷殷叮囑營造幻覺 的重要性)", - "botania.entry.mIntro": "瑪那的介紹", "botania.tagline.mIntro": "始於瑪那", "botania.page.mIntro0": "$(thing)瑪那$(0)是一種虛無的物質.通俗 的說,它是$(thing)神秘能量$(0)的一種形 態.感覺上來說它是變化無常 的,並且它的顏色由所在的環 境決定.$(p)控制$(thing)瑪那$(0)是一個植物魔法師 所需掌握的最重要的技能之 一.", diff --git a/src/main/resources/assets/botania/models/item/elementium_helmet_revealing.json b/src/main/resources/assets/botania/models/item/elementium_helmet_revealing.json deleted file mode 100644 index cb5fde2fa..000000000 --- a/src/main/resources/assets/botania/models/item/elementium_helmet_revealing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/elementium_helmet_reveal" - } -} diff --git a/src/main/resources/assets/botania/models/item/mana_inkwell.json b/src/main/resources/assets/botania/models/item/mana_inkwell.json deleted file mode 100644 index a0bd10c2c..000000000 --- a/src/main/resources/assets/botania/models/item/mana_inkwell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/mana_ink_well" - } -} diff --git a/src/main/resources/assets/botania/models/item/manasteel_helmet_revealing.json b/src/main/resources/assets/botania/models/item/manasteel_helmet_revealing.json deleted file mode 100644 index ea1d57114..000000000 --- a/src/main/resources/assets/botania/models/item/manasteel_helmet_revealing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/manasteel_helmet_reveal" - } -} diff --git a/src/main/resources/assets/botania/models/item/terrasteel_helmet_revealing.json b/src/main/resources/assets/botania/models/item/terrasteel_helmet_revealing.json deleted file mode 100644 index 5b36880fd..000000000 --- a/src/main/resources/assets/botania/models/item/terrasteel_helmet_revealing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/terrasteel_helmet_reveal" - } -} diff --git a/src/main/resources/assets/botania/textures/item/elementium_helmet_reveal.png b/src/main/resources/assets/botania/textures/item/elementium_helmet_reveal.png deleted file mode 100644 index def69aab6d0477fa726351396f89c18f800a4d31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmV-o0-gPdP)<{9AY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-=t)FDRCwCNlRs!vQ5431r;S)rDO5s5kq$x%E^&C0DU%6w3?U*ybty;@mypG{ z2+u_vDwz_9Zg!JWGD@qHE|z3yp&cqB4wa|*Be97YeEA$=p3Nv7JaDUHsdd zBs^THx-Us8kd%ij4F=M;pVG&UG#JRkRe_`=N!9(KMhX((;i^~OR@12rg?lZj?sZl7 zy4q`X3nbNaD(aQDgUbN}Ky%d_Y^96DZ!OZ@Ss;Do9@91(?yAkS%@R4aK1L<%GWy&WH> w2bKyx2jGdlF@XEJHWCF+9l6r}`!xO@0MP^`M?v(8%m4rY07*qoM6N<$f+uzYRR910 diff --git a/src/main/resources/assets/botania/textures/item/mana_ink_well.png b/src/main/resources/assets/botania/textures/item/mana_ink_well.png deleted file mode 100644 index 72af365c36bf65de92f346c3e7b640d6cf76072d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 946 zcmV;j15NyiP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ5)AHGUNsQ2sL-E)7ih&=FwjgW+mkl40eJ@K*EC2WMmRZrDZ z<8dO!US3YLR{!hv1OTo^lKW@J07#l0OkJGdm+58opR#8zPKj;Xa%dW{ZCfnMk{>R7 zQ;ML+ujYSId~^lI*y#^Zqf0jgU-CjBV;UdI|aHWL$do z49fE-(lVD3dFjlm>>Zty$6pu}5!tN3h!_AI&CC&xkMl@soKI4h+3r*1X5zeA9>G~p zlD?Lq#pS)%Lap=h!aK(gu(pszbysNjcTp+@p&lOS{X=p$ zYjWo=9=O*$ILg9t7m#{*pht&gTdo7~-bAf<@%aR|U&He5!m5V{q&38CQ^_hyfg*Xo z&24OGgaw>o2mk;8 diff --git a/src/main/resources/assets/botania/textures/item/mana_ink_well.png.mcmeta b/src/main/resources/assets/botania/textures/item/mana_ink_well.png.mcmeta deleted file mode 100644 index 446d6dd57..000000000 --- a/src/main/resources/assets/botania/textures/item/mana_ink_well.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frames": [ - { - "index": 0, - "time": 4 - }, { - "index": 1, - "time": 4 - }, { - "index": 2, - "time": 4 - }, { - "index": 3, - "time": 4 - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/item/manasteel_helmet_reveal.png b/src/main/resources/assets/botania/textures/item/manasteel_helmet_reveal.png deleted file mode 100644 index 105973d2da2fe67f697725d48b4d85f22dc6ae6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmV;V0bBlwP)<{9AY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-DoI2^RCwCdlRZxYK@f(YHCJIQ&S-(Lu%)oN=0Xp@fY3m!tnN2pcg7G)8w)$G zpfHw4W2G${VnJ+y0u$Fjf?_C4#$prXz@s4+PBPh@uQ&Vd%qS6I6WL-z`5OS`hobyY z((JVW$`7R))a<<&i7G|{Pz`GQ3L+wNrO*(sE<(92{gKFR=SL~GZLH9c#hT;`COz~3 zJkKNULg@xd7aH?neR^PX(kV=bU^MzZvbNDMeg?2Uqis$qKsL|Wi3e_u^U5hlojVSD zPt+>`xH%ik<`X5(GKIJc2ai|mybZ~ycRpoIM!8HME{VP73I%7Gf*!!W%$UgpV19nF zZU112g0s>VqcMBCyuLJ5qP@p~VD$PqP~B@qzm-0A{g%yHtoi@T^gRIAznRrXxYqdq O0000<{9AY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;2T4RhRCwB?lQB$FQ51&1(@+PnX>n;PI2eq1O-UPsSYBONOo)cTFj_TDoE&g> z0%J&IV{l_I2GPZdnBrzMf*O?=F^~?1gggz!P?44agrDJsmKHZoa+7<{{m=RTbI-XZ ziQ`z);lrg?6M(*Bv#0A5XMP%%KmhMbvi~M1@50G+2up10+&!yH5FG`2Lafbg9#xQ< z@tME=l?5^paVnP+Y>21{G)m1R|YzpM$M@(pg@&XSrjU3dg1q8q%= zI~3RF0r+vsq4&WO+p9j=U^>f_iAm@OG7*%CppG$=D|RcHN0y6eWIZd_L#~HL*0Zu) zOv${D=@|24G7%Ig@A|bxN8!!m&jh1>ZOi`_0jMn0_Q9x+slLY!kj#U*VcCSER9{Hu zhO6sVu}iK;oiEiFl1(@=H>_kHESZPFbe7?((*hXybcGgcrJ@pR%g?ARKw{ty6_seQ zR-Si11z`B)fW7!IS!?6o>>oRG*EH?C2Edu@!7J#T@<$148h8{tWkg+_csPO brtJ>^(D(<(+UBkO00000NkvXXu0mjfmuVdc