diff --git a/changelog.txt b/changelog.txt index b05d8a49..e70e32ef 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ Version 2.0.0-15 ------------------------------------------------------ - Added blood lamp sigil array texture and reagent. Made it so the blood lamp sigil will place the light when right clicking on a block. +- Added magnetism sigil array texture and reagent. ------------------------------------------------------ Version 2.0.0-14 diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java index 440a9df7..6c608c52 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.item; import java.util.ArrayList; import java.util.List; -import WayofTime.bloodmagic.registry.ModItems; import lombok.Getter; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -12,6 +11,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.registry.ModItems; public class ItemComponent extends Item { @@ -30,6 +30,7 @@ public class ItemComponent extends Item public static final String REAGENT_SUPPRESSION = "reagentSuppression"; public static final String COMPONENT_FRAME_PART = "frameParts"; public static final String REAGENT_BLOODLIGHT = "reagentBloodLight"; + public static final String REAGENT_MAGNETISM = "reagentMagnetism"; public ItemComponent() { @@ -57,6 +58,7 @@ public class ItemComponent extends Item names.add(9, REAGENT_SUPPRESSION); names.add(10, COMPONENT_FRAME_PART); names.add(11, REAGENT_BLOODLIGHT); + names.add(12, REAGENT_MAGNETISM); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 3241fed0..e7a609fd 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -148,6 +148,7 @@ public class ModRecipes 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")); AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), new ItemStack(ModItems.slate, 1, 2), new ItemStack(ModItems.sigilBloodLight), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), new ItemStack(ModItems.slate, 1, 2), new ItemStack(ModItems.sigilMagnetism), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); } public static void addCompressionHandlers() @@ -181,6 +182,7 @@ public class ModRecipes TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), 500, 50, ModBlocks.teleposer, Items.water_bucket, Items.lava_bucket, Items.blaze_rod); TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.gunpowder); TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), 300, 10, "glowstone", Blocks.torch, "dustRedstone", "dustRedstone"); + TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), 600, 10, Items.string, "ingotGold", "blockIron", "ingotGold"); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.sentientArmourGem), 240, 150, Items.diamond_chestplate, new ItemStack(ModItems.soulGem, 1, 1), Blocks.iron_block, Blocks.obsidian); TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 400, 10, "blockGlass", "stone", new ItemStack(ModItems.slate)); diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 18dfc6db..26f7d75d 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -78,6 +78,7 @@ item.BloodMagic.baseComponent.reagentBinding.name=Binding Reagent item.BloodMagic.baseComponent.reagentSuppression.name=Suppression Reagent item.BloodMagic.baseComponent.frameParts.name=Frame Parts item.BloodMagic.baseComponent.reagentBloodLight.name=Blood Lamp Reagent +item.BloodMagic.baseComponent.reagentMagnetism.name=Magnetism Reagent item.BloodMagic.monsterSoul.base.name=Demonic Will @@ -217,6 +218,8 @@ tooltip.BloodMagic.sigil.seer.currentAltarTier=Current Tier: %d tooltip.BloodMagic.sigil.seer.currentEssence=Current Essence: %d LP tooltip.BloodMagic.sigil.seer.currentAltarCapacity=Current Capacity: %d LP tooltip.BloodMagic.sigil.seer.currentCharge=Current Charge: %d +tooltip.BloodMagic.sigil.seer.currentTranquility=Current Tranquility: %d +tooltip.BloodMagic.sigil.seer.currentBonus=Current Bonus: +%d%% tooltip.BloodMagic.sigil.phantomBridge.desc=&oWalking on thin air... tooltip.BloodMagic.sigil.whirlwind.desc=&oBest not to wear a skirt tooltip.BloodMagic.sigil.enderSeverance.desc=&oPutting Endermen in Dire situations! diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemComponent12.json b/src/main/resources/assets/bloodmagic/models/item/ItemComponent12.json new file mode 100644 index 00000000..c7464e1f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemComponent12.json @@ -0,0 +1,10 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/ReagentMagnetism" + } +} + + + + diff --git a/src/main/resources/assets/bloodmagic/textures/models/AlchemyArrays/MagnetismSigil.png b/src/main/resources/assets/bloodmagic/textures/models/AlchemyArrays/MagnetismSigil.png new file mode 100644 index 00000000..63fa80c2 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/models/AlchemyArrays/MagnetismSigil.png differ