diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java index fd1e21ab..a5d20324 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -26,6 +26,7 @@ public class ItemComponent extends Item { public static final String REAGENT_GROWTH = "reagentGrowth"; public static final String REAGENT_AFFINITY = "reagentAffinity"; public static final String REAGENT_SIGHT = "reagentSight"; + public static final String REAGENT_BINDING = "reagentBinding"; public ItemComponent() { super(); @@ -46,6 +47,7 @@ public class ItemComponent extends Item { names.add(5, REAGENT_GROWTH); names.add(6, REAGENT_AFFINITY); names.add(7, REAGENT_SIGHT); + names.add(8, REAGENT_BINDING); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index d2b70413..e65e0413 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -1,29 +1,35 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.item.ItemComponent; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; -import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; -import WayofTime.bloodmagic.compress.BaseCompressionHandler; -import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.GameRegistry; import WayofTime.bloodmagic.alchemyArray.CraftingArrayEffectBinding; import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import WayofTime.bloodmagic.api.compress.CompressionRegistry; import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; import WayofTime.bloodmagic.api.registry.OrbRegistry; import WayofTime.bloodmagic.api.ritual.EnumRuneType; import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; +import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; +import WayofTime.bloodmagic.compress.BaseCompressionHandler; +import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; +import WayofTime.bloodmagic.item.ItemComponent; public class ModRecipes { public static void init() { + addCraftingRecipes(); addAltarRecipes(); addAlchemyArrayRecipes(); } + public static void addCraftingRecipes() { + GameRegistry.addShapedRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), "xox", "o o", "xSx", 'S', new ItemStack(ModItems.slate, 1, 2), 'o', new ItemStack(Items.redstone), 'x', new ItemStack(Items.glowstone_dust)); + } + public static void addAltarRecipes() { // ONE AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(OrbRegistry.getOrbStack(ModItems.orbWeak), OrbRegistry.getOrbStack(ModItems.orbWeak), EnumAltarTier.ONE, 5000, 2, 1, true)); @@ -55,7 +61,10 @@ public class ModRecipes { } public static void addAlchemyArrayRecipes() { - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.diamond), new ItemStack(ModItems.slate), new CraftingArrayEffectBinding(new ItemStack(Blocks.diamond_block)), new BindingAlchemyCircleRenderer()); + AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.diamond_sword), new CraftingArrayEffectBinding(new ItemStack(ModItems.boundSword)), new BindingAlchemyCircleRenderer()); + AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.diamond_axe), new CraftingArrayEffectBinding(new ItemStack(ModItems.boundAxe))); + AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.diamond_pickaxe), new CraftingArrayEffectBinding(new ItemStack(ModItems.boundPickaxe))); + AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.diamond_shovel), new CraftingArrayEffectBinding(new ItemStack(ModItems.boundShovel))); AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_WATER), new ItemStack(ModItems.slate), new ItemStack(ModItems.sigilWater), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), new ItemStack(ModItems.slate), new ItemStack(ModItems.sigilLava), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AIR), new ItemStack(ModItems.slate, 1, 1), new ItemStack(ModItems.sigilAir), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index fdf4eefd..342a86b6 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -76,6 +76,7 @@ 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.baseComponent.reagentBinding.name=Binding Reagent item.BloodMagic.sigil.air.name=Air Sigil item.BloodMagic.sigil.bloodLight.name=Sigil of the Blood Lamp diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent8.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent8.json new file mode 100644 index 00000000..40b72794 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent8.json @@ -0,0 +1,6 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/ReagentBinding" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/textures/items/baseIncenseItem_woodash.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentBinding.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/baseIncenseItem_woodash.png rename to src/main/resources/assets/bloodmagic/textures/items/ReagentBinding.png