diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java new file mode 100644 index 00000000..f3e571b1 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -0,0 +1,37 @@ +package WayofTime.bloodmagic.item; + +import java.util.List; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; + +public class ItemComponent extends Item { + + public static String[] names = {"reagentWater", "reagentLava", "reagentAir", "reagentFastMiner", "reagentVoid", "reagentGrowth", "reagentAffinity", "reagentSight"}; + + public ItemComponent() { + super(); + + setUnlocalizedName(Constants.Mod.MODID + ".baseComponent."); + setHasSubtypes(true); + setCreativeTab(BloodMagic.tabBloodMagic); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; + } + + @Override + @SideOnly(Side.CLIENT) + @SuppressWarnings("unchecked") + public void getSubItems(Item id, CreativeTabs creativeTab, List list) { + for (int i = 0; i < names.length; i++) + list.add(new ItemStack(id, 1, i)); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index 02610020..3b69f0ff 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -1,18 +1,38 @@ package WayofTime.bloodmagic.registry; +import net.minecraft.item.Item; +import net.minecraftforge.fml.common.registry.GameRegistry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.orb.BloodOrb; import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.item.*; +import WayofTime.bloodmagic.item.ItemActivationCrystal; +import WayofTime.bloodmagic.item.ItemAltarMaker; +import WayofTime.bloodmagic.item.ItemBloodOrb; +import WayofTime.bloodmagic.item.ItemBucketEssence; +import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.ItemInscriptionTool; +import WayofTime.bloodmagic.item.ItemSacrificialDagger; +import WayofTime.bloodmagic.item.ItemSlate; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice; -import WayofTime.bloodmagic.item.sigil.*; +import WayofTime.bloodmagic.item.sigil.ItemSigilAir; +import WayofTime.bloodmagic.item.sigil.ItemSigilBloodLight; +import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; +import WayofTime.bloodmagic.item.sigil.ItemSigilElementalAffinity; +import WayofTime.bloodmagic.item.sigil.ItemSigilFastMiner; +import WayofTime.bloodmagic.item.sigil.ItemSigilGreenGrove; +import WayofTime.bloodmagic.item.sigil.ItemSigilHaste; +import WayofTime.bloodmagic.item.sigil.ItemSigilLava; +import WayofTime.bloodmagic.item.sigil.ItemSigilMagnetism; +import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge; +import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; +import WayofTime.bloodmagic.item.sigil.ItemSigilSuppression; +import WayofTime.bloodmagic.item.sigil.ItemSigilVoid; +import WayofTime.bloodmagic.item.sigil.ItemSigilWater; import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; -import net.minecraft.item.Item; -import net.minecraftforge.fml.common.registry.GameRegistry; public class ModItems { @@ -52,6 +72,8 @@ public class ModItems { public static Item sigilPhantomBridge; public static Item sigilCompression; + public static Item itemComponent; + public static Item livingArmourHelmet; public static Item livingArmourChest; public static Item livingArmourLegs; @@ -99,6 +121,8 @@ public class ModItems { sigilSeer = registerItem(new ItemSigilSeer()); sigilPhantomBridge = registerItem(new ItemSigilPhantomBridge()); + itemComponent = registerItem(new ItemComponent()); + livingArmourHelmet = registerItem(new ItemLivingArmour(0), "ItemLivingArmourHelmet"); livingArmourChest = registerItem(new ItemLivingArmour(1), "ItemLivingArmourChest"); livingArmourLegs = registerItem(new ItemLivingArmour(2), "ItemLivingArmourLegs"); @@ -163,6 +187,10 @@ public class ModItems { renderHelper.itemRender(sigilSeer); renderHelper.itemRender(sigilPhantomBridge, 0); renderHelper.itemRender(sigilPhantomBridge, 1); + + for(int i = 0 ; i < ItemComponent.names.length ; i++) { + renderHelper.itemRender(itemComponent, i); + } renderHelper.itemRender(livingArmourHelmet); renderHelper.itemRender(livingArmourChest); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 4831b72b..8476cf35 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -50,7 +50,14 @@ public class ModRecipes { } public static void addAlchemyArrayRecipes() { - AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(Items.redstone), new ItemStack(ModItems.slate), new ItemStack(Items.diamond), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.diamond), new ItemStack(ModItems.slate), new CraftingArrayEffectBinding(new ItemStack(Blocks.diamond_block)), new BindingAlchemyCircleRenderer()); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(ModItems.itemComponent, 1, 0), new ItemStack(ModItems.slate), new ItemStack(ModItems.sigilWater), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(ModItems.itemComponent, 1, 1), new ItemStack(ModItems.slate), new ItemStack(ModItems.sigilLava), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(ModItems.itemComponent, 1, 2), new ItemStack(ModItems.slate, 1, 1), new ItemStack(ModItems.sigilAir), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(ModItems.itemComponent, 1, 3), new ItemStack(ModItems.slate, 1, 1), new ItemStack(ModItems.sigilFastMiner), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(ModItems.itemComponent, 1, 4), new ItemStack(ModItems.slate, 1, 1), new ItemStack(ModItems.sigilVoid), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(ModItems.itemComponent, 1, 5), new ItemStack(ModItems.slate, 1, 1), new ItemStack(ModItems.sigilGreenGrove), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(ModItems.itemComponent, 1, 6), new ItemStack(ModItems.slate, 1, 2), new ItemStack(ModItems.sigilElementalAffinity), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(ModItems.itemComponent, 1, 7), new ItemStack(ModItems.slate, 1, 1), new ItemStack(ModItems.sigilSeer), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 70b734fe..0808fa42 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -59,6 +59,15 @@ item.BloodMagic.reagent.virtus.name=Virtus item.BloodMagic.reagent.reductus.name=Reductus item.BloodMagic.reagent.potentia.name=Potentia +item.BloodMagic.baseComponent.reagentWater.name=Water Reagent +item.BloodMagic.baseComponent.reagentLava.name=Lava Reagent +item.BloodMagic.baseComponent.reagentAir.name=Air Reagent +item.BloodMagic.baseComponent.reagentFastMiner.name=Mining Reagent +item.BloodMagic.baseComponent.reagentVoid.name=Void Reagent +item.BloodMagic.baseComponent.reagentGrowth.name=Growth Reagent +item.BloodMagic.baseComponent.reagentAffinity.name=Elemental Affinity Reagent +item.BloodMagic.baseComponent.reagentSight.name=Sight Reagent + item.BloodMagic.sigil.air.name=Air Sigil item.BloodMagic.sigil.bloodLight.name=Sigil of the Blood Lamp item.BloodMagic.sigil.compression.name=Sigil of Compression diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent0.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent0.json new file mode 100644 index 00000000..e435d768 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent0.json @@ -0,0 +1,7 @@ +{ + "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 new file mode 100644 index 00000000..d389396a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent1.json @@ -0,0 +1,8 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/ReagentLava" + } +} + + diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent2.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent2.json new file mode 100644 index 00000000..622a237c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent2.json @@ -0,0 +1,9 @@ +{ + "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 new file mode 100644 index 00000000..03cea3d5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent3.json @@ -0,0 +1,9 @@ +{ + "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 new file mode 100644 index 00000000..2d63c90d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent4.json @@ -0,0 +1,9 @@ +{ + "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 new file mode 100644 index 00000000..00f93fbb --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent5.json @@ -0,0 +1,9 @@ +{ + "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 new file mode 100644 index 00000000..726e09e0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent6.json @@ -0,0 +1,9 @@ +{ + "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 new file mode 100644 index 00000000..319f96e5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent7.json @@ -0,0 +1,10 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/ReagentSight" + } +} + + + + diff --git a/src/main/resources/assets/bloodmagic/textures/items/MiningSigil_activated.png b/src/main/resources/assets/bloodmagic/textures/items/MiningSigil_activated.png index 8b25db87..7f6cb5f0 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/MiningSigil_activated.png and b/src/main/resources/assets/bloodmagic/textures/items/MiningSigil_activated.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/MiningSigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/MiningSigil_deactivated.png index 3d80e351..6974f642 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/MiningSigil_deactivated.png and b/src/main/resources/assets/bloodmagic/textures/items/MiningSigil_deactivated.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/Magicales.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentAffinity.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/Magicales.png rename to src/main/resources/assets/bloodmagic/textures/items/ReagentAffinity.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/Aether.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentAir.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/Aether.png rename to src/main/resources/assets/bloodmagic/textures/items/ReagentAir.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/Sanctus.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentFastMiner.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/Sanctus.png rename to src/main/resources/assets/bloodmagic/textures/items/ReagentFastMiner.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/Terrae.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentGrowth.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/Terrae.png rename to src/main/resources/assets/bloodmagic/textures/items/ReagentGrowth.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/Incendium.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentLava.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/Incendium.png rename to src/main/resources/assets/bloodmagic/textures/items/ReagentLava.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/Crepitous.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentSight.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/Crepitous.png rename to src/main/resources/assets/bloodmagic/textures/items/ReagentSight.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/Tennebrae.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentVoid.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/Tennebrae.png rename to src/main/resources/assets/bloodmagic/textures/items/ReagentVoid.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/Aquasalus.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentWater.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/Aquasalus.png rename to src/main/resources/assets/bloodmagic/textures/items/ReagentWater.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/SeerSigil.png b/src/main/resources/assets/bloodmagic/textures/items/SeerSigil.png index f2f6c0a0..f311486c 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/SeerSigil.png and b/src/main/resources/assets/bloodmagic/textures/items/SeerSigil.png differ