From 04c0c32188ab632437db3233c68ea1a680c8f0fd Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 10 Feb 2016 18:49:02 -0800 Subject: [PATCH] More work on moving models into ItemStates --- .../bloodmagic/registry/ModItems.java | 143 ++++++++++-------- .../item/ItemActivationCrystal.json | 26 ++++ .../blockstates/item/ItemBloodShard.json | 21 +++ .../blockstates/item/ItemComponent.json | 76 ++++++++++ .../item/ItemDaggerOfSacrifice.json | 16 ++ .../blockstates/item/ItemInscriptionTool.json | 41 +++++ .../blockstates/item/ItemLavaCrystal.json | 16 ++ .../blockstates/item/ItemLivingArmour.json | 31 ++++ .../blockstates/item/ItemNodeRouter.json | 16 ++ .../blockstates/item/ItemPackSacrifice.json | 16 ++ .../item/ItemPackSelfSacrifice.json | 16 ++ .../blockstates/item/ItemRitualDiviner.json | 26 ++++ .../blockstates/item/ItemRouterFilter.json | 31 ++++ .../item/ItemSacrificialDagger.json | 21 +++ .../blockstates/item/ItemSentientArmour.json | 31 ++++ .../item/ItemSentientArmourGem.json | 21 +++ .../blockstates/item/ItemSentientBow.json | 31 ++++ .../blockstates/item/ItemSlate.json | 36 +++++ .../item/ItemTelepositionFocus.json | 31 ++++ .../models/item/ItemActivationCrystal0.json | 6 - .../models/item/ItemActivationCrystal1.json | 6 - .../models/item/ItemActivationCrystal2.json | 6 - .../models/item/ItemAltarMaker.json | 6 - .../models/item/ItemArcaneAshes.json | 6 - .../models/item/ItemBloodShard0.json | 6 - .../models/item/ItemBloodShard1.json | 6 - .../models/item/ItemComponent0.json | 7 - .../models/item/ItemComponent1.json | 8 - .../models/item/ItemComponent10.json | 7 - .../models/item/ItemComponent11.json | 6 - .../models/item/ItemComponent12.json | 10 -- .../models/item/ItemComponent2.json | 9 -- .../models/item/ItemComponent3.json | 9 -- .../models/item/ItemComponent4.json | 9 -- .../models/item/ItemComponent5.json | 9 -- .../models/item/ItemComponent6.json | 9 -- .../models/item/ItemComponent7.json | 10 -- .../models/item/ItemComponent8.json | 6 - .../models/item/ItemComponent9.json | 6 - .../models/item/ItemDaggerOfSacrifice.json | 6 - .../models/item/ItemInscriptionTool1.json | 6 - .../models/item/ItemInscriptionTool2.json | 6 - .../models/item/ItemInscriptionTool3.json | 6 - .../models/item/ItemInscriptionTool4.json | 6 - .../models/item/ItemInscriptionTool5.json | 6 - .../models/item/ItemInscriptionTool6.json | 6 - .../models/item/ItemLavaCrystal.json | 7 - .../models/item/ItemLivingArmour0.json | 7 - .../models/item/ItemLivingArmour1.json | 8 - .../models/item/ItemLivingArmour2.json | 7 - .../models/item/ItemLivingArmour3.json | 7 - .../models/item/ItemMonsterSoul0.json | 7 - .../models/item/ItemNodeRouter.json | 11 -- .../models/item/ItemPackSacrifice.json | 6 - .../models/item/ItemPackSelfSacrifice.json | 6 - .../models/item/ItemRitualDiviner0.json | 7 - .../models/item/ItemRitualDiviner1.json | 8 - .../models/item/ItemRitualDiviner2.json | 8 - .../models/item/ItemRouterFilter0.json | 6 - .../models/item/ItemRouterFilter1.json | 7 - .../models/item/ItemRouterFilter2.json | 7 - .../models/item/ItemRouterFilter3.json | 7 - .../models/item/ItemSacrificialDagger0.json | 6 - .../models/item/ItemSacrificialDagger1.json | 6 - .../models/item/ItemSentientArmour0.json | 8 - .../models/item/ItemSentientArmour1.json | 9 -- .../models/item/ItemSentientArmour2.json | 8 - .../models/item/ItemSentientArmour3.json | 8 - .../bloodmagic/models/item/ItemSlate0.json | 6 - .../bloodmagic/models/item/ItemSlate1.json | 6 - .../bloodmagic/models/item/ItemSlate2.json | 6 - .../bloodmagic/models/item/ItemSlate3.json | 6 - .../bloodmagic/models/item/ItemSlate4.json | 6 - .../bloodmagic/models/item/ItemSoulSnare.json | 6 - .../models/item/ItemTelepositionFocus0.json | 6 - .../models/item/ItemTelepositionFocus1.json | 6 - .../models/item/ItemTelepositionFocus2.json | 6 - .../models/item/ItemTelepositionFocus3.json | 6 - .../models/item/ItemUpgradeTome.json | 7 - ...m_ethereal_slate.png => EtherealSlate.png} | Bin 80 files changed, 583 insertions(+), 480 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemActivationCrystal.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemBloodShard.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemDaggerOfSacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemInscriptionTool.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemLavaCrystal.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemLivingArmour.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemNodeRouter.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemPackSacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemPackSelfSacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemRitualDiviner.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemRouterFilter.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSacrificialDagger.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientArmour.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientArmourGem.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientBow.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemSlate.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/item/ItemTelepositionFocus.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal2.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemAltarMaker.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemArcaneAshes.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemBloodShard0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemBloodShard1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent10.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent11.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent12.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent2.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent3.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent4.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent5.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent6.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent7.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent8.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemComponent9.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemDaggerOfSacrifice.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool2.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool3.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool4.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool5.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool6.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemLavaCrystal.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour2.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour3.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemMonsterSoul0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemNodeRouter.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemPackSacrifice.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemPackSelfSacrifice.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner2.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter2.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter3.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour2.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour3.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSlate0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSlate1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSlate2.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSlate3.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSlate4.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSoulSnare.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus0.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus1.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus2.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus3.json delete mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemUpgradeTome.json rename src/main/resources/assets/bloodmagic/textures/items/{baseItem_ethereal_slate.png => EtherealSlate.png} (100%) diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index d37b269c..bfdd3a2b 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.registry; +import WayofTime.bloodmagic.api.ritual.EnumRuneType; import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; @@ -231,6 +232,85 @@ public class ModItems InventoryRenderHelper renderHelper = BloodMagic.proxy.getRenderHelper(); InventoryRenderHelperV2 renderHelperV2 = BloodMagic.proxy.getRenderHelperV2(); + renderHelperV2.registerRender(altarMaker, "altarMaker"); + renderHelperV2.registerRender(upgradeTome, "upgradeTome"); + + 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(slate, 0, "blank"); + renderHelperV2.registerRender(slate, 1, "reinforced"); + renderHelperV2.registerRender(slate, 2, "imbued"); + renderHelperV2.registerRender(slate, 3, "demonic"); + renderHelperV2.registerRender(slate, 4, "ethereal"); + + 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"); + renderHelperV2.registerRender(livingArmourBoots, "ItemLivingArmour", "boots"); + + renderHelperV2.registerRender(sentientArmourHelmet, "ItemSentientArmour", "helm"); + renderHelperV2.registerRender(sentientArmourChest, "ItemSentientArmour", "chest"); + 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)); + + 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")); @@ -241,35 +321,6 @@ public class ModItems renderHelper.itemRender(bucketEssence); - renderHelper.itemRender(activationCrystal, 0); - renderHelper.itemRender(activationCrystal, 1); - renderHelper.itemRender(activationCrystal, 2, "ItemActivationCrystal0"); - - renderHelper.itemRender(slate, 0); - renderHelper.itemRender(slate, 1); - renderHelper.itemRender(slate, 2); - renderHelper.itemRender(slate, 3); - renderHelper.itemRender(slate, 4); - - renderHelper.itemRender(inscriptionTool, 1); - renderHelper.itemRender(inscriptionTool, 2); - renderHelper.itemRender(inscriptionTool, 3); - renderHelper.itemRender(inscriptionTool, 4); - renderHelper.itemRender(inscriptionTool, 5); - renderHelper.itemRender(inscriptionTool, 6); - - renderHelper.itemRender(sacrificialDagger, 0); - renderHelper.itemRender(sacrificialDagger, 1); - renderHelper.itemRender(packSacrifice); - renderHelper.itemRender(packSelfSacrifice); - renderHelper.itemRender(daggerOfSacrifice); - - renderHelper.itemRender(ritualDiviner, 0); - renderHelper.itemRender(ritualDiviner, 1); - renderHelper.itemRender(ritualDiviner, 2); - - renderHelper.itemRender(lavaCrystal); - renderHelper.customItemRender(boundSword, 0); renderHelper.customItemRender(boundSword, 1); renderHelper.customItemRender(boundPickaxe, 0); @@ -307,38 +358,6 @@ public class ModItems renderHelper.itemRender(sigilEnderSeverance, 0); renderHelper.itemRender(sigilEnderSeverance, 1); - for (int i = 0; i < ItemComponent.getNames().size(); i++) - renderHelper.itemRender(itemComponent, i); - for (int i = 0; i < ItemTelepositionFocus.names.length; i++) - renderHelper.itemRender(telepositionFocus, i); - for (int i = 0; i < ItemRouterFilter.names.length; i++) - renderHelper.itemRender(baseItemFilter, i); - - renderHelper.itemRender(bloodShard, 0); - renderHelper.itemRender(bloodShard, 1); - - renderHelper.itemRender(livingArmourHelmet, "ItemLivingArmour0"); - renderHelper.itemRender(livingArmourChest, "ItemLivingArmour1"); - renderHelper.itemRender(livingArmourLegs, "ItemLivingArmour2"); - renderHelper.itemRender(livingArmourBoots, "ItemLivingArmour3"); - - renderHelper.itemRender(sentientArmourHelmet, "ItemSentientArmour0"); - renderHelper.itemRender(sentientArmourChest, "ItemSentientArmour1"); - renderHelper.itemRender(sentientArmourLegs, "ItemSentientArmour2"); - renderHelper.itemRender(sentientArmourBoots, "ItemSentientArmour3"); - - renderHelperV2.registerRender(altarMaker, "altarMaker"); - renderHelperV2.registerRender(upgradeTome, "upgradeTome"); - - 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"); - renderHelper.customItemRender(sentientSword, 0); renderHelper.customItemRender(sentientSword, 1); renderHelper.itemRender(sentientBow, 0, "ItemSentientBow"); @@ -348,8 +367,6 @@ public class ModItems renderHelper.itemRender(sentientArmourGem, 0, "ItemSentientArmourGem0"); renderHelper.itemRender(sentientArmourGem, 1, "ItemSentientArmourGem1"); - - renderHelper.itemRender(nodeRouter); } private static Item registerItem(Item item, String name) diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemActivationCrystal.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemActivationCrystal.json new file mode 100644 index 00000000..913aa3f8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemActivationCrystal.json @@ -0,0 +1,26 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "weak": { + "textures": { + "layer0": "bloodmagic:items/activationCrystalWeak" + } + }, + "demonic": { + "textures": { + "layer0": "bloodmagic:items/activationCrystalAwakened" + } + }, + "creative": { + "textures": { + "layer0": "bloodmagic:items/activationCrystalCreative" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemBloodShard.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemBloodShard.json new file mode 100644 index 00000000..4cf72004 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemBloodShard.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "weak": { + "textures": { + "layer0": "bloodmagic:items/WeakBloodShard" + } + }, + "demonic": { + "textures": { + "layer0": "bloodmagic:items/DemonBloodShard" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json new file mode 100644 index 00000000..6d0ac297 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json @@ -0,0 +1,76 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "reagentwater": { + "textures": { + "layer0": "bloodmagic:items/ReagentWater" + } + }, + "reagentlava": { + "textures": { + "layer0": "bloodmagic:items/ReagentLava" + } + }, + "reagentair": { + "textures": { + "layer0": "bloodmagic:items/ReagentAir" + } + }, + "reagentfastminer": { + "textures": { + "layer0": "bloodmagic:items/ReagentFastMiner" + } + }, + "reagentvoid": { + "textures": { + "layer0": "bloodmagic:items/ReagentVoid" + } + }, + "reagentgrowth": { + "textures": { + "layer0": "bloodmagic:items/ReagentGrowth" + } + }, + "reagentaffinity": { + "textures": { + "layer0": "bloodmagic:items/ReagentAffinity" + } + }, + "reagentsight": { + "textures": { + "layer0": "bloodmagic:items/ReagentSight" + } + }, + "reagentbinding": { + "textures": { + "layer0": "bloodmagic:items/ReagentBinding" + } + }, + "reagentsuppression": { + "textures": { + "layer0": "bloodmagic:items/ReagentSuppression" + } + }, + "frameparts": { + "textures": { + "layer0": "bloodmagic:items/ComponentFrameParts" + } + }, + "reagentbloodlight": { + "textures": { + "layer0": "bloodmagic:items/ReagentBloodLight" + } + }, + "reagentmagnetism": { + "textures": { + "layer0": "bloodmagic:items/ReagentMagnetism" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemDaggerOfSacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemDaggerOfSacrifice.json new file mode 100644 index 00000000..5cae9434 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemDaggerOfSacrifice.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/DaggerOfSacrifice" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemInscriptionTool.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemInscriptionTool.json new file mode 100644 index 00000000..941bdac9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemInscriptionTool.json @@ -0,0 +1,41 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "water": { + "textures": { + "layer0": "bloodmagic:items/WaterScribeTool" + } + }, + "fire": { + "textures": { + "layer0": "bloodmagic:items/FireScribeTool" + } + }, + "earth": { + "textures": { + "layer0": "bloodmagic:items/EarthScribeTool" + } + }, + "air": { + "textures": { + "layer0": "bloodmagic:items/AirScribeTool" + } + }, + "dusk": { + "textures": { + "layer0": "bloodmagic:items/DuskScribeTool" + } + }, + "dawn": { + "textures": { + "layer0": "bloodmagic:items/DawnScribeTool" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemLavaCrystal.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemLavaCrystal.json new file mode 100644 index 00000000..12890a4d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemLavaCrystal.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/LavaCrystal" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemLivingArmour.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemLivingArmour.json new file mode 100644 index 00000000..9b98942a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemLivingArmour.json @@ -0,0 +1,31 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "helm": { + "textures": { + "layer0": "bloodmagic:items/LivingHelmet" + } + }, + "chest": { + "textures": { + "layer0": "bloodmagic:items/LivingPlate" + } + }, + "legs": { + "textures": { + "layer0": "bloodmagic:items/LivingLeggings" + } + }, + "boots": { + "textures": { + "layer0": "bloodmagic:items/LivingBoots" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemNodeRouter.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemNodeRouter.json new file mode 100644 index 00000000..c9a0de99 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemNodeRouter.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/NodeRouter" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemPackSacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemPackSacrifice.json new file mode 100644 index 00000000..024dc061 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemPackSacrifice.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/BloodPack" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemPackSelfSacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemPackSelfSacrifice.json new file mode 100644 index 00000000..024dc061 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemPackSelfSacrifice.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/BloodPack" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemRitualDiviner.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemRitualDiviner.json new file mode 100644 index 00000000..e60702e6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemRitualDiviner.json @@ -0,0 +1,26 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "basic": { + "textures": { + "layer0": "bloodmagic:items/RitualDiviner" + } + }, + "dusk": { + "textures": { + "layer0": "bloodmagic:items/RitualDiviner" + } + }, + "dawn": { + "textures": { + "layer0": "bloodmagic:items/RitualDiviner" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemRouterFilter.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemRouterFilter.json new file mode 100644 index 00000000..afe3e19d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemRouterFilter.json @@ -0,0 +1,31 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "exact": { + "textures": { + "layer0": "bloodmagic:items/ItemRouterFilterExact" + } + }, + "ignorenbt": { + "textures": { + "layer0": "bloodmagic:items/ItemRouterFilterIgnoreNBT" + } + }, + "moditems": { + "textures": { + "layer0": "bloodmagic:items/ItemRouterFilterModItems" + } + }, + "oredict": { + "textures": { + "layer0": "bloodmagic:items/ItemRouterFilterOreDict" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSacrificialDagger.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSacrificialDagger.json new file mode 100644 index 00000000..1c3cafc2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSacrificialDagger.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/SacrificialDagger" + } + }, + "creative": { + "textures": { + "layer0": "bloodmagic:items/SacrificialDagger" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientArmour.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientArmour.json new file mode 100644 index 00000000..8cc52a58 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientArmour.json @@ -0,0 +1,31 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "helm": { + "textures": { + "layer0": "bloodmagic:items/SentientHelmet" + } + }, + "chest": { + "textures": { + "layer0": "bloodmagic:items/SentientPlate" + } + }, + "legs": { + "textures": { + "layer0": "bloodmagic:items/SentientLeggings" + } + }, + "boots": { + "textures": { + "layer0": "bloodmagic:items/SentientBoots" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientArmourGem.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientArmourGem.json new file mode 100644 index 00000000..4a0cabfb --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientArmourGem.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "activated": { + "textures": { + "layer0": "bloodmagic:items/SentientArmourGem_activated" + } + }, + "deactivated": { + "textures": { + "layer0": "bloodmagic:items/SentientArmourGem_deactivated" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientBow.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientBow.json new file mode 100644 index 00000000..bff133aa --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSentientBow.json @@ -0,0 +1,31 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "still": { + "textures": { + "layer0": "bloodmagic:items/SentientBow" + } + }, + "pull0": { + "textures": { + "layer0": "bloodmagic:items/SentientBow_pulling_0" + } + }, + "pull1": { + "textures": { + "layer0": "bloodmagic:items/SentientBow_pulling_1" + } + }, + "pull2": { + "textures": { + "layer0": "bloodmagic:items/SentientBow_pulling_2" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemSlate.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSlate.json new file mode 100644 index 00000000..7f6f59af --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemSlate.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "blank": { + "textures": { + "layer0": "bloodmagic:items/BlankSlate" + } + }, + "reinforced": { + "textures": { + "layer0": "bloodmagic:items/ReinforcedSlate" + } + }, + "imbued": { + "textures": { + "layer0": "bloodmagic:items/InfusedSlate" + } + }, + "demonic": { + "textures": { + "layer0": "bloodmagic:items/DemonSlate" + } + }, + "ethereal": { + "textures": { + "layer0": "bloodmagic:items/EtherealSlate" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemTelepositionFocus.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemTelepositionFocus.json new file mode 100644 index 00000000..34f21365 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemTelepositionFocus.json @@ -0,0 +1,31 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "weak": { + "textures": { + "layer0": "bloodmagic:items/TeleposerFocus" + } + }, + "enhanced": { + "textures": { + "layer0": "bloodmagic:items/EnhancedTeleposerFocus" + } + }, + "reinforced": { + "textures": { + "layer0": "bloodmagic:items/ReinforcedTeleposerFocus" + } + }, + "demonic": { + "textures": { + "layer0": "bloodmagic:items/DemonicTeleposerFocus" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal0.json b/src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal0.json deleted file mode 100644 index 33e4686b..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/activationCrystalWeak" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal1.json b/src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal1.json deleted file mode 100644 index e663a898..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/activationCrystalAwakened" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal2.json b/src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal2.json deleted file mode 100644 index 33e4686b..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemActivationCrystal2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/activationCrystalWeak" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemAltarMaker.json b/src/main/resources/assets/bloodmagic/models/item/ItemAltarMaker.json deleted file mode 100644 index a97bee66..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemAltarMaker.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/AltarMaker" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemArcaneAshes.json b/src/main/resources/assets/bloodmagic/models/item/ItemArcaneAshes.json deleted file mode 100644 index 2ad74320..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemArcaneAshes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ArcaneAshes" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemBloodShard0.json b/src/main/resources/assets/bloodmagic/models/item/ItemBloodShard0.json deleted file mode 100644 index 14beb6a8..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemBloodShard0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/WeakBloodShard" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemBloodShard1.json b/src/main/resources/assets/bloodmagic/models/item/ItemBloodShard1.json deleted file mode 100644 index c16b9e0a..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemBloodShard1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/DemonBloodShard" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent0.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent0.json deleted file mode 100644 index e435d768..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentWater" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent1.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent1.json deleted file mode 100644 index d389396a..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent1.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentLava" - } -} - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent10.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent10.json deleted file mode 100644 index eb5d894c..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent10.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ComponentFrameParts" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent11.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent11.json deleted file mode 100644 index f6e751bc..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent11.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentBloodLight" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent12.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent12.json deleted file mode 100644 index c7464e1f..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent12.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentMagnetism" - } -} - - - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent2.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent2.json deleted file mode 100644 index 622a237c..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentAir" - } -} - - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent3.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent3.json deleted file mode 100644 index 03cea3d5..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent3.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentFastMiner" - } -} - - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent4.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent4.json deleted file mode 100644 index 2d63c90d..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent4.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentVoid" - } -} - - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent5.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent5.json deleted file mode 100644 index 00f93fbb..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent5.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentGrowth" - } -} - - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent6.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent6.json deleted file mode 100644 index 726e09e0..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent6.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentAffinity" - } -} - - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent7.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent7.json deleted file mode 100644 index 319f96e5..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent7.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentSight" - } -} - - - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent8.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent8.json deleted file mode 100644 index 40b72794..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent8.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentBinding" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent9.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent9.json deleted file mode 100644 index 0ab9eabd..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemComponent9.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReagentSuppression" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemDaggerOfSacrifice.json b/src/main/resources/assets/bloodmagic/models/item/ItemDaggerOfSacrifice.json deleted file mode 100644 index ee7e49c9..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemDaggerOfSacrifice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemToolBase", - "textures": { - "layer0":"bloodmagic:items/DaggerOfSacrifice" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool1.json b/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool1.json deleted file mode 100644 index 89afa758..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/WaterScribeTool" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool2.json b/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool2.json deleted file mode 100644 index 7dd9414d..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/FireScribeTool" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool3.json b/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool3.json deleted file mode 100644 index a1f71a9a..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/EarthScribeTool" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool4.json b/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool4.json deleted file mode 100644 index 1a2908dd..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/AirScribeTool" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool5.json b/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool5.json deleted file mode 100644 index b3d072eb..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/DuskScribeTool" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool6.json b/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool6.json deleted file mode 100644 index 47662bcf..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemInscriptionTool6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/DawnScribeTool" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemLavaCrystal.json b/src/main/resources/assets/bloodmagic/models/item/ItemLavaCrystal.json deleted file mode 100644 index e13168b1..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemLavaCrystal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/LavaCrystal" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour0.json b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour0.json deleted file mode 100644 index 907a2c9d..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/LivingHelmet" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour1.json b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour1.json deleted file mode 100644 index 26e096b2..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour1.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/LivingPlate" - } -} - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour2.json b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour2.json deleted file mode 100644 index 162ff0eb..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/LivingLeggings" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour3.json b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour3.json deleted file mode 100644 index 6f2e8972..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/LivingBoots" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemMonsterSoul0.json b/src/main/resources/assets/bloodmagic/models/item/ItemMonsterSoul0.json deleted file mode 100644 index 9ea0b6d0..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemMonsterSoul0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/BaseMonsterSoul" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemNodeRouter.json b/src/main/resources/assets/bloodmagic/models/item/ItemNodeRouter.json deleted file mode 100644 index ffc393a1..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemNodeRouter.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/NodeRouter" - } -} - - - - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemPackSacrifice.json b/src/main/resources/assets/bloodmagic/models/item/ItemPackSacrifice.json deleted file mode 100644 index 7b97c019..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemPackSacrifice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/BloodPack" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemPackSelfSacrifice.json b/src/main/resources/assets/bloodmagic/models/item/ItemPackSelfSacrifice.json deleted file mode 100644 index 7b97c019..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemPackSelfSacrifice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/BloodPack" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner0.json b/src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner0.json deleted file mode 100644 index a1564a6f..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/RitualDiviner" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner1.json b/src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner1.json deleted file mode 100644 index 71a85bad..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner1.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/RitualDiviner" - } -} - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner2.json b/src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner2.json deleted file mode 100644 index 71a85bad..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemRitualDiviner2.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/RitualDiviner" - } -} - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter0.json b/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter0.json deleted file mode 100644 index 92f4cb34..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ItemRouterFilterExact" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter1.json b/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter1.json deleted file mode 100644 index 7656627c..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ItemRouterFilterIgnoreNBT" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter2.json b/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter2.json deleted file mode 100644 index 5968005c..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ItemRouterFilterModItems" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter3.json b/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter3.json deleted file mode 100644 index 2fa5bd37..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemRouterFilter3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ItemRouterFilterOreDict" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger0.json deleted file mode 100644 index f95990d3..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index f95990d3..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemToolBase", - "textures": { - "layer0":"bloodmagic:items/SacrificialDagger" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour0.json deleted file mode 100644 index 1b49d4f9..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour0.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SentientHelmet" - } -} - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour1.json deleted file mode 100644 index 552531c3..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour1.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SentientPlate" - } -} - - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour2.json b/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour2.json deleted file mode 100644 index 72fe0052..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour2.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SentientLeggings" - } -} - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour3.json b/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour3.json deleted file mode 100644 index f3e0ddeb..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSentientArmour3.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SentientBoots" - } -} - - diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSlate0.json b/src/main/resources/assets/bloodmagic/models/item/ItemSlate0.json deleted file mode 100644 index 0c7b7630..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSlate0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/BlankSlate" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSlate1.json b/src/main/resources/assets/bloodmagic/models/item/ItemSlate1.json deleted file mode 100644 index 59a0e4c1..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSlate1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReinforcedSlate" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSlate2.json b/src/main/resources/assets/bloodmagic/models/item/ItemSlate2.json deleted file mode 100644 index 693f60d9..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSlate2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/InfusedSlate" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSlate3.json b/src/main/resources/assets/bloodmagic/models/item/ItemSlate3.json deleted file mode 100644 index 8fc935a8..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSlate3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/DemonSlate" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSlate4.json b/src/main/resources/assets/bloodmagic/models/item/ItemSlate4.json deleted file mode 100644 index e8f9f9c7..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSlate4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/baseItem_ethereal_slate" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSoulSnare.json b/src/main/resources/assets/bloodmagic/models/item/ItemSoulSnare.json deleted file mode 100644 index c7de2621..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemSoulSnare.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/SoulSnare" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus0.json b/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus0.json deleted file mode 100644 index d639483f..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/TeleposerFocus" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus1.json b/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus1.json deleted file mode 100644 index 0b7b152a..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/EnhancedTeleposerFocus" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus2.json b/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus2.json deleted file mode 100644 index 6380d4cd..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/ReinforcedTeleposerFocus" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus3.json b/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus3.json deleted file mode 100644 index 41d00490..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemTelepositionFocus3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/DemonicTeleposerFocus" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemUpgradeTome.json b/src/main/resources/assets/bloodmagic/models/item/ItemUpgradeTome.json deleted file mode 100644 index 49791ce2..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/ItemUpgradeTome.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"bloodmagic:item/ItemModelBase", - "textures": { - "layer0":"bloodmagic:items/UpgradeTome" - } -} - diff --git a/src/main/resources/assets/bloodmagic/textures/items/baseItem_ethereal_slate.png b/src/main/resources/assets/bloodmagic/textures/items/EtherealSlate.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/baseItem_ethereal_slate.png rename to src/main/resources/assets/bloodmagic/textures/items/EtherealSlate.png