From 03662c0cd37ed3e9f065506198b8aa6cdbca2a8f Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 16 Mar 2016 01:10:33 -0700 Subject: [PATCH] Most items done now --- .../item/ItemActivationCrystal.java | 15 +- .../bloodmagic/item/ItemAltarMaker.java | 13 +- .../bloodmagic/item/ItemArcaneAshes.java | 13 +- .../bloodmagic/item/ItemBloodShard.java | 14 +- .../bloodmagic/item/ItemComponent.java | 13 +- .../item/ItemDaggerOfSacrifice.java | 15 +- .../bloodmagic/item/ItemDemonCrystal.java | 13 +- .../bloodmagic/item/ItemInscriptionTool.java | 14 +- .../bloodmagic/item/ItemLavaCrystal.java | 15 +- .../bloodmagic/item/ItemRitualDiviner.java | 14 +- .../item/ItemSacrificialDagger.java | 14 +- .../item/ItemTelepositionFocus.java | 16 ++- .../bloodmagic/item/ItemUpgradeTome.java | 13 +- .../bloodmagic/item/ItemUpgradeTrainer.java | 12 +- .../item/gear/ItemPackSacrifice.java | 13 +- .../item/gear/ItemPackSelfSacrifice.java | 13 +- .../item/routing/ItemNodeRouter.java | 14 +- .../item/routing/ItemRouterFilter.java | 14 +- .../bloodmagic/item/sigil/ItemSigilBase.java | 13 +- .../item/sigil/ItemSigilToggleable.java | 11 ++ .../bloodmagic/item/soul/ItemMonsterSoul.java | 13 +- .../bloodmagic/item/soul/ItemSoulGem.java | 17 ++- .../bloodmagic/item/soul/ItemSoulSnare.java | 13 +- .../bloodmagic/proxy/ClientProxy.java | 5 - .../bloodmagic/registry/ModItems.java | 136 ++++-------------- .../blockstates/item/ItemSigilAir.json | 16 +++ .../blockstates/item/ItemSigilBloodLight.json | 16 +++ .../item/ItemSigilCompression.json | 21 +++ .../blockstates/item/ItemSigilDivination.json | 16 +++ .../item/ItemSigilElementalAffinity.json | 21 +++ .../item/ItemSigilEnderSeverance.json | 21 +++ .../blockstates/item/ItemSigilFastMiner.json | 21 +++ .../blockstates/item/ItemSigilGreenGrove.json | 21 +++ .../blockstates/item/ItemSigilHaste.json | 21 +++ .../blockstates/item/ItemSigilLava.json | 16 +++ .../blockstates/item/ItemSigilMagnetism.json | 21 +++ .../item/ItemSigilPhantomBridge.json | 21 +++ .../blockstates/item/ItemSigilSeer.json | 16 +++ .../item/ItemSigilSuppression.json | 21 +++ .../item/ItemSigilTeleposition.json | 16 +++ .../item/ItemSigilTransposition.json | 16 +++ .../blockstates/item/ItemSigilVoid.json | 16 +++ .../blockstates/item/ItemSigilWater.json | 16 +++ .../blockstates/item/ItemSigilWhirlwind.json | 21 +++ .../bloodmagic/models/item/ItemSigilAir.json | 6 - .../models/item/ItemSigilBloodLight.json | 6 - .../models/item/ItemSigilCompression0.json | 6 - .../models/item/ItemSigilCompression1.json | 6 - .../models/item/ItemSigilDivination.json | 6 - .../item/ItemSigilElementalAffinity0.json | 6 - .../item/ItemSigilElementalAffinity1.json | 6 - .../models/item/ItemSigilEnderSeverance0.json | 6 - .../models/item/ItemSigilEnderSeverance1.json | 6 - .../models/item/ItemSigilFastMiner0.json | 6 - .../models/item/ItemSigilFastMiner1.json | 6 - .../models/item/ItemSigilGreenGrove0.json | 6 - .../models/item/ItemSigilGreenGrove1.json | 6 - .../models/item/ItemSigilHaste0.json | 6 - .../models/item/ItemSigilHaste1.json | 6 - .../bloodmagic/models/item/ItemSigilLava.json | 6 - .../models/item/ItemSigilMagnetism0.json | 6 - .../models/item/ItemSigilMagnetism1.json | 6 - .../models/item/ItemSigilPhantomBridge0.json | 6 - .../models/item/ItemSigilPhantomBridge1.json | 6 - .../bloodmagic/models/item/ItemSigilSeer.json | 6 - .../models/item/ItemSigilSuppression0.json | 6 - .../models/item/ItemSigilSuppression1.json | 6 - .../models/item/ItemSigilTeleposition.json | 6 - .../models/item/ItemSigilTransposition.json | 6 - .../bloodmagic/models/item/ItemSigilVoid.json | 6 - .../models/item/ItemSigilWater.json | 6 - .../models/item/ItemSigilWhirlwind0.json | 6 - .../models/item/ItemSigilWhirlwind1.json | 6 - .../models/item/ItemUpgradeTrainer.json | 7 - 74 files changed, 677 insertions(+), 314 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilAir.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilBloodLight.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilCompression.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilDivination.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilElementalAffinity.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilEnderSeverance.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilFastMiner.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilGreenGrove.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilHaste.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilLava.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilMagnetism.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilPhantomBridge.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilSeer.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilSuppression.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilTeleposition.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilTransposition.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilVoid.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilWater.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilWhirlwind.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilAir.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilBloodLight.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilCompression0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilCompression1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilDivination.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilElementalAffinity0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilElementalAffinity1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilEnderSeverance0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilEnderSeverance1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilFastMiner0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilFastMiner1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilGreenGrove0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilGreenGrove1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilHaste0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilHaste1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilLava.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilMagnetism0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilMagnetism1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilPhantomBridge0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilPhantomBridge1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilSeer.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilSuppression0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilSuppression1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilTeleposition.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilTransposition.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilVoid.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilWater.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilWhirlwind0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSigilWhirlwind1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemUpgradeTrainer.json diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index d034d231..4ed512aa 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.item; +import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -10,8 +12,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemActivationCrystal extends ItemBindable +public class ItemActivationCrystal extends ItemBindable implements IVariantProvider { public static String[] names = { "weak", "awakened", "creative" }; @@ -48,6 +52,15 @@ public class ItemActivationCrystal extends ItemBindable super.addInformation(stack, player, tooltip, advanced); } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=weak")); + ret.add(new ImmutablePair(1, "type=demonic")); + ret.add(new ImmutablePair(2, "type=creative")); + return ret; + } + public int getCrystalLevel(ItemStack stack) { return stack.getItemDamage() > 1 ? Integer.MAX_VALUE : stack.getItemDamage() + 1; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 76e01591..a58e9685 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.item; +import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -23,8 +25,10 @@ import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemAltarMaker extends Item implements IAltarManipulator +public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantProvider { private EnumAltarTier tierToBuild = EnumAltarTier.ONE; @@ -87,6 +91,13 @@ public class ItemAltarMaker extends Item implements IAltarManipulator return stack; } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=altarmaker")); + return ret; + } + public void setTierToBuild(EnumAltarTier tierToBuild) { this.tierToBuild = tierToBuild; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java index 28317262..fae97acc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.item; +import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -14,8 +16,10 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.registry.ModBlocks; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemArcaneAshes extends Item +public class ItemArcaneAshes extends Item implements IVariantProvider { public ItemArcaneAshes() { @@ -51,4 +55,11 @@ public class ItemArcaneAshes extends Item return false; } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=arcaneashes")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java index 9e412f79..ee37c891 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.item; +import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -9,8 +11,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemBloodShard extends Item +public class ItemBloodShard extends Item implements IVariantProvider { public String[] names = { "weak", "demon" }; @@ -37,4 +41,12 @@ public class ItemBloodShard extends Item { return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=weak")); + ret.add(new ImmutablePair(1, "type=demonic")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java index 569f46b3..d1976be8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item; import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import lombok.Getter; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -12,8 +13,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.registry.ModItems; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemComponent extends Item +public class ItemComponent extends Item implements IVariantProvider { @Getter private static ArrayList names = new ArrayList(); @@ -91,4 +94,12 @@ public class ItemComponent extends Item { return new ItemStack(ModItems.itemComponent, 1, names.indexOf(name)); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + for (String name : names) + ret.add(new ImmutablePair(names.indexOf(name), "type=" + name)); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index c2e1e1ea..8b287b46 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +16,13 @@ import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.DamageSourceBloodMagic; import WayofTime.bloodmagic.api.altar.IBloodAltar; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemDaggerOfSacrifice extends Item +import java.util.ArrayList; +import java.util.List; + +public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { public ItemDaggerOfSacrifice() { @@ -62,6 +68,13 @@ public class ItemDaggerOfSacrifice extends Item return false; } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=normal")); + return ret; + } + public boolean findAndFillAltar(World world, EntityLivingBase sacrifice, int amount) { IBloodAltar bloodAltar = findBloodAltar(world, sacrifice.getPosition()); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index e4c43e41..ed0c9811 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item; import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import lombok.Getter; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,8 +16,10 @@ import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.registry.ModItems; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemDemonCrystal extends Item implements IDiscreteDemonWill +public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVariantProvider { @Getter private static ArrayList names = new ArrayList(); @@ -99,4 +102,12 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill { return EnumDemonWillType.values()[MathHelper.clamp_int(willStack.getMetadata(), 0, EnumDemonWillType.values().length - 1)]; } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + for (String name : names) + ret.add(new ImmutablePair(names.indexOf(name), "type=" + name)); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 6cc8f34c..8b68c0b9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -1,8 +1,10 @@ package WayofTime.bloodmagic.item; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -18,8 +20,10 @@ import WayofTime.bloodmagic.api.ritual.EnumRuneType; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemInscriptionTool extends ItemBindable +public class ItemInscriptionTool extends ItemBindable implements IVariantProvider { public ItemInscriptionTool() { @@ -94,6 +98,14 @@ public class ItemInscriptionTool extends ItemBindable super.addInformation(stack, player, list, advanced); } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + for (int i = 1; i < EnumRuneType.values().length; i++) + ret.add(new ImmutablePair(i, "type=" + EnumRuneType.values()[i].name())); + return ret; + } + public EnumRuneType getType(ItemStack stack) { return EnumRuneType.values()[stack.getItemDamage()]; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index d8007e41..6cc38c90 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -10,8 +11,13 @@ import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import com.google.common.base.Strings; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemLavaCrystal extends ItemBindable implements IFuelHandler +import java.util.ArrayList; +import java.util.List; + +public class ItemLavaCrystal extends ItemBindable implements IFuelHandler, IVariantProvider { public ItemLavaCrystal() { @@ -75,4 +81,11 @@ public class ItemLavaCrystal extends ItemBindable implements IFuelHandler return 0; } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=normal")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 4e467eaa..c4468fa2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item; import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -20,6 +21,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.input.Keyboard; import WayofTime.bloodmagic.BloodMagic; @@ -34,7 +37,7 @@ import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; -public class ItemRitualDiviner extends Item +public class ItemRitualDiviner extends Item implements IVariantProvider { public static String[] names = { "normal", "dusk", "dawn" }; @@ -306,6 +309,15 @@ public class ItemRitualDiviner extends Item return false; } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=basic")); + ret.add(new ImmutablePair(1, "type=dusk")); + ret.add(new ImmutablePair(2, "type=dawn")); + return ret; + } + public void cycleDirection(ItemStack stack, EntityPlayer player) { EnumFacing direction = getDirection(stack); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index dc49ffe1..557ee705 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -1,8 +1,10 @@ package WayofTime.bloodmagic.item; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -27,8 +29,10 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemSacrificialDagger extends Item +public class ItemSacrificialDagger extends Item implements IVariantProvider { public static String[] names = { "normal", "creative" }; @@ -147,6 +151,14 @@ public class ItemSacrificialDagger extends Item return stack; } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=normal")); + ret.add(new ImmutablePair(1, "type=creative")); + return ret; + } + private void findAndFillAltar(World world, EntityPlayer player, int amount) { BlockPos pos = player.getPosition(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 361ce24a..84479238 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -1,8 +1,10 @@ package WayofTime.bloodmagic.item; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -18,8 +20,10 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemTelepositionFocus extends ItemBindable +public class ItemTelepositionFocus extends ItemBindable implements IVariantProvider { public static String[] names = { "weak", "enhanced", "reinforced", "demonic" }; @@ -83,6 +87,16 @@ public class ItemTelepositionFocus extends ItemBindable } } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=weak")); + ret.add(new ImmutablePair(1, "type=enhanced")); + ret.add(new ImmutablePair(2, "type=reinforced")); + ret.add(new ImmutablePair(3, "type=demonic")); + return ret; + } + public World getWorld(ItemStack stack) { stack = NBTHelper.checkNBT(stack); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index 62a78dd5..546c9b36 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -1,8 +1,10 @@ package WayofTime.bloodmagic.item; +import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,8 +21,10 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemUpgradeTome extends Item +public class ItemUpgradeTome extends Item implements IVariantProvider { public ItemUpgradeTome() { @@ -83,6 +87,13 @@ public class ItemUpgradeTome extends Item } } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=upgradetome")); + return ret; + } + public static LivingArmourUpgrade getUpgrade(ItemStack stack) { String key = getKey(stack); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index 28196b7f..1bde4be9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -18,8 +19,10 @@ import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer +public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVariantProvider { public ItemUpgradeTrainer() { @@ -107,4 +110,11 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer setKey(stack, keys.get(0)); return true; } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=upgradetrainer")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index ce85e155..4a5c6374 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.item.gear; +import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; @@ -15,8 +17,10 @@ import WayofTime.bloodmagic.api.altar.IAltarManipulator; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator +public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, IVariantProvider { public final int CAPACITY = 10000; // Max LP storage @@ -90,6 +94,13 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator list.add(TextHelper.localize("tooltip.BloodMagic.pack.stored", getStoredLP(stack))); } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=normal")); + return ret; + } + public void addLP(ItemStack stack, int toAdd) { stack = NBTHelper.checkNBT(stack); diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index fe1d72c3..b9c50307 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.item.gear; +import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; @@ -16,8 +18,10 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulator +public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulator, IVariantProvider { /** How much LP per half heart */ public final int CONVERSION = 100; @@ -109,6 +113,13 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato list.add(TextHelper.localize("tooltip.BloodMagic.pack.stored", getStoredLP(stack))); } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=normal")); + return ret; + } + public void addLP(ItemStack stack, int toAdd) { stack = NBTHelper.checkNBT(stack); diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index e55bb7c9..306c831d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -1,9 +1,11 @@ package WayofTime.bloodmagic.item.routing; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import WayofTime.bloodmagic.api.iface.INodeRenderer; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -21,8 +23,10 @@ import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemNodeRouter extends Item implements INodeRenderer +public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvider { public ItemNodeRouter() { @@ -46,6 +50,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer } } + @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { if (world.isRemote) @@ -190,6 +195,13 @@ public class ItemNodeRouter extends Item implements INodeRenderer return false; } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=normal")); + return ret; + } + public BlockPos getBlockPos(ItemStack stack) { stack = NBTHelper.checkNBT(stack); diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index e3a5135b..f7de68a7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item.routing; import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -22,8 +23,10 @@ import WayofTime.bloodmagic.routing.OreDictItemFilter; import WayofTime.bloodmagic.routing.TestItemFilter; import WayofTime.bloodmagic.util.GhostItemHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemRouterFilter extends Item implements IItemFilterProvider +public class ItemRouterFilter extends Item implements IItemFilterProvider, IVariantProvider { public static String[] names = { "exact", "ignoreNBT", "modItems", "oreDict" }; @@ -150,4 +153,13 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider return testFilter; } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=exact")); + ret.add(new ImmutablePair(1, "type=ignorenbt")); + ret.add(new ImmutablePair(2, "type=moditems")); + ret.add(new ImmutablePair(3, "type=oredict")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index 09c60e22..fc55a7e8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -1,8 +1,10 @@ package WayofTime.bloodmagic.item.sigil; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import lombok.Getter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -15,9 +17,11 @@ import WayofTime.bloodmagic.api.iface.ISigil; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.item.ItemBindable; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; @Getter -public class ItemSigilBase extends ItemBindable implements ISigil +public class ItemSigilBase extends ItemBindable implements ISigil, IVariantProvider { protected final String tooltipBase; private final String name; @@ -57,6 +61,13 @@ public class ItemSigilBase extends ItemBindable implements ISigil super.addInformation(stack, player, tooltip, advanced); } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=normal")); + return ret; + } + public void setToggleable() { this.toggleable = true; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java index 884e5193..5b089af0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import java.util.ArrayList; import java.util.List; import net.minecraft.entity.Entity; @@ -13,6 +14,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.item.ItemBindable; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; public class ItemSigilToggleable extends ItemSigilBase { @@ -78,4 +81,12 @@ public class ItemSigilToggleable extends ItemSigilBase public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "active=false")); + ret.add(new ImmutablePair(1, "active=true")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 71ca9c87..9db44551 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.item.soul; +import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -14,8 +16,10 @@ import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.soul.IDemonWill; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemMonsterSoul extends Item implements IDemonWill +public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvider { public static String[] names = { "base" }; @@ -91,4 +95,11 @@ public class ItemMonsterSoul extends Item implements IDemonWill setWill(soulStack, number); return soulStack; } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=monstersoul")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index c08aed8c..ad047b0c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.item.soul; +import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -18,8 +20,10 @@ import WayofTime.bloodmagic.api.soul.IDemonWillGem; import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemSoulGem extends Item implements IDemonWillGem +public class ItemSoulGem extends Item implements IDemonWillGem, IVariantProvider { public static String[] names = { "petty", "lesser", "common", "greater", "grand" }; @@ -183,6 +187,17 @@ public class ItemSoulGem extends Item implements IDemonWillGem return 64; } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=petty")); + ret.add(new ImmutablePair(1, "type=lesser")); + ret.add(new ImmutablePair(2, "type=common")); + ret.add(new ImmutablePair(3, "type=greater")); + ret.add(new ImmutablePair(4, "type=grand")); + return ret; + } + public EnumDemonWillType getCurrentType(ItemStack soulGemStack) { NBTHelper.checkNBT(soulGemStack); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index 0b30db71..34292bb1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -1,8 +1,10 @@ package WayofTime.bloodmagic.item.soul; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -14,8 +16,10 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.util.helper.TextHelper; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class ItemSoulSnare extends Item +public class ItemSoulSnare extends Item implements IVariantProvider { public static String[] names = { "base" }; @@ -70,4 +74,11 @@ public class ItemSoulSnare extends Item super.addInformation(stack, player, tooltip, advanced); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "type=soulsnare")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index ae8ad017..ac56a55a 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -13,7 +13,6 @@ import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.helper.ShaderHelper; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.client.render.RenderAlchemyArray; import WayofTime.bloodmagic.client.render.RenderAltar; import WayofTime.bloodmagic.client.render.RenderDemonCrucible; @@ -78,10 +77,6 @@ public class ClientProxy extends CommonProxy RenderingRegistry.registerEntityRenderingHandler(EntitySoulSnare.class, new SoulSnareRenderFactory()); RenderingRegistry.registerEntityRenderingHandler(EntitySentientArrow.class, new SentientArrowRenderFactory()); RenderingRegistry.registerEntityRenderingHandler(EntityBloodLight.class, new BloodLightRenderFactory()); - ModelLoader.setCustomMeshDefinition(ModItems.boundShovel, new CustomMeshDefinitionActivatable("ItemBoundShovel")); - ModelLoader.setCustomMeshDefinition(ModItems.boundAxe, new CustomMeshDefinitionActivatable("ItemBoundAxe")); - ModelLoader.setCustomMeshDefinition(ModItems.boundPickaxe, new CustomMeshDefinitionActivatable("ItemBoundPickaxe")); - ModelLoader.setCustomMeshDefinition(ModItems.boundSword, new CustomMeshDefinitionActivatable("ItemBoundSword")); ShaderHelper.init(); } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index 4d5318c2..a06dd276 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -246,45 +246,6 @@ public class ModItems InventoryRenderHelper renderHelper = BloodMagic.proxy.getRenderHelper(); InventoryRenderHelperV2 renderHelperV2 = BloodMagic.proxy.getRenderHelperV2(); - renderHelperV2.registerRender(altarMaker, "altarMaker"); - renderHelperV2.registerRender(upgradeTome, "upgradeTome"); - renderHelperV2.registerRender(upgradeTrainer, "upgradeTrainer"); - - renderHelperV2.registerRender(arcaneAshes, "arcaneAshes"); - renderHelperV2.registerRender(monsterSoul, "monsterSoul"); - renderHelperV2.registerRender(soulGem, 0, "petty"); - renderHelperV2.registerRender(soulGem, 1, "lesser"); - renderHelperV2.registerRender(soulGem, 2, "common"); - renderHelperV2.registerRender(soulGem, 3, "greater"); - renderHelperV2.registerRender(soulGem, 4, "grand"); - renderHelperV2.registerRender(soulSnare, "soulSnare"); - - renderHelperV2.registerRender(inscriptionTool, 1, EnumRuneType.WATER.name()); - renderHelperV2.registerRender(inscriptionTool, 2, EnumRuneType.FIRE.name()); - renderHelperV2.registerRender(inscriptionTool, 3, EnumRuneType.EARTH.name()); - renderHelperV2.registerRender(inscriptionTool, 4, EnumRuneType.AIR.name()); - renderHelperV2.registerRender(inscriptionTool, 5, EnumRuneType.DUSK.name()); - renderHelperV2.registerRender(inscriptionTool, 6, EnumRuneType.DAWN.name()); - - renderHelperV2.registerRender(activationCrystal, 0, "weak"); - renderHelperV2.registerRender(activationCrystal, 1, "demonic"); - renderHelperV2.registerRender(activationCrystal, 2, "creative"); - - renderHelperV2.registerRender(sacrificialDagger, 0, "normal"); - renderHelperV2.registerRender(sacrificialDagger, 1, "creative"); - renderHelperV2.registerRender(packSacrifice, "normal"); - renderHelperV2.registerRender(packSelfSacrifice, "normal"); - renderHelperV2.registerRender(daggerOfSacrifice, "normal"); - - renderHelperV2.registerRender(ritualDiviner, 0, "basic"); - renderHelperV2.registerRender(ritualDiviner, 1, "dusk"); - renderHelperV2.registerRender(ritualDiviner, 2, "dawn"); - - renderHelperV2.registerRender(lavaCrystal, "normal"); - - renderHelperV2.registerRender(bloodShard, 0, "weak"); - renderHelperV2.registerRender(bloodShard, 1, "demonic"); - renderHelperV2.registerRender(livingArmourHelmet, "ItemLivingArmour", "helm"); renderHelperV2.registerRender(livingArmourChest, "ItemLivingArmour", "chest"); renderHelperV2.registerRender(livingArmourLegs, "ItemLivingArmour", "legs"); @@ -295,34 +256,6 @@ public class ModItems renderHelperV2.registerRender(sentientArmourLegs, "ItemSentientArmour", "legs"); renderHelperV2.registerRender(sentientArmourBoots, "ItemSentientArmour", "boots"); -// renderHelperV2.registerRender(sentientBow, 0, "still"); -// renderHelperV2.registerRender(sentientBow, 1, "pull0"); -// renderHelperV2.registerRender(sentientBow, 2, "pull1"); -// renderHelperV2.registerRender(sentientBow, 3, "pull2"); - -// renderHelperV2.registerRender(sentientArmourGem, 0, "deactivated"); -// renderHelperV2.registerRender(sentientArmourGem, 1, "activated"); - - for (int i = 0; i < ItemComponent.getNames().size(); i++) - renderHelperV2.registerRender(itemComponent, i, ItemComponent.getNames().get(i)); - - for (int i = 0; i < ItemDemonCrystal.getNames().size(); i++) - renderHelperV2.registerRender(itemDemonCrystal, i, ItemDemonCrystal.getNames().get(i)); - - renderHelperV2.registerRender(telepositionFocus, 0, "weak"); - renderHelperV2.registerRender(telepositionFocus, 1, "enhanced"); - renderHelperV2.registerRender(telepositionFocus, 2, "reinforced"); - renderHelperV2.registerRender(telepositionFocus, 3, "demonic"); - - renderHelperV2.registerRender(baseItemFilter, 0, "exact"); - renderHelperV2.registerRender(baseItemFilter, 1, "ignorenbt"); - renderHelperV2.registerRender(baseItemFilter, 2, "moditems"); - renderHelperV2.registerRender(baseItemFilter, 3, "oredict"); - - renderHelperV2.registerRender(nodeRouter, "normal"); - - // TODO - Move all below to InventoryRenderHelperV2 - renderHelper.itemRenderAll(bloodOrb); OrbRegistry.registerOrbTexture(orbWeak, new ResourceLocation(Constants.Mod.DOMAIN + "ItemBloodOrbWeak")); OrbRegistry.registerOrbTexture(orbApprentice, new ResourceLocation(Constants.Mod.DOMAIN + "ItemBloodOrbApprentice")); @@ -333,45 +266,36 @@ public class ModItems renderHelper.itemRender(bucketEssence); - renderHelper.customItemRender(boundSword, 0); - renderHelper.customItemRender(boundSword, 1); - renderHelper.customItemRender(boundPickaxe, 0); - renderHelper.customItemRender(boundPickaxe, 1); - renderHelper.customItemRender(boundAxe, 0); - renderHelper.customItemRender(boundAxe, 1); - renderHelper.customItemRender(boundShovel, 0); - renderHelper.customItemRender(boundShovel, 1); - - renderHelper.itemRender(sigilDivination); - renderHelper.itemRender(sigilAir); - renderHelper.itemRender(sigilWater); - renderHelper.itemRender(sigilLava); - renderHelper.itemRender(sigilVoid); - renderHelper.itemRender(sigilGreenGrove, 0); - renderHelper.itemRender(sigilGreenGrove, 1); - renderHelper.itemRender(sigilBloodLight); - renderHelper.itemRender(sigilElementalAffinity, 0); - renderHelper.itemRender(sigilElementalAffinity, 1); - renderHelper.itemRender(sigilMagnetism, 0); - renderHelper.itemRender(sigilMagnetism, 1); - renderHelper.itemRender(sigilSuppression, 0); - renderHelper.itemRender(sigilSuppression, 1); - renderHelper.itemRender(sigilHaste, 0); - renderHelper.itemRender(sigilHaste, 1); - renderHelper.itemRender(sigilFastMiner, 0); - renderHelper.itemRender(sigilFastMiner, 1); - renderHelper.itemRender(sigilSeer); - renderHelper.itemRender(sigilPhantomBridge, 0); - renderHelper.itemRender(sigilPhantomBridge, 1); - renderHelper.itemRender(sigilWhirlwind, 0); - renderHelper.itemRender(sigilWhirlwind, 1); - renderHelper.itemRender(sigilCompression, 0); - renderHelper.itemRender(sigilCompression, 1); - renderHelper.itemRender(sigilEnderSeverance, 0); - renderHelper.itemRender(sigilEnderSeverance, 1); - - renderHelper.itemRender(sigilTeleposition); - renderHelper.itemRender(sigilTransposition); +// renderHelper.itemRender(sigilDivination); +// renderHelper.itemRender(sigilAir); +// renderHelper.itemRender(sigilWater); +// renderHelper.itemRender(sigilLava); +// renderHelper.itemRender(sigilVoid); +// renderHelper.itemRender(sigilGreenGrove, 0); +// renderHelper.itemRender(sigilGreenGrove, 1); +// renderHelper.itemRender(sigilBloodLight); +// renderHelper.itemRender(sigilElementalAffinity, 0); +// renderHelper.itemRender(sigilElementalAffinity, 1); +// renderHelper.itemRender(sigilMagnetism, 0); +// renderHelper.itemRender(sigilMagnetism, 1); +// renderHelper.itemRender(sigilSuppression, 0); +// renderHelper.itemRender(sigilSuppression, 1); +// renderHelper.itemRender(sigilHaste, 0); +// renderHelper.itemRender(sigilHaste, 1); +// renderHelper.itemRender(sigilFastMiner, 0); +// renderHelper.itemRender(sigilFastMiner, 1); +// renderHelper.itemRender(sigilSeer); +// renderHelper.itemRender(sigilPhantomBridge, 0); +// renderHelper.itemRender(sigilPhantomBridge, 1); +// renderHelper.itemRender(sigilWhirlwind, 0); +// renderHelper.itemRender(sigilWhirlwind, 1); +// renderHelper.itemRender(sigilCompression, 0); +// renderHelper.itemRender(sigilCompression, 1); +// renderHelper.itemRender(sigilEnderSeverance, 0); +// renderHelper.itemRender(sigilEnderSeverance, 1); +// +// renderHelper.itemRender(sigilTeleposition); +// renderHelper.itemRender(sigilTransposition); renderHelper.itemRender(sentientBow, 0, "ItemSentientBow"); renderHelper.itemRender(sentientBow, 1, "ItemSentientBow_pulling_0"); diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilAir.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilAir.json new file mode 100644 index 00000000..32f44849 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilAir.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/AirSigil" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilBloodLight.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilBloodLight.json new file mode 100644 index 00000000..dc5b4f19 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilBloodLight.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/BloodLightSigil" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilCompression.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilCompression.json new file mode 100644 index 00000000..ad29944e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilCompression.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/CompressionSigil_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/CompressionSigil_activated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilDivination.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilDivination.json new file mode 100644 index 00000000..184354d6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilDivination.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/DivinationSigil" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilElementalAffinity.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilElementalAffinity.json new file mode 100644 index 00000000..313bbfe2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilElementalAffinity.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/ElementalSigil_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/ElementalSigil_activated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilEnderSeverance.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilEnderSeverance.json new file mode 100644 index 00000000..9c73f810 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilEnderSeverance.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/SigilOfSeverance_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/SigilOfSeverance_activated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilFastMiner.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilFastMiner.json new file mode 100644 index 00000000..2c22c801 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilFastMiner.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/MiningSigil_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/MiningSigil_activated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilGreenGrove.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilGreenGrove.json new file mode 100644 index 00000000..b1bfb321 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilGreenGrove.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/GrowthSigil_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/GrowthSigil_activated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilHaste.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilHaste.json new file mode 100644 index 00000000..39b9302a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilHaste.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/HasteSigil_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/HasteSigil_activated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilLava.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilLava.json new file mode 100644 index 00000000..fde7dbbc --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilLava.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/LavaSigil" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilMagnetism.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilMagnetism.json new file mode 100644 index 00000000..8a3a3967 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilMagnetism.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/SigilOfMagnetism_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/SigilOfMagnetism_activated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilPhantomBridge.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilPhantomBridge.json new file mode 100644 index 00000000..e37bf040 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilPhantomBridge.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/BridgeSigil_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/BridgeSigil_activated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilSeer.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilSeer.json new file mode 100644 index 00000000..26097e59 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilSeer.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/SeerSigil" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilSuppression.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilSuppression.json new file mode 100644 index 00000000..b48d90eb --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilSuppression.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/SigilOfSuppression_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/SigilOfSuppression_activated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilTeleposition.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilTeleposition.json new file mode 100644 index 00000000..84d1fe93 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilTeleposition.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/TelepositionSigil" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilTransposition.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilTransposition.json new file mode 100644 index 00000000..bb09cc7d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilTransposition.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/TranspositionSigil" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilVoid.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilVoid.json new file mode 100644 index 00000000..4bc0194f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilVoid.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/VoidSigil" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilWater.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilWater.json new file mode 100644 index 00000000..9f76d28b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilWater.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/WaterSigil" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilWhirlwind.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilWhirlwind.json new file mode 100644 index 00000000..6c9faba0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSigilWhirlwind.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/WindSigil_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/WindSigil_activated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilAir.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilAir.json deleted file mode 100644 index 0a364e26..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilAir.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/AirSigil" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilBloodLight.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilBloodLight.json deleted file mode 100644 index b2afa1f9..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilBloodLight.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/BloodLightSigil" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilCompression0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilCompression0.json deleted file mode 100644 index 5cedc426..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilCompression0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/CompressionSigil_deactivated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilCompression1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilCompression1.json deleted file mode 100644 index 87ee0111..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilCompression1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/CompressionSigil_activated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilDivination.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilDivination.json deleted file mode 100644 index f448a41c..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilDivination.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/DivinationSigil" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilElementalAffinity0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilElementalAffinity0.json deleted file mode 100644 index e1d198bc..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilElementalAffinity0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ElementalSigil_deactivated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilElementalAffinity1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilElementalAffinity1.json deleted file mode 100644 index 6fd9676d..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilElementalAffinity1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ElementalSigil_activated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilEnderSeverance0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilEnderSeverance0.json deleted file mode 100644 index 544f221e..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilEnderSeverance0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SigilOfSeverance_deactivated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilEnderSeverance1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilEnderSeverance1.json deleted file mode 100644 index b24c7d40..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilEnderSeverance1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SigilOfSeverance_activated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilFastMiner0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilFastMiner0.json deleted file mode 100644 index de229b76..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilFastMiner0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/MiningSigil_deactivated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilFastMiner1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilFastMiner1.json deleted file mode 100644 index 90fb872a..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilFastMiner1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/MiningSigil_activated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilGreenGrove0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilGreenGrove0.json deleted file mode 100644 index da5b6618..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilGreenGrove0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/GrowthSigil_deactivated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilGreenGrove1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilGreenGrove1.json deleted file mode 100644 index 2da2510b..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilGreenGrove1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/GrowthSigil_activated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilHaste0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilHaste0.json deleted file mode 100644 index 9c794854..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilHaste0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/HasteSigil_deactivated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilHaste1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilHaste1.json deleted file mode 100644 index 6d4668c8..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilHaste1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/HasteSigil_activated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilLava.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilLava.json deleted file mode 100644 index 47e917b0..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilLava.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/LavaSigil" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilMagnetism0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilMagnetism0.json deleted file mode 100644 index 3079c7c5..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilMagnetism0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SigilOfMagnetism_deactivated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilMagnetism1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilMagnetism1.json deleted file mode 100644 index b0645b92..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilMagnetism1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SigilOfMagnetism_activated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilPhantomBridge0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilPhantomBridge0.json deleted file mode 100644 index 54b3a576..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilPhantomBridge0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/BridgeSigil_deactivated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilPhantomBridge1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilPhantomBridge1.json deleted file mode 100644 index 076581f4..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilPhantomBridge1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/BridgeSigil_activated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilSeer.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilSeer.json deleted file mode 100644 index 5a8dc352..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilSeer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SeerSigil" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilSuppression0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilSuppression0.json deleted file mode 100644 index 0f12d2a7..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilSuppression0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SigilOfSuppression_deactivated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilSuppression1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilSuppression1.json deleted file mode 100644 index 00cc0eb9..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilSuppression1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SigilOfSuppression_activated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilTeleposition.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilTeleposition.json deleted file mode 100644 index a71f8b4e..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilTeleposition.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/TelepositionSigil" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilTransposition.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilTransposition.json deleted file mode 100644 index 84367a33..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilTransposition.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/TranspositionSigil" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilVoid.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilVoid.json deleted file mode 100644 index b5abefdc..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilVoid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/VoidSigil" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilWater.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilWater.json deleted file mode 100644 index 7fdeb012..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilWater.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/WaterSigil" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilWhirlwind0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilWhirlwind0.json deleted file mode 100644 index d592a7b8..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilWhirlwind0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/WindSigil_deactivated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSigilWhirlwind1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSigilWhirlwind1.json deleted file mode 100644 index c723292c..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSigilWhirlwind1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/WindSigil_activated" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemUpgradeTrainer.json b/src/main/resources/assets/bloodmagic/models/item/ItemUpgradeTrainer.json deleted file mode 100644 index 71ff2c57..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemUpgradeTrainer.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/UpgradeTrainer" - } -} -