diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java index 03c12455..d2bfb4e2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -27,6 +27,7 @@ public class ItemComponent extends Item public static final String REAGENT_AFFINITY = "reagentAffinity"; public static final String REAGENT_SIGHT = "reagentSight"; public static final String REAGENT_BINDING = "reagentBinding"; + public static final String REAGENT_SUPPRESSION = "reagentSuppression"; public ItemComponent() { @@ -50,6 +51,7 @@ public class ItemComponent extends Item names.add(6, REAGENT_AFFINITY); names.add(7, REAGENT_SIGHT); names.add(8, REAGENT_BINDING); + names.add(9, REAGENT_SUPPRESSION); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index b78cf894..2a136abb 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -1,13 +1,15 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.api.Constants; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.altar.EnumAltarTier; import WayofTime.bloodmagic.api.compress.CompressionRegistry; import WayofTime.bloodmagic.api.recipe.ShapedBloodOrbRecipe; @@ -21,9 +23,6 @@ import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; import WayofTime.bloodmagic.compress.BaseCompressionHandler; import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; import WayofTime.bloodmagic.item.ItemComponent; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModRecipes { @@ -58,6 +57,7 @@ public class ModRecipes GameRegistry.addRecipe(new ShapedBloodOrbRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), "aba", "cde", "afa", 'a', "stone", 'b', Items.iron_pickaxe, 'c', Items.iron_shovel, 'd', Items.gunpowder, 'e', Items.iron_axe, 'f', OrbRegistry.getOrbStack(ModItems.orbApprentice))); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), "aba", "cde", "afa", 'a', Blocks.obsidian, 'b', ModItems.sigilAir, 'c', ModItems.sigilWater, 'd', "dustGlowstone", 'e', ModItems.sigilLava, 'f', OrbRegistry.getOrbStack(ModItems.orbMagician))); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), "aba", "aca", "ded", 'a', "blockGlass", 'b', ModItems.sigilDivination, 'c', "dustGlowstone", 'd', ModItems.bucketEssence, 'e', OrbRegistry.getOrbStack(ModItems.orbApprentice))); + GameRegistry.addRecipe(new ShapedBloodOrbRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), "wtl", "wrl", "wol", 't', new ItemStack(ModBlocks.teleposer), 'w', new ItemStack(Items.water_bucket), 'l', new ItemStack(Items.lava_bucket), 'o', OrbRegistry.getOrbStack(ModItems.orbMaster))); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.bloodRune), "aaa", "bcb", "aaa", 'a', "stone", 'b', ModItems.slate, 'c', OrbRegistry.getOrbStack(ModItems.orbWeak))); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.bloodRune, 1, 1), "aba", "cdc", "aba", 'a', "stone", 'b', ModItems.slate, 'c', Items.sugar, 'd', ModBlocks.bloodRune)); //Speed GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.bloodRune, 1, 2), "aba", "cdc", "aba", 'a', "stone", 'b', ModItems.slate, 'c', Items.sugar, 'd', ModBlocks.bloodRune)); //Efficiency @@ -122,6 +122,7 @@ public class ModRecipes AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), new ItemStack(ModItems.slate, 1, 1), new ItemStack(ModItems.sigilGreenGrove), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), new ItemStack(ModItems.slate, 1, 2), new ItemStack(ModItems.sigilElementalAffinity), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), new ItemStack(ModItems.slate, 1, 1), new ItemStack(ModItems.sigilSeer), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), new ItemStack(ModItems.slate, 1, 3), new ItemStack(ModItems.sigilSuppression), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); } public static void addCompressionHandlers() diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index c8634f45..be37377f 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -79,6 +79,7 @@ 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.baseComponent.reagentSuppression.name=Suppression Reagent item.BloodMagic.sigil.air.name=Air Sigil item.BloodMagic.sigil.bloodLight.name=Sigil of the Blood Lamp @@ -218,6 +219,8 @@ ritual.BloodMagic.lavaRitual=Serenade of the Nether ritual.BloodMagic.greenGroveRitual=Ritual of the Green Grove ritual.BloodMagic.jumpRitual=Ritual of the High Jump ritual.BloodMagic.wellOfSufferingRitual=Well of Suffering +ritual.BloodMagic.featheredKnifeRitual=Ritual of the Feathered Knife +ritual.BloodMagic.regenerationRitual=Ritual of Regeneration # Chat chat.BloodMagic.altarMaker.setTier=Set Tier to: %d diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent9.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent9.json new file mode 100644 index 00000000..0ab9eabd --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent9.json @@ -0,0 +1,6 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/ReagentSuppression" + } +} diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentSuppression.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentSuppression.png new file mode 100644 index 00000000..24fc1af4 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/ReagentSuppression.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/AlchemyArrays/SuppressionSigil.png b/src/main/resources/assets/bloodmagic/textures/models/AlchemyArrays/SuppressionSigil.png new file mode 100644 index 00000000..2ec3163a Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/models/AlchemyArrays/SuppressionSigil.png differ