From 7532a982d4cddf44795e858d883bab8ae94199f5 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 4 Feb 2016 18:10:48 -0800 Subject: [PATCH] Fix 3rd person model for tools +Bound Sword -> Bound Blade --- .../resources/assets/bloodmagic/lang/en_US.lang | 3 ++- .../bloodmagic/models/item/ItemBoundAxe0.json | 2 +- .../bloodmagic/models/item/ItemBoundAxe1.json | 2 +- .../bloodmagic/models/item/ItemBoundPickaxe0.json | 2 +- .../bloodmagic/models/item/ItemBoundPickaxe1.json | 2 +- .../bloodmagic/models/item/ItemBoundShovel0.json | 2 +- .../bloodmagic/models/item/ItemBoundShovel1.json | 2 +- .../bloodmagic/models/item/ItemBoundSword0.json | 2 +- .../bloodmagic/models/item/ItemBoundSword1.json | 2 +- .../models/item/ItemDaggerOfSacrifice.json | 2 +- .../models/item/ItemSacrificialDagger0.json | 2 +- .../models/item/ItemSacrificialDagger1.json | 2 +- .../models/item/ItemSentientSword0.json | 2 +- .../models/item/ItemSentientSword1.json | 2 +- .../bloodmagic/models/item/ItemToolBase.json | 15 +++++++++++++++ 15 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemToolBase.json diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index e6cf93a2..7c72a417 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -15,7 +15,7 @@ item.BloodMagic.daggerOfSacrifice.name=Dagger of Sacrifice item.BloodMagic.lavaCrystal.name=Lava Crystal -item.BloodMagic.bound.sword.name=Bound Sword +item.BloodMagic.bound.sword.name=Bound Blade item.BloodMagic.bound.pickaxe.name=Bound Pickaxe item.BloodMagic.bound.axe.name=Bound Axe item.BloodMagic.bound.shovel.name=Bound Shovel @@ -350,3 +350,4 @@ option.BloodMagic.bypassSneak=Bypass Sneak option.BloodMagic.bloodAltar=Blood Altar option.BloodMagic.ritualController=Ritual Stones option.BloodMagic.teleposer=Teleposer +option.BloodMagic.array=Alchemy Array diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemBoundAxe0.json b/src/main/resources/assets/bloodmagic/models/item/ItemBoundAxe0.json index 07e627a3..d1593fd1 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemBoundAxe0.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemBoundAxe0.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/Item_deactivated" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemBoundAxe1.json b/src/main/resources/assets/bloodmagic/models/item/ItemBoundAxe1.json index 5f28033a..933a1d9f 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemBoundAxe1.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemBoundAxe1.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/BoundAxe_activated" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemBoundPickaxe0.json b/src/main/resources/assets/bloodmagic/models/item/ItemBoundPickaxe0.json index 07e627a3..d1593fd1 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemBoundPickaxe0.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemBoundPickaxe0.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/Item_deactivated" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemBoundPickaxe1.json b/src/main/resources/assets/bloodmagic/models/item/ItemBoundPickaxe1.json index 2bb70390..1aab6553 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemBoundPickaxe1.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemBoundPickaxe1.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/BoundPickaxe_activated" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemBoundShovel0.json b/src/main/resources/assets/bloodmagic/models/item/ItemBoundShovel0.json index 07e627a3..d1593fd1 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemBoundShovel0.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemBoundShovel0.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/Item_deactivated" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemBoundShovel1.json b/src/main/resources/assets/bloodmagic/models/item/ItemBoundShovel1.json index 1c266197..cce2b5d2 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemBoundShovel1.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemBoundShovel1.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/BoundShovel_activated" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemBoundSword0.json b/src/main/resources/assets/bloodmagic/models/item/ItemBoundSword0.json index 07e627a3..d1593fd1 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemBoundSword0.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemBoundSword0.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/Item_deactivated" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemBoundSword1.json b/src/main/resources/assets/bloodmagic/models/item/ItemBoundSword1.json index 385bedd9..9fc50a15 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemBoundSword1.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemBoundSword1.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/BoundSword_activated" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemDaggerOfSacrifice.json b/src/main/resources/assets/bloodmagic/models/item/ItemDaggerOfSacrifice.json index 64b3723a..ee7e49c9 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemDaggerOfSacrifice.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemDaggerOfSacrifice.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/DaggerOfSacrifice" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger0.json index 7448972c..f95990d3 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger0.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger0.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/SacrificialDagger" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger1.json index 7448972c..f95990d3 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger1.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger1.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/SacrificialDagger" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSentientSword0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSentientSword0.json index e0e3e6c7..3d8ac57a 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSentientSword0.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemSentientSword0.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/SoulSword_deactivated" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSentientSword1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSentientSword1.json index cbdc8c41..f148c811 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSentientSword1.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemSentientSword1.json @@ -1,5 +1,5 @@ { - "parent":"bloodmagic:item/ItemModelBase", + "parent":"bloodmagic:item/ItemToolBase", "textures": { "layer0":"bloodmagic:items/SoulSword_activated" } diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemToolBase.json b/src/main/resources/assets/bloodmagic/models/item/ItemToolBase.json new file mode 100644 index 00000000..420f57b7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemToolBase.json @@ -0,0 +1,15 @@ +{ + "parent":"builtin/generated", + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file