From 4f6f3860c06ca2f9f5dbf12d3789d1b3c5272e52 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 29 Mar 2016 13:25:00 -0400 Subject: [PATCH] Added Sentient Bow textures and models. Not the most elegant method. --- changelog.txt | 1 + .../bloodmagic/item/soul/ItemSentientBow.java | 100 +++++++++++++- .../bloodmagic/registry/ModItems.java | 65 +++++++-- .../blockstates/item/ItemSentientBow.json | 21 +-- .../models/item/ItemSentientBow.json | 129 +++++++++++++++++- .../item/bow/ItemSentientBow_corrosive.json | 28 ++++ .../ItemSentientBow_corrosive_pulling_0.json | 28 ++++ .../ItemSentientBow_corrosive_pulling_1.json | 28 ++++ .../ItemSentientBow_corrosive_pulling_2.json | 29 ++++ .../item/bow/ItemSentientBow_destructive.json | 28 ++++ ...ItemSentientBow_destructive_pulling_0.json | 28 ++++ ...ItemSentientBow_destructive_pulling_1.json | 28 ++++ ...ItemSentientBow_destructive_pulling_2.json | 29 ++++ .../{ => bow}/ItemSentientBow_pulling_0.json | 0 .../{ => bow}/ItemSentientBow_pulling_1.json | 0 .../{ => bow}/ItemSentientBow_pulling_2.json | 0 .../item/bow/ItemSentientBow_steadfast.json | 28 ++++ .../ItemSentientBow_steadfast_pulling_0.json | 28 ++++ .../ItemSentientBow_steadfast_pulling_1.json | 28 ++++ .../ItemSentientBow_steadfast_pulling_2.json | 29 ++++ .../item/bow/ItemSentientBow_vengeful.json | 28 ++++ .../ItemSentientBow_vengeful_pulling_0.json | 28 ++++ .../ItemSentientBow_vengeful_pulling_1.json | 28 ++++ .../ItemSentientBow_vengeful_pulling_2.json | 29 ++++ 24 files changed, 742 insertions(+), 26 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_0.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_1.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_2.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_0.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_1.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_2.json rename src/main/resources/assets/bloodmagic/models/item/{ => bow}/ItemSentientBow_pulling_0.json (100%) rename src/main/resources/assets/bloodmagic/models/item/{ => bow}/ItemSentientBow_pulling_1.json (100%) rename src/main/resources/assets/bloodmagic/models/item/{ => bow}/ItemSentientBow_pulling_2.json (100%) create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_0.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_1.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_2.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_0.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_1.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_2.json diff --git a/changelog.txt b/changelog.txt index 0ba3b188..63265e4c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -6,6 +6,7 @@ Version 2.0.0-27 - Allowed the Sentient Sword to use different wills, and change its colour based on the used one. Also made it so you do not toggle it by right clicking, but it simply rechecks itself when you smack something and when you right-click. - Fixed item binding. Yusssss. +- Added Sword, Armour, and Bow texture changes when you have different demonic will in your inventory. ------------------------------------------------------ Version 2.0.0-23 diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 8d17f723..c26c9cf3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -11,7 +11,9 @@ import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemArrow; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.StatList; +import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; @@ -20,9 +22,13 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.iface.IMultiWillTool; +import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.registry.ModItems; -public class ItemSentientBow extends ItemBow +public class ItemSentientBow extends ItemBow implements IMultiWillTool//, IMeshProvider { public ItemSentientBow() { @@ -53,6 +59,98 @@ public class ItemSentientBow extends ItemBow return entityIn != null && entityIn.isHandActive() && entityIn.getActiveItemStack() == stack ? 1.0F : 0.0F; } }); + this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() + { + @SideOnly(Side.CLIENT) + public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) + { + return ((ItemSentientBow) ModItems.sentientBow).getCurrentType(stack).ordinal(); + } + }); + } + +// @Override +// @SideOnly(Side.CLIENT) +// public ItemMeshDefinition getMeshDefinition() +// { +// return new ItemMeshDefinition() +// { +// @Override +// public ModelResourceLocation getModelLocation(ItemStack stack) +// { +// assert getCustomLocation() != null; +// EnumDemonWillType type = ((ItemSentientBow) ModItems.sentientBow).getCurrentType(stack); +// String additional = type.getName().toLowerCase(); +// return new ModelResourceLocation(getCustomLocation(), "type=" + additional); +// } +// }; +// } +// +// @Override +// public ResourceLocation getCustomLocation() +// { +// return new ResourceLocation(Constants.Mod.MODID, "item/ItemSentientBow"); +// } +// +// @Override +// public List getVariants() +// { +// List ret = new ArrayList(); +// for (EnumDemonWillType type : EnumDemonWillType.values()) +// { +// String additional = type.getName().toLowerCase(); +// +// ret.add("type=" + additional); +// } +// +// return ret; +// } + + public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) + { + EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); +// double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); + this.setCurrentType(stack, type); +// int level = getLevel(stack, soulsRemaining); +// +// double drain = level >= 0 ? soulDrainPerSwing[level] : 0; +// double extraDamage = level >= 0 ? damageAdded[level] : 0; +// +// setDrainOfActivatedSword(stack, drain); +// setDamageOfActivatedSword(stack, 7 + extraDamage); +// setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); +// setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); + } + + @Override + public EnumDemonWillType getCurrentType(ItemStack stack) + { + NBTHelper.checkNBT(stack); + + NBTTagCompound tag = stack.getTagCompound(); + + if (!tag.hasKey(Constants.NBT.WILL_TYPE)) + { + return EnumDemonWillType.DEFAULT; + } + + return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE)); + } + + public void setCurrentType(ItemStack stack, EnumDemonWillType type) + { + NBTHelper.checkNBT(stack); + + NBTTagCompound tag = stack.getTagCompound(); + + tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + } + + @Override + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) + { + this.recalculatePowers(stack, world, player); + return super.onItemRightClick(stack, world, player, hand); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index 5227f9ce..0275c0c3 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -1,25 +1,68 @@ package WayofTime.bloodmagic.registry; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.common.registry.GameRegistry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.orb.BloodOrb; import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.item.*; +import WayofTime.bloodmagic.item.ItemActivationCrystal; +import WayofTime.bloodmagic.item.ItemAltarMaker; +import WayofTime.bloodmagic.item.ItemArcaneAshes; +import WayofTime.bloodmagic.item.ItemBloodOrb; +import WayofTime.bloodmagic.item.ItemBloodShard; +import WayofTime.bloodmagic.item.ItemBoundAxe; +import WayofTime.bloodmagic.item.ItemBoundPickaxe; +import WayofTime.bloodmagic.item.ItemBoundShovel; +import WayofTime.bloodmagic.item.ItemBoundSword; +import WayofTime.bloodmagic.item.ItemBucketEssence; +import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.ItemDaggerOfSacrifice; +import WayofTime.bloodmagic.item.ItemDemonCrystal; +import WayofTime.bloodmagic.item.ItemInscriptionTool; +import WayofTime.bloodmagic.item.ItemLavaCrystal; +import WayofTime.bloodmagic.item.ItemRitualDiviner; +import WayofTime.bloodmagic.item.ItemSacrificialDagger; +import WayofTime.bloodmagic.item.ItemSlate; +import WayofTime.bloodmagic.item.ItemTelepositionFocus; +import WayofTime.bloodmagic.item.ItemUpgradeTome; +import WayofTime.bloodmagic.item.ItemUpgradeTrainer; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice; import WayofTime.bloodmagic.item.routing.ItemNodeRouter; import WayofTime.bloodmagic.item.routing.ItemRouterFilter; -import WayofTime.bloodmagic.item.sigil.*; -import WayofTime.bloodmagic.item.soul.*; +import WayofTime.bloodmagic.item.sigil.ItemSigilAir; +import WayofTime.bloodmagic.item.sigil.ItemSigilBloodLight; +import WayofTime.bloodmagic.item.sigil.ItemSigilCompression; +import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; +import WayofTime.bloodmagic.item.sigil.ItemSigilElementalAffinity; +import WayofTime.bloodmagic.item.sigil.ItemSigilEnderSeverance; +import WayofTime.bloodmagic.item.sigil.ItemSigilFastMiner; +import WayofTime.bloodmagic.item.sigil.ItemSigilGreenGrove; +import WayofTime.bloodmagic.item.sigil.ItemSigilHaste; +import WayofTime.bloodmagic.item.sigil.ItemSigilLava; +import WayofTime.bloodmagic.item.sigil.ItemSigilMagnetism; +import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge; +import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; +import WayofTime.bloodmagic.item.sigil.ItemSigilSuppression; +import WayofTime.bloodmagic.item.sigil.ItemSigilTeleposition; +import WayofTime.bloodmagic.item.sigil.ItemSigilTransposition; +import WayofTime.bloodmagic.item.sigil.ItemSigilVoid; +import WayofTime.bloodmagic.item.sigil.ItemSigilWater; +import WayofTime.bloodmagic.item.sigil.ItemSigilWhirlwind; +import WayofTime.bloodmagic.item.soul.ItemMonsterSoul; +import WayofTime.bloodmagic.item.soul.ItemSentientArmourGem; +import WayofTime.bloodmagic.item.soul.ItemSentientBow; +import WayofTime.bloodmagic.item.soul.ItemSentientSword; +import WayofTime.bloodmagic.item.soul.ItemSoulGem; +import WayofTime.bloodmagic.item.soul.ItemSoulSnare; import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.fml.common.registry.GameRegistry; public class ModItems { @@ -212,9 +255,9 @@ public class ModItems renderHelper.itemRender(bucketEssence); renderHelper.itemRender(sentientBow, 0, "ItemSentientBow"); - renderHelper.itemRender(sentientBow, 1, "ItemSentientBow_pulling_0"); - renderHelper.itemRender(sentientBow, 2, "ItemSentientBow_pulling_1"); - renderHelper.itemRender(sentientBow, 3, "ItemSentientBow_pulling_2"); +// renderHelper.itemRender(sentientBow, 1, "ItemSentientBow_pulling_0"); +// renderHelper.itemRender(sentientBow, 2, "ItemSentientBow_pulling_1"); +// renderHelper.itemRender(sentientBow, 3, "ItemSentientBow_pulling_2"); renderHelper.itemRender(sentientArmourGem, 0, "ItemSentientArmourGem0"); renderHelper.itemRender(sentientArmourGem, 1, "ItemSentientArmourGem1"); diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientBow.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientBow.json index bff133aa..4ae06da9 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientBow.json +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientBow.json @@ -2,28 +2,31 @@ "forge_marker": 1, "defaults": { "model": "builtin/generated", - "transform": "forge:default-item" + "transform": "forge:default-tool" }, "variants": { "type": { - "still": { + "default": { + "model": "bloodmagic:item/ItemSentientBow" + }, + "corrosive": { "textures": { - "layer0": "bloodmagic:items/SentientBow" + "layer0": "bloodmagic:items/SentientBow_corrosive" } }, - "pull0": { + "destructive": { "textures": { - "layer0": "bloodmagic:items/SentientBow_pulling_0" + "layer0": "bloodmagic:items/SentientBow_destructive" } }, - "pull1": { + "vengeful": { "textures": { - "layer0": "bloodmagic:items/SentientBow_pulling_1" + "layer0": "bloodmagic:items/SentientBow_vengeful" } }, - "pull2": { + "steadfast": { "textures": { - "layer0": "bloodmagic:items/SentientBow_pulling_2" + "layer0": "bloodmagic:items/SentientBow_steadfast" } } } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSentientBow.json b/src/main/resources/assets/bloodmagic/models/item/ItemSentientBow.json index 5fa6f964..94066618 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSentientBow.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemSentientBow.json @@ -26,25 +26,144 @@ } }, "overrides": [ - { + { "predicate": { - "pulling": 1 + "type": 1 }, - "model": "bloodmagic:item/ItemSentientBow_pulling_0" + "model": "bloodmagic:item/bow/ItemSentientBow_corrosive" }, { "predicate": { + "type": 2 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_destructive" + }, + { + "predicate": { + "type": 3 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_vengeful" + }, + { + "predicate": { + "type": 4 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_steadfast" + }, + { + "predicate": { + "type": 0, + "pulling": 1 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_pulling_0" + }, + { + "predicate": { + "type": 1, + "pulling": 1 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_corrosive_pulling_0" + }, + { + "predicate": { + "type": 2, + "pulling": 1 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_destructive_pulling_0" + }, + { + "predicate": { + "type": 3, + "pulling": 1 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_vengeful_pulling_0" + }, + { + "predicate": { + "type": 4, + "pulling": 1 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_steadfast_pulling_0" + }, + { + "predicate": { + "type": 0, "pulling": 1, "pull": 0.65 }, - "model": "bloodmagic:item/ItemSentientBow_pulling_1" + "model": "bloodmagic:item/bow/ItemSentientBow_pulling_1" }, { "predicate": { + "type": 1, + "pulling": 1, + "pull": 0.65 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_corrosive_pulling_1" + }, + { + "predicate": { + "type": 2, + "pulling": 1, + "pull": 0.65 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_destructive_pulling_1" + }, + { + "predicate": { + "type": 3, + "pulling": 1, + "pull": 0.65 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_vengeful_pulling_1" + }, + { + "predicate": { + "type": 4, + "pulling": 1, + "pull": 0.65 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_steadfast_pulling_1" + }, + { + "predicate": { + "type": 0, + "pulling": 1, + "pull": 0.9 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_pulling_2" + }, + { + "predicate": { + "type": 1, "pulling": 1, "pull": 0.9 }, - "model": "bloodmagic:item/ItemSentientBow_pulling_2" + "model": "bloodmagic:item/bow/ItemSentientBow_corrosive_pulling_2" + }, + { + "predicate": { + "type": 2, + "pulling": 1, + "pull": 0.9 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_destructive_pulling_2" + }, + { + "predicate": { + "type": 3, + "pulling": 1, + "pull": 0.9 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_vengeful_pulling_2" + }, + { + "predicate": { + "type": 4, + "pulling": 1, + "pull": 0.9 + }, + "model": "bloodmagic:item/bow/ItemSentientBow_steadfast_pulling_2" } ] } diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive.json new file mode 100644 index 00000000..0f5ae214 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_corrosive" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_0.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_0.json new file mode 100644 index 00000000..e271c35f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_0.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_corrosive_pulling_0" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_1.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_1.json new file mode 100644 index 00000000..10c92cc6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_1.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_corrosive_pulling_1" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_2.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_2.json new file mode 100644 index 00000000..b8599446 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_corrosive_pulling_2.json @@ -0,0 +1,29 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_corrosive_pulling_2" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive.json new file mode 100644 index 00000000..e9b94f1b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_destructive" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_0.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_0.json new file mode 100644 index 00000000..06f33bc6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_0.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_destructive_pulling_0" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_1.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_1.json new file mode 100644 index 00000000..ef5cb818 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_1.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_destructive_pulling_1" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_2.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_2.json new file mode 100644 index 00000000..0ce0bb52 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_destructive_pulling_2.json @@ -0,0 +1,29 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_destructive_pulling_2" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSentientBow_pulling_0.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_pulling_0.json similarity index 100% rename from src/main/resources/assets/bloodmagic/models/item/ItemSentientBow_pulling_0.json rename to src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_pulling_0.json diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSentientBow_pulling_1.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_pulling_1.json similarity index 100% rename from src/main/resources/assets/bloodmagic/models/item/ItemSentientBow_pulling_1.json rename to src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_pulling_1.json diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSentientBow_pulling_2.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_pulling_2.json similarity index 100% rename from src/main/resources/assets/bloodmagic/models/item/ItemSentientBow_pulling_2.json rename to src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_pulling_2.json diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast.json new file mode 100644 index 00000000..7cd37a46 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_steadfast" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_0.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_0.json new file mode 100644 index 00000000..03ac3941 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_0.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_steadfast_pulling_0" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_1.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_1.json new file mode 100644 index 00000000..fad82f89 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_1.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_steadfast_pulling_1" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_2.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_2.json new file mode 100644 index 00000000..53cd4281 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_steadfast_pulling_2.json @@ -0,0 +1,29 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_steadfast_pulling_2" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful.json new file mode 100644 index 00000000..4d9876eb --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_vengeful" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_0.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_0.json new file mode 100644 index 00000000..de5f6833 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_0.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_vengeful_pulling_0" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_1.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_1.json new file mode 100644 index 00000000..f77b1508 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_1.json @@ -0,0 +1,28 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_vengeful_pulling_1" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_2.json b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_2.json new file mode 100644 index 00000000..618b904d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/bow/ItemSentientBow_vengeful_pulling_2.json @@ -0,0 +1,29 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "bloodmagic:items/SentientBow_vengeful_pulling_2" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} +