Remove all thaumcraft stuff. F.

This commit is contained in:
Vincent Lee committed 2020-07-08 22:04:48 -05:00
1 parent 79c3aeb3f9
commit 77a2fa15fe
33 files changed
+3 -1055

No files matched your search

@@ -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) {
@@ -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<Ingredient> 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<HelmRevealingRecipe> SERIALIZER = new Serializer();
private static class Serializer extends ForgeRegistryEntry<IRecipeSerializer<?>> implements IRecipeSerializer<HelmRevealingRecipe> {
@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);
}
};
}
@@ -1,512 +0,0 @@
/**
* This class was created by <Hubry>. 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<ItemStack> 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)
}
}
*/
@@ -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);
@@ -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:
@@ -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:
@@ -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:
@@ -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;
}
}
@@ -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<ItemStack> 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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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";
@@ -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));