diff --git a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java index edfcf081..f99ca48c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java @@ -1,48 +1,50 @@ package WayofTime.alchemicalWizardry; +import java.util.ArrayList; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraftforge.fml.common.registry.GameRegistry; import WayofTime.alchemicalWizardry.api.items.ItemSpellMultiTool; import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; -import WayofTime.alchemicalWizardry.common.items.BaseItems; import WayofTime.alchemicalWizardry.common.items.ActivationCrystal; import WayofTime.alchemicalWizardry.common.items.AirScribeTool; import WayofTime.alchemicalWizardry.common.items.ApprenticeBloodOrb; import WayofTime.alchemicalWizardry.common.items.ArchmageBloodOrb; import WayofTime.alchemicalWizardry.common.items.ArmourInhibitor; +import WayofTime.alchemicalWizardry.common.items.BaseItems; import WayofTime.alchemicalWizardry.common.items.BlankSpell; import WayofTime.alchemicalWizardry.common.items.BloodShard; import WayofTime.alchemicalWizardry.common.items.BoundAxe; +import WayofTime.alchemicalWizardry.common.items.BoundBlade; import WayofTime.alchemicalWizardry.common.items.BoundPickaxe; import WayofTime.alchemicalWizardry.common.items.BoundShovel; -import WayofTime.alchemicalWizardry.common.items.CreativeOrb; import WayofTime.alchemicalWizardry.common.items.CreativeDagger; +import WayofTime.alchemicalWizardry.common.items.CreativeOrb; import WayofTime.alchemicalWizardry.common.items.DaggerOfSacrifice; import WayofTime.alchemicalWizardry.common.items.DawnScribeTool; import WayofTime.alchemicalWizardry.common.items.DemonCrystal; import WayofTime.alchemicalWizardry.common.items.DemonicTelepositionFocus; import WayofTime.alchemicalWizardry.common.items.DuskScribeTool; import WayofTime.alchemicalWizardry.common.items.EarthScribeTool; -import WayofTime.alchemicalWizardry.common.items.Orb; import WayofTime.alchemicalWizardry.common.items.EnergyBazooka; import WayofTime.alchemicalWizardry.common.items.EnergyBlaster; -import WayofTime.alchemicalWizardry.common.items.BoundBlade; import WayofTime.alchemicalWizardry.common.items.EnhancedTelepositionFocus; import WayofTime.alchemicalWizardry.common.items.FireScribeTool; import WayofTime.alchemicalWizardry.common.items.ItemAlchemyBase; import WayofTime.alchemicalWizardry.common.items.ItemBloodLetterPack; import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal; import WayofTime.alchemicalWizardry.common.items.ItemComponents; -import WayofTime.alchemicalWizardry.common.items.KeyOfBinding; import WayofTime.alchemicalWizardry.common.items.ItemIncense; import WayofTime.alchemicalWizardry.common.items.ItemRitualDismantler; import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; +import WayofTime.alchemicalWizardry.common.items.KeyOfBinding; import WayofTime.alchemicalWizardry.common.items.LavaCrystal; import WayofTime.alchemicalWizardry.common.items.LifeBucket; import WayofTime.alchemicalWizardry.common.items.MagicianBloodOrb; import WayofTime.alchemicalWizardry.common.items.MasterBloodOrb; +import WayofTime.alchemicalWizardry.common.items.Orb; import WayofTime.alchemicalWizardry.common.items.ReinforcedTelepositionFocus; import WayofTime.alchemicalWizardry.common.items.SacrificialDagger; import WayofTime.alchemicalWizardry.common.items.TelepositionFocus; @@ -53,8 +55,8 @@ import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourEarth; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourFire; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourWater; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourWind; -import WayofTime.alchemicalWizardry.common.items.energy.AlchemicalRouter; import WayofTime.alchemicalWizardry.common.items.energy.AlchemicalCleanser; +import WayofTime.alchemicalWizardry.common.items.energy.AlchemicalRouter; import WayofTime.alchemicalWizardry.common.items.energy.AlchemicalSegmenter; import WayofTime.alchemicalWizardry.common.items.potion.AlchemyFlask; import WayofTime.alchemicalWizardry.common.items.potion.AlchemyReagent; @@ -74,6 +76,7 @@ import WayofTime.alchemicalWizardry.common.items.routing.InputRoutingFocus; import WayofTime.alchemicalWizardry.common.items.routing.OutputRoutingFocus; import WayofTime.alchemicalWizardry.common.items.sigil.SigilAir; import WayofTime.alchemicalWizardry.common.items.sigil.SigilBloodLight; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilCompress; import WayofTime.alchemicalWizardry.common.items.sigil.SigilDivination; import WayofTime.alchemicalWizardry.common.items.sigil.SigilFluid; import WayofTime.alchemicalWizardry.common.items.sigil.SigilHarvest; @@ -88,14 +91,11 @@ import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfTheAssassin; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfTheBridge; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfTheFastMiner; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfWind; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilCompress; import WayofTime.alchemicalWizardry.common.items.sigil.SigilSeer; import WayofTime.alchemicalWizardry.common.items.sigil.SigilVoid; import WayofTime.alchemicalWizardry.common.items.sigil.SigilWater; import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; -import java.util.ArrayList; - /** * Created with IntelliJ IDEA. * User: Pokefenn @@ -401,4 +401,6 @@ public class ModItems return item; } + + } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java index f5450b05..9f33dd25 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java @@ -170,6 +170,8 @@ public class ClientProxy extends CommonProxy MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockSpellModifier), new TESpellModifierBlockItemRenderer()); MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockAlchemicalCalcinator), new TEAlchemicalCalcinatorItemRenderer()); MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockCrystalBelljar), new TEBellJarItemRenderer()); + + InventoryRenderHelper.registerItems(); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java b/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java index 8df1dbe2..7db2fd40 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java @@ -9,6 +9,10 @@ import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.common.items.ItemAlchemyBase; +import WayofTime.alchemicalWizardry.common.items.ItemComponents; +import WayofTime.alchemicalWizardry.common.items.ItemIncense; public class InventoryRenderHelper { @@ -31,6 +35,155 @@ public class InventoryRenderHelper { ModelBakery.addVariantName(item, resName); renderItem.getItemModelMesher().register(item, meta, new ModelResourceLocation(resName, "inventory")); } + + public static void registerItems() + { + registerSimpleItem(ModItems.weakBloodOrb); + registerSimpleItem(ModItems.apprenticeBloodOrb); + registerSimpleItem(ModItems.magicianBloodOrb); + registerSimpleItem(ModItems.masterBloodOrb); + registerSimpleItem(ModItems.archmageBloodOrb); + registerSimpleItem(ModItems.transcendentBloodOrb); + registerToggleItem(ModItems.energyBlaster); + registerToggleItem(ModItems.energySword); + registerSimpleItem(ModItems.lavaCrystal); + registerSimpleItem(ModItems.waterSigil); + registerSimpleItem(ModItems.lavaSigil); + registerSimpleItem(ModItems.voidSigil); + registerSimpleItem(ModItems.blankSlate); + registerSimpleItem(ModItems.reinforcedSlate); + registerSimpleItem(ModItems.sacrificialDagger); + registerSimpleItem(ModItems.daggerOfSacrifice); + registerSimpleItem(ModItems.airSigil); + registerToggleItem(ModItems.sigilOfTheFastMiner); + registerToggleItem(ModItems.sigilOfElementalAffinity); + registerToggleItem(ModItems.sigilOfHaste); + registerToggleItem(ModItems.boundPickaxe); + registerToggleItem(ModItems.boundAxe); + registerToggleItem(ModItems.boundShovel); + registerToggleItem(ModItems.growthSigil); + registerToggleItem(ModItems.sigilOfWind); + registerToggleItem(ModItems.sigilOfTheBridge); + registerToggleItem(ModItems.sigilOfMagnetism); + registerToggleItem(ModItems.energyBazooka); + registerToggleItem(ModItems.itemHarvestSigil); + registerToggleItem(ModItems.itemCompressionSigil); + registerSimpleItem(ModItems.divinationSigil); + registerSimpleItem(ModItems.waterScribeTool); + registerSimpleItem(ModItems.fireScribeTool); + registerSimpleItem(ModItems.earthScribeTool); + registerSimpleItem(ModItems.airScribeTool); + registerSimpleItem(ModItems.activationCrystal); + registerSimpleItem(ModItems.boundHelmet); + registerSimpleItem(ModItems.boundChestplate); + registerSimpleItem(ModItems.boundLeggings); + registerSimpleItem(ModItems.boundBoots); + registerSimpleItem(ModItems.weakBloodShard); + registerSimpleItem(ModItems.blankSpell); + registerSimpleItem(ModItems.alchemyFlask); + registerSimpleItem(ModItems.standardBindingAgent); + registerSimpleItem(ModItems.mundanePowerCatalyst); + registerSimpleItem(ModItems.averagePowerCatalyst); + registerSimpleItem(ModItems.greaterPowerCatalyst); + registerSimpleItem(ModItems.mundaneLengtheningCatalyst); + registerSimpleItem(ModItems.averageLengtheningCatalyst); + registerSimpleItem(ModItems.greaterLengtheningCatalyst); + registerSimpleItem(ModItems.incendium); + registerSimpleItem(ModItems.magicales); + registerSimpleItem(ModItems.sanctus); + registerSimpleItem(ModItems.aether); + registerSimpleItem(ModItems.simpleCatalyst); + registerSimpleItem(ModItems.crepitous); + registerSimpleItem(ModItems.crystallos); + registerSimpleItem(ModItems.terrae); + registerSimpleItem(ModItems.aquasalus); + registerSimpleItem(ModItems.tennebrae); + registerSimpleItem(ModItems.demonBloodShard); + registerSimpleItem(ModItems.telepositionFocus); + registerSimpleItem(ModItems.enhancedTelepositionFocus); + registerSimpleItem(ModItems.reinforcedTelepositionFocus); + registerSimpleItem(ModItems.demonicTelepositionFocus); + registerSimpleItem(ModItems.imbuedSlate); + registerSimpleItem(ModItems.demonicSlate); + registerSimpleItem(ModItems.duskScribeTool); + registerToggleItem(ModItems.armourInhibitor); + registerSimpleItem(ModItems.creativeFiller); + registerSimpleItem(ModItems.demonPlacer); + registerSimpleItem(ModItems.creativeDagger); + registerSimpleItem(ModItems.weakFillingAgent); + registerSimpleItem(ModItems.standardFillingAgent); + registerSimpleItem(ModItems.enhancedFillingAgent); + registerSimpleItem(ModItems.weakBindingAgent); + registerSimpleItem(ModItems.itemRitualDiviner); //TODO Make it work for all 3 metas + registerSimpleItem(ModItems.itemKeyOfDiablo); + registerToggleItem(ModItems.itemBloodLightSigil); + registerSimpleItem(ModItems.itemComplexSpellCrystal); + registerSimpleItem(ModItems.bucketLife); + registerToggleItem(ModItems.itemSigilOfEnderSeverance); + registerSimpleItem(ModItems.itemSeerSigil); + registerSimpleItem(ModItems.customTool); + + int i = 0; + for(String name : ItemComponents.ITEM_NAMES) + { + itemRender(ModItems.baseItems, i, ModItems.baseItems.getUnlocalizedName().substring(5) + "_" + name); + + i++; + } + + i = 0; + for(String name : ItemAlchemyBase.ITEM_NAMES) + { + itemRender(ModItems.baseAlchemyItems, i, ModItems.baseAlchemyItems.getUnlocalizedName().substring(5) + "_" + name); + + i++; + } + + i = 0; + for(String name : ItemIncense.ITEM_NAMES) + { + itemRender(ModItems.itemIncense, i, ModItems.itemIncense.getUnlocalizedName().substring(5) + "_" + name); + + i++; + } + + registerSimpleItem(ModItems.itemCombinationalCatalyst); + registerSimpleItem(ModItems.itemAttunedCrystal); + registerSimpleItem(ModItems.itemTankSegmenter); + registerSimpleItem(ModItems.itemDestinationClearer); + registerSimpleItem(ModItems.dawnScribeTool); + registerSimpleItem(ModItems.itemBloodPack); + registerSimpleItem(ModItems.boundHelmetWater); + registerSimpleItem(ModItems.boundChestplateWater); + registerSimpleItem(ModItems.boundLeggingsWater); + registerSimpleItem(ModItems.boundBootsWater); + registerSimpleItem(ModItems.boundHelmetEarth); + registerSimpleItem(ModItems.boundChestplateEarth); + registerSimpleItem(ModItems.boundLeggingsEarth); + registerSimpleItem(ModItems.boundBootsEarth); + registerSimpleItem(ModItems.boundHelmetWind); + registerSimpleItem(ModItems.boundChestplateWind); + registerSimpleItem(ModItems.boundLeggingsWind); + registerSimpleItem(ModItems.boundBootsWind); + registerSimpleItem(ModItems.boundHelmetFire); + registerSimpleItem(ModItems.boundChestplateFire); + registerSimpleItem(ModItems.boundLeggingsFire); + registerSimpleItem(ModItems.boundBootsFire); + registerSimpleItem(ModItems.inputRoutingFocus); + registerSimpleItem(ModItems.outputRoutingFocus); + registerSimpleItem(ModItems.ritualDismantler); + } + + public static void registerSimpleItem(Item item) + { + itemRender(item, 0, item.getUnlocalizedName().substring(5)); + } + + public static void registerToggleItem(Item item) + { + itemRender(item, 0, item.getUnlocalizedName().substring(5) + "_deactivated"); + itemRender(item, 1, item.getUnlocalizedName().substring(5) + "_activated"); + } /** * Shorthand of {@code itemRender(Item, int, String)} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlaster.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlaster.java index 6f896545..bc61c600 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlaster.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlaster.java @@ -31,6 +31,7 @@ public class EnergyBlaster extends BindableItems if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + System.out.println("Toggle"); this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100); return par1ItemStack; @@ -108,7 +109,7 @@ public class EnergyBlaster extends BindableItems if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) + if (getActivated(par1ItemStack)) { par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); } else diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java index 92019075..173992f3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java @@ -19,7 +19,7 @@ import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; public class ItemAlchemyBase extends Item { - private final String[] ITEM_NAMES = new String[]{"offensa", "praesidium", "orbis_terrae", "strengthened_catalyst", "concentrated_catalyst", "fractured_bone", "virtus", "reductus", "potentia"}; + public static final String[] ITEM_NAMES = new String[]{"offensa", "praesidium", "orbis_terrae", "strengthened_catalyst", "concentrated_catalyst", "fractured_bone", "virtus", "reductus", "potentia"}; public ItemAlchemyBase() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java index 78fd031c..07872f66 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java @@ -13,7 +13,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemComponents extends Item { - private final String[] ITEM_NAMES = new String[]{"quartz_rod", "empty_core", "magicales_cable", "wood_brace", "stone_brace", "projectile_core", "self_core", "melee_core", "paradigm_back_plate", "output_cable", "flame_core", "icy_core", "gust_core", "earthen_core", "input_cable", "cracked_runic_plate", "runic_plate", "scribed_runic_plate", "default_core", "offensive_core", "defensive_core", "environmental_core", "power_core", "cost_core", "potency_core", "obsidian_brace", "tool_core", "ethereal_slate", "life_shard", "soul_shard", "soul_runic_plate", "life_brace", "ender_shard"}; + public static final String[] ITEM_NAMES = new String[]{"quartz_rod", "empty_core", "magicales_cable", "wood_brace", "stone_brace", "projectile_core", "self_core", "melee_core", "paradigm_back_plate", "output_cable", "flame_core", "icy_core", "gust_core", "earthen_core", "input_cable", "cracked_runic_plate", "runic_plate", "scribed_runic_plate", "default_core", "offensive_core", "defensive_core", "environmental_core", "power_core", "cost_core", "potency_core", "obsidian_brace", "tool_core", "ethereal_slate", "life_shard", "soul_shard", "soul_runic_plate", "life_brace", "ender_shard"}; public ItemComponents() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java index 2e48ba20..7a96242a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java @@ -20,7 +20,7 @@ import WayofTime.alchemicalWizardry.api.sacrifice.IIncense; public class ItemIncense extends Item implements IIncense { - private final String[] ITEM_NAMES = new String[]{"wood_ash", "byrrus", "livens", "viridis", "purpura"}; + public static final String[] ITEM_NAMES = new String[]{"wood_ash", "byrrus", "livens", "viridis", "purpura"}; public ItemIncense() { diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/apprentice_blood_orb.json b/src/main/resources/assets/alchemicalwizardry/models/item/apprentice_blood_orb.json new file mode 100644 index 00000000..8845956d --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/apprentice_blood_orb.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/ApprenticeBloodOrb" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/archmage_blood_orb.json b/src/main/resources/assets/alchemicalwizardry/models/item/archmage_blood_orb.json new file mode 100644 index 00000000..0e436aa1 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/archmage_blood_orb.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/ArchmageBloodOrb" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/energy_blaster_activated.json b/src/main/resources/assets/alchemicalwizardry/models/item/energy_blaster_activated.json new file mode 100644 index 00000000..d9b049a3 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/energy_blaster_activated.json @@ -0,0 +1,7 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/EnergyBlaster_activated" + } +} + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/lava_crystal.json b/src/main/resources/assets/alchemicalwizardry/models/item/lava_crystal.json new file mode 100644 index 00000000..3734f299 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/lava_crystal.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/LavaCrystal" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/lava_sigil.json b/src/main/resources/assets/alchemicalwizardry/models/item/lava_sigil.json new file mode 100644 index 00000000..aaf67601 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/lava_sigil.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/LavaSigil" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/magician_blood_orb.json b/src/main/resources/assets/alchemicalwizardry/models/item/magician_blood_orb.json new file mode 100644 index 00000000..8d049e9d --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/magician_blood_orb.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/MagicianBloodOrb" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/master_blood_orb.json b/src/main/resources/assets/alchemicalwizardry/models/item/master_blood_orb.json new file mode 100644 index 00000000..745013ec --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/master_blood_orb.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/MasterBloodOrb" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_haste_activated.json b/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_haste_activated.json new file mode 100644 index 00000000..b66332bd --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_haste_activated.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/HasteSigil_activated" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_haste_deactivated.json b/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_haste_deactivated.json new file mode 100644 index 00000000..840f1358 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_haste_deactivated.json @@ -0,0 +1,7 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/HasteSigil_deactivated" + } +} + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/standard_item.json b/src/main/resources/assets/alchemicalwizardry/models/item/standard_item.json new file mode 100644 index 00000000..6e397fc5 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/standard_item.json @@ -0,0 +1,15 @@ +{ + "parent":"builtin/generated", + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/transcendent_blood_orb.json b/src/main/resources/assets/alchemicalwizardry/models/item/transcendent_blood_orb.json new file mode 100644 index 00000000..ed4d3dc8 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/transcendent_blood_orb.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/TranscendentBloodOrb" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/water_sigil.json b/src/main/resources/assets/alchemicalwizardry/models/item/water_sigil.json new file mode 100644 index 00000000..72109f7b --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/water_sigil.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/WaterSigil" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/weak_blood_orb.json b/src/main/resources/assets/alchemicalwizardry/models/item/weak_blood_orb.json new file mode 100644 index 00000000..98dbfbbe --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/weak_blood_orb.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/WeakBloodOrb" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/EnergyBattery.png b/src/main/resources/assets/alchemicalwizardry/textures/items/WeakBloodOrb.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/EnergyBattery.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/WeakBloodOrb.png