diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java index 8075b2ae..dcf62cf9 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderItem; @@ -26,7 +27,7 @@ public class RenderEntityBloodLight extends Render { GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - this.renderItem.renderItem(ComponentType.REAGENT_BLOODLIGHT.getStack(), ItemCameraTransforms.TransformType.GROUND); + this.renderItem.renderItem(ReagentType.REAGENT_BLOODLIGHT.getStack(), ItemCameraTransforms.TransformType.GROUND); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); super.doRender(entity, x, y, z, entityYaw, partialTicks); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index 1392936e..9501278b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -8,6 +8,7 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.util.PageHelper; import amerifrance.guideapi.category.CategoryItemStack; @@ -68,12 +69,12 @@ public class CategoryArchitect { category.getEntry("runeSpeed").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSpeed.info.1"), 370)); category.addEntry("water", new EntryText(keyBase + "water", true)); - category.getEntry("water").addPage(BookUtils.getForgePage(ComponentType.REAGENT_WATER.getStack())); + category.getEntry("water").addPage(BookUtils.getForgePage(ReagentType.REAGENT_WATER.getStack())); category.getEntry("water").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER))); category.getEntry("water").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "water.info.1"), 370)); category.addEntry("lava", new EntryText(keyBase + "lava", true)); - category.getEntry("lava").addPage(BookUtils.getForgePage(ComponentType.REAGENT_LAVA.getStack())); + category.getEntry("lava").addPage(BookUtils.getForgePage(ReagentType.REAGENT_LAVA.getStack())); category.getEntry("lava").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA))); category.getEntry("lava").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lava.info.1"), 370)); @@ -98,32 +99,32 @@ public class CategoryArchitect { category.getEntry("runeSelfSacrifice").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSelfSacrifice.info.1"), 370)); category.addEntry("holding", new EntryText(keyBase + "holding", true)); - category.getEntry("holding").addPage(BookUtils.getForgePage(ComponentType.REAGENT_HOLDING.getStack())); + category.getEntry("holding").addPage(BookUtils.getForgePage(ReagentType.REAGENT_HOLDING.getStack())); category.getEntry("holding").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); category.getEntry("holding").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "holding.info.1"), 370)); category.addEntry("air", new EntryText(keyBase + "air", true)); - category.getEntry("air").addPage(BookUtils.getForgePage(ComponentType.REAGENT_AIR.getStack())); + category.getEntry("air").addPage(BookUtils.getForgePage(ReagentType.REAGENT_AIR.getStack())); category.getEntry("air").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR))); category.getEntry("air").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "air.info.1"), 370)); category.addEntry("void", new EntryText(keyBase + "void", true)); - category.getEntry("void").addPage(BookUtils.getForgePage(ComponentType.REAGENT_VOID.getStack())); + category.getEntry("void").addPage(BookUtils.getForgePage(ReagentType.REAGENT_VOID.getStack())); category.getEntry("void").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID))); category.getEntry("void").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "void.info.1"), 370)); category.addEntry("greenGrove", new EntryText(keyBase + "greenGrove", true)); - category.getEntry("greenGrove").addPage(BookUtils.getForgePage(ComponentType.REAGENT_GROWTH.getStack())); + category.getEntry("greenGrove").addPage(BookUtils.getForgePage(ReagentType.REAGENT_GROWTH.getStack())); category.getEntry("greenGrove").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE))); category.getEntry("greenGrove").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "greenGrove.info.1"), 370)); category.addEntry("fastMiner", new EntryText(keyBase + "fastMiner", true)); - category.getEntry("fastMiner").addPage(BookUtils.getForgePage(ComponentType.REAGENT_FASTMINER.getStack())); + category.getEntry("fastMiner").addPage(BookUtils.getForgePage(ReagentType.REAGENT_FASTMINER.getStack())); category.getEntry("fastMiner").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER))); category.getEntry("fastMiner").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "fastMiner.info.1"), 370)); category.addEntry("seer", new EntryText(keyBase + "seer", true)); - category.getEntry("seer").addPage(BookUtils.getForgePage(ComponentType.REAGENT_SIGHT.getStack())); + category.getEntry("seer").addPage(BookUtils.getForgePage(ReagentType.REAGENT_SIGHT.getStack())); category.getEntry("seer").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER))); category.getEntry("seer").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "seer.info.1"), 370)); @@ -140,17 +141,17 @@ public class CategoryArchitect { category.getEntry("displacement").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "displacement.info.1"), 370)); category.addEntry("affinity", new EntryText(keyBase + "affinity", true)); - category.getEntry("affinity").addPage(BookUtils.getForgePage(ComponentType.REAGENT_AFFINITY.getStack())); + category.getEntry("affinity").addPage(BookUtils.getForgePage(ReagentType.REAGENT_AFFINITY.getStack())); category.getEntry("affinity").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY))); category.getEntry("affinity").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "affinity.info"), 370)); category.addEntry("lamp", new EntryText(keyBase + "lamp", true)); - category.getEntry("lamp").addPage(BookUtils.getForgePage(ComponentType.REAGENT_BLOODLIGHT.getStack())); + category.getEntry("lamp").addPage(BookUtils.getForgePage(ReagentType.REAGENT_BLOODLIGHT.getStack())); category.getEntry("lamp").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT))); category.getEntry("lamp").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lamp.info.1"), 370)); category.addEntry("magnetism", new EntryText(keyBase + "magnetism", true)); - category.getEntry("magnetism").addPage(BookUtils.getForgePage(ComponentType.REAGENT_MAGNETISM.getStack())); + category.getEntry("magnetism").addPage(BookUtils.getForgePage(ReagentType.REAGENT_MAGNETISM.getStack())); category.getEntry("magnetism").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM))); category.getEntry("magnetism").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "magnetism.info.1"), 370)); @@ -159,7 +160,7 @@ public class CategoryArchitect { category.getEntry("peritia").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "peritia.info.1"), 370)); category.addEntry("livingArmour", new EntryText(keyBase + "livingArmour", true)); - category.getEntry("livingArmour").addPage(BookUtils.getForgePage(ComponentType.REAGENT_BINDING.getStack())); + category.getEntry("livingArmour").addPage(BookUtils.getForgePage(ReagentType.REAGENT_BINDING.getStack())); category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); @@ -211,32 +212,32 @@ public class CategoryArchitect { category.getEntry("acceleration").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "acceleration.info.1"), 370)); category.addEntry("suppression", new EntryText(keyBase + "suppression", true)); - category.getEntry("suppression").addPage(BookUtils.getForgePage(ComponentType.REAGENT_SUPPRESSION.getStack())); + category.getEntry("suppression").addPage(BookUtils.getForgePage(ReagentType.REAGENT_SUPPRESSION.getStack())); category.getEntry("suppression").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION))); category.getEntry("suppression").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "suppression.info.1"), 370)); category.addEntry("haste", new EntryText(keyBase + "haste", true)); - category.getEntry("haste").addPage(BookUtils.getForgePage(ComponentType.REAGENT_HASTE.getStack())); + category.getEntry("haste").addPage(BookUtils.getForgePage(ReagentType.REAGENT_HASTE.getStack())); category.getEntry("haste").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE))); category.getEntry("haste").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "haste.info.1"), 370)); category.addEntry("severance", new EntryText(keyBase + "severance", true)); - category.getEntry("severance").addPage(BookUtils.getForgePage(ComponentType.REAGENT_SEVERANCE.getStack())); + category.getEntry("severance").addPage(BookUtils.getForgePage(ReagentType.REAGENT_SEVERANCE.getStack())); category.getEntry("severance").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE))); category.getEntry("severance").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "severance.info.1"), 370)); category.addEntry("teleposition", new EntryText(keyBase + "teleposition", true)); - category.getEntry("teleposition").addPage(BookUtils.getForgePage(ComponentType.REAGENT_TELEPOSITION.getStack())); + category.getEntry("teleposition").addPage(BookUtils.getForgePage(ReagentType.REAGENT_TELEPOSITION.getStack())); category.getEntry("teleposition").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION))); category.getEntry("teleposition").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "teleposition.info.1"), 370)); category.addEntry("compression", new EntryText(keyBase + "compression", true)); - category.getEntry("compression").addPage(BookUtils.getForgePage(ComponentType.REAGENT_COMPRESSION.getStack())); + category.getEntry("compression").addPage(BookUtils.getForgePage(ReagentType.REAGENT_COMPRESSION.getStack())); category.getEntry("compression").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION))); category.getEntry("compression").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "compression.info.1"), 370)); category.addEntry("bridge", new EntryText(keyBase + "bridge", true)); - category.getEntry("bridge").addPage(BookUtils.getForgePage(ComponentType.REAGENT_BRIDGE.getStack())); + category.getEntry("bridge").addPage(BookUtils.getForgePage(ReagentType.REAGENT_BRIDGE.getStack())); category.getEntry("bridge").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE))); category.getEntry("bridge").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "bridge.info.1"), 370)); diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index da72b025..8d046c24 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -17,6 +17,7 @@ import WayofTime.bloodmagic.item.routing.ItemRouterFilter; import WayofTime.bloodmagic.item.sigil.*; import WayofTime.bloodmagic.item.soul.*; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import com.google.common.collect.Lists; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Items; @@ -79,6 +80,7 @@ public class RegistrarBloodMagicItems { public static final Item SIGIL_BOUNCE = Items.AIR; public static final Item SIGIL_FROST = Items.AIR; public static final Item COMPONENT = Items.AIR; + public static final Item REAGENT = Items.AIR; public static final Item ITEM_DEMON_CRYSTAL = Items.AIR; public static final Item TELEPOSITION_FOCUS = Items.AIR; public static final Item EXPERIENCE_TOME = Items.AIR; @@ -166,7 +168,8 @@ public class RegistrarBloodMagicItems { new ItemSigilClaw().setRegistryName("sigil_claw"), new ItemSigilBounce().setRegistryName("sigil_bounce"), new ItemSigilFrost().setRegistryName("sigil_frost"), - new ItemEnum<>(ComponentType.class, "baseComponent").setRegistryName("component"), + new ItemEnum<>(ComponentType.class, "component").setRegistryName("component"), + new ItemEnum<>(ReagentType.class, "reagent").setRegistryName("reagent"), new ItemDemonCrystal().setRegistryName("item_demon_crystal"), new ItemTelepositionFocus().setRegistryName("teleposition_focus"), new ItemExperienceBook().setRegistryName("experience_tome"), diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 66f231cf..89ed8aa1 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -12,6 +12,7 @@ import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -100,32 +101,32 @@ public class RegistrarBloodMagicRecipes { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL)); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "string", "string"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL); - registrar.addTartaricForge(ComponentType.REAGENT_WATER.getStack(), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); - registrar.addTartaricForge(ComponentType.REAGENT_LAVA.getStack(), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); - registrar.addTartaricForge(ComponentType.REAGENT_VOID.getStack(), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); - registrar.addTartaricForge(ComponentType.REAGENT_GROWTH.getStack(), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); - registrar.addTartaricForge(ComponentType.REAGENT_AIR.getStack(), 128, 20, Items.GHAST_TEAR, "feather", "feather"); - registrar.addTartaricForge(ComponentType.REAGENT_SIGHT.getStack(), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); - registrar.addTartaricForge(ComponentType.REAGENT_HOLDING.getStack(), 64, 20, "chestWood", "leather", "string", "string"); - registrar.addTartaricForge(ComponentType.REAGENT_FASTMINER.getStack(), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); - registrar.addTartaricForge(ComponentType.REAGENT_AFFINITY.getStack(), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentType.REAGENT_SUPPRESSION.getStack(), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); - registrar.addTartaricForge(ComponentType.REAGENT_BINDING.getStack(), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); - registrar.addTartaricForge(ComponentType.REAGENT_BLOODLIGHT.getStack(), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); - registrar.addTartaricForge(ComponentType.REAGENT_MAGNETISM.getStack(), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); - registrar.addTartaricForge(ComponentType.REAGENT_HASTE.getStack(), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); - registrar.addTartaricForge(ComponentType.REAGENT_BRIDGE.getStack(), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentType.REAGENT_SEVERANCE.getStack(), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); - registrar.addTartaricForge(ComponentType.REAGENT_COMPRESSION.getStack(), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); - registrar.addTartaricForge(ComponentType.REAGENT_TELEPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); - registrar.addTartaricForge(ComponentType.REAGENT_TRANSPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentType.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); - registrar.addTartaricForge(ComponentType.REAGENT_BOUNCE.getStack(), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); - registrar.addTartaricForge(ComponentType.REAGENT_FROST.getStack(), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); + registrar.addTartaricForge(ReagentType.REAGENT_WATER.getStack(), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); + registrar.addTartaricForge(ReagentType.REAGENT_LAVA.getStack(), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); + registrar.addTartaricForge(ReagentType.REAGENT_VOID.getStack(), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); + registrar.addTartaricForge(ReagentType.REAGENT_GROWTH.getStack(), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); + registrar.addTartaricForge(ReagentType.REAGENT_AIR.getStack(), 128, 20, Items.GHAST_TEAR, "feather", "feather"); + registrar.addTartaricForge(ReagentType.REAGENT_SIGHT.getStack(), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); + registrar.addTartaricForge(ReagentType.REAGENT_HOLDING.getStack(), 64, 20, "chestWood", "leather", "string", "string"); + registrar.addTartaricForge(ReagentType.REAGENT_FASTMINER.getStack(), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); + registrar.addTartaricForge(ReagentType.REAGENT_AFFINITY.getStack(), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); + registrar.addTartaricForge(ReagentType.REAGENT_SUPPRESSION.getStack(), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); + registrar.addTartaricForge(ReagentType.REAGENT_BINDING.getStack(), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); + registrar.addTartaricForge(ReagentType.REAGENT_BLOODLIGHT.getStack(), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); + registrar.addTartaricForge(ReagentType.REAGENT_MAGNETISM.getStack(), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); + registrar.addTartaricForge(ReagentType.REAGENT_HASTE.getStack(), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); + registrar.addTartaricForge(ReagentType.REAGENT_BRIDGE.getStack(), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); + registrar.addTartaricForge(ReagentType.REAGENT_SEVERANCE.getStack(), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); + registrar.addTartaricForge(ReagentType.REAGENT_COMPRESSION.getStack(), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); + registrar.addTartaricForge(ReagentType.REAGENT_TELEPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); + registrar.addTartaricForge(ReagentType.REAGENT_TRANSPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); + registrar.addTartaricForge(ReagentType.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + registrar.addTartaricForge(ReagentType.REAGENT_BOUNCE.getStack(), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); + registrar.addTartaricForge(ReagentType.REAGENT_FROST.getStack(), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentType.COMPONENT_FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); + registrar.addTartaricForge(ComponentType.FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), "gemLapis", "gemLapis"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java index 077149c1..e3799a0f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.types.IEnumItem; +import WayofTime.bloodmagic.item.types.ISubItem; import com.google.common.collect.Lists; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,7 +15,7 @@ import org.apache.commons.lang3.tuple.Pair; import java.util.List; -public class ItemEnum & IEnumItem> extends Item implements IVariantProvider { +public class ItemEnum & ISubItem> extends Item implements IVariantProvider { protected final T[] types; diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index a17cff21..55f632f9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -10,6 +10,7 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerRepairing; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeElytra; @@ -97,7 +98,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP @Override public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return ItemStack.areItemsEqual(repair, ComponentType.REAGENT_BINDING.getStack()); + return ItemStack.areItemsEqual(repair, ReagentType.REAGENT_BINDING.getStack()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java b/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java index ab7fe88a..c7dc721f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java @@ -6,27 +6,9 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; import java.util.Locale; -public enum ComponentType implements IEnumItem { +public enum ComponentType implements ISubItem { - REAGENT_WATER, - REAGENT_LAVA, - REAGENT_AIR, - REAGENT_FASTMINER, - REAGENT_VOID, - REAGENT_GROWTH, - REAGENT_AFFINITY, - REAGENT_SIGHT, - REAGENT_BINDING, - REAGENT_SUPPRESSION, - COMPONENT_FRAME_PART, - REAGENT_BLOODLIGHT, - REAGENT_MAGNETISM, - REAGENT_HASTE, - REAGENT_COMPRESSION, - REAGENT_BRIDGE, - REAGENT_SEVERANCE, - REAGENT_TELEPOSITION, - REAGENT_TRANSPOSITION, + FRAME_PART, SAND_IRON, SAND_GOLD, SAND_COAL, @@ -35,27 +17,16 @@ public enum ComponentType implements IEnumItem { SALTPETER, NEURO_TOXIN, ANTISEPTIC, - REAGENT_HOLDING, CATALYST_LENGTH_1, CATALYST_POWER_1, - REAGENT_CLAW, - REAGENT_BOUNCE, - REAGENT_FROST, ; - @Nonnull @Override public String getInternalName() { return name().toLowerCase(Locale.ROOT); } - @Nonnull - @Override - public ItemStack getStack() { - return getStack(1); - } - @Nonnull @Override public ItemStack getStack(int count) { diff --git a/src/main/java/WayofTime/bloodmagic/item/types/IEnumItem.java b/src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java similarity index 69% rename from src/main/java/WayofTime/bloodmagic/item/types/IEnumItem.java rename to src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java index d7be59b7..27204050 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/IEnumItem.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java @@ -4,13 +4,15 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; -public interface IEnumItem { +public interface ISubItem { @Nonnull String getInternalName(); @Nonnull - ItemStack getStack(); + default ItemStack getStack() { + return getStack(1); + } @Nonnull ItemStack getStack(int count); diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java b/src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java new file mode 100644 index 00000000..0691d87a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java @@ -0,0 +1,46 @@ +package WayofTime.bloodmagic.item.types; + +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; +import java.util.Locale; + +public enum ReagentType implements ISubItem { + + REAGENT_WATER, + REAGENT_LAVA, + REAGENT_AIR, + REAGENT_FASTMINER, + REAGENT_VOID, + REAGENT_GROWTH, + REAGENT_AFFINITY, + REAGENT_SIGHT, + REAGENT_BINDING, + REAGENT_SUPPRESSION, + REAGENT_BLOODLIGHT, + REAGENT_MAGNETISM, + REAGENT_HASTE, + REAGENT_COMPRESSION, + REAGENT_BRIDGE, + REAGENT_SEVERANCE, + REAGENT_TELEPOSITION, + REAGENT_TRANSPOSITION, + REAGENT_CLAW, + REAGENT_BOUNCE, + REAGENT_FROST, + REAGENT_HOLDING, + ; + + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.COMPONENT, count, ordinal()); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 253aba93..a1cd31a2 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -16,6 +16,7 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; @@ -69,38 +70,38 @@ public class ModRecipes { } public static void addAlchemyArrayRecipes() { - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(Items.REDSTONE), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_WATER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_LAVA.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_AIR.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_FASTMINER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_VOID.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_GROWTH.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_AFFINITY.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_SIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_HOLDING.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_BLOODLIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_MAGNETISM.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_SUPPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_HASTE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_BRIDGE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_COMPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_SEVERANCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_TELEPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_TRANSPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_CLAW.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_BOUNCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_FROST.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_WATER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_LAVA.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_AIR.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_FASTMINER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_VOID.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_GROWTH.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_AFFINITY.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_SIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_HOLDING.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_BLOODLIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_MAGNETISM.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_SUPPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_HASTE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_BRIDGE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_COMPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_SEVERANCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_TELEPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_TRANSPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_CLAW.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_BOUNCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_FROST.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.ROTTEN_FLESH), new AlchemyArrayEffectAttractor("attractor"), new AttractorAlchemyCircleRenderer()); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectMovement("movement"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"))); @@ -109,7 +110,7 @@ public class ModRecipes { AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_FASTMINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_FASTMINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); } diff --git a/src/main/resources/assets/bloodmagic/blockstates/component.json b/src/main/resources/assets/bloodmagic/blockstates/component.json index eb690f3b..435f0f9a 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/component.json +++ b/src/main/resources/assets/bloodmagic/blockstates/component.json @@ -6,117 +6,27 @@ }, "variants": { "type": { - "reagentwater": { - "textures": { - "layer0": "bloodmagic:items/ReagentWater" - } - }, - "reagentlava": { - "textures": { - "layer0": "bloodmagic:items/ReagentLava" - } - }, - "reagentair": { - "textures": { - "layer0": "bloodmagic:items/ReagentAir" - } - }, - "reagentfastminer": { - "textures": { - "layer0": "bloodmagic:items/ReagentFastMiner" - } - }, - "reagentvoid": { - "textures": { - "layer0": "bloodmagic:items/ReagentVoid" - } - }, - "reagentgrowth": { - "textures": { - "layer0": "bloodmagic:items/ReagentGrowth" - } - }, - "reagentaffinity": { - "textures": { - "layer0": "bloodmagic:items/ReagentAffinity" - } - }, - "reagentsight": { - "textures": { - "layer0": "bloodmagic:items/ReagentSight" - } - }, - "reagentbinding": { - "textures": { - "layer0": "bloodmagic:items/ReagentBinding" - } - }, - "reagentsuppression": { - "textures": { - "layer0": "bloodmagic:items/ReagentSuppression" - } - }, - "frameparts": { + "frame_part": { "textures": { "layer0": "bloodmagic:items/ComponentFrameParts" } }, - "reagentbloodlight": { - "textures": { - "layer0": "bloodmagic:items/ReagentBloodLight" - } - }, - "reagentmagnetism": { - "textures": { - "layer0": "bloodmagic:items/ReagentMagnetism" - } - }, - "reagenthaste": { - "textures": { - "layer0": "bloodmagic:items/ReagentHaste" - } - }, - "reagentcompression": { - "textures": { - "layer0": "bloodmagic:items/ReagentCompression" - } - }, - "reagentbridge": { - "textures": { - "layer0": "bloodmagic:items/ReagentBridge" - } - }, - "reagentseverance": { - "textures": { - "layer0": "bloodmagic:items/ReagentSeverance" - } - }, - "reagentteleposition": { - "textures": { - "layer0": "bloodmagic:items/ReagentTeleposition" - } - }, - "reagenttransposition": { - "textures": { - "layer0": "bloodmagic:items/ReagentTransposition" - } - }, - "ironsand": { + "sand_iron": { "textures": { "layer0": "bloodmagic:items/IronSand" } }, - "goldsand": { + "sand_gold": { "textures": { "layer0": "bloodmagic:items/GoldSand" } }, - "coalsand": { + "sand_coal": { "textures": { "layer0": "bloodmagic:items/CoalSand" } }, - "plantoil": { + "plant_oil": { "textures": { "layer0": "bloodmagic:items/PlantOil" } @@ -131,7 +41,7 @@ "layer0": "bloodmagic:items/Saltpeter" } }, - "neurotoxin": { + "neuro_toxin": { "textures": { "layer0": "bloodmagic:items/NeuroToxin" } @@ -141,35 +51,15 @@ "layer0": "bloodmagic:items/Antiseptic" } }, - "reagentholding": { - "textures": { - "layer0": "bloodmagic:items/ReagentHolding" - } - }, - "mundanelength": { + "catalyst_length_1": { "textures": { "layer0": "bloodmagic:items/MundaneLengtheningCatalyst" } }, - "mundanepower": { + "catalyst_power_1": { "textures": { "layer0": "bloodmagic:items/MundanePowerCatalyst" } - }, - "reagentclaw": { - "textures": { - "layer0": "bloodmagic:items/ReagentClaw" - } - }, - "reagentbounce": { - "textures": { - "layer0": "bloodmagic:items/ReagentBounce" - } - }, - "reagentfrost": { - "textures": { - "layer0": "bloodmagic:items/ReagentFrost" - } } } } diff --git a/src/main/resources/assets/bloodmagic/blockstates/reagent.json b/src/main/resources/assets/bloodmagic/blockstates/reagent.json new file mode 100644 index 00000000..ed82a929 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/reagent.json @@ -0,0 +1,121 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "reagent_water": { + "textures": { + "layer0": "bloodmagic:items/ReagentWater" + } + }, + "reagent_lava": { + "textures": { + "layer0": "bloodmagic:items/ReagentLava" + } + }, + "reagent_air": { + "textures": { + "layer0": "bloodmagic:items/ReagentAir" + } + }, + "reagent_fastminer": { + "textures": { + "layer0": "bloodmagic:items/ReagentFastMiner" + } + }, + "reagent_void": { + "textures": { + "layer0": "bloodmagic:items/ReagentVoid" + } + }, + "reagent_growth": { + "textures": { + "layer0": "bloodmagic:items/ReagentGrowth" + } + }, + "reagent_affinity": { + "textures": { + "layer0": "bloodmagic:items/ReagentAffinity" + } + }, + "reagent_sight": { + "textures": { + "layer0": "bloodmagic:items/ReagentSight" + } + }, + "reagent_binding": { + "textures": { + "layer0": "bloodmagic:items/ReagentBinding" + } + }, + "reagent_suppression": { + "textures": { + "layer0": "bloodmagic:items/ReagentSuppression" + } + }, + "reagent_bloodlight": { + "textures": { + "layer0": "bloodmagic:items/ReagentBloodLight" + } + }, + "reagent_magnetism": { + "textures": { + "layer0": "bloodmagic:items/ReagentMagnetism" + } + }, + "reagent_haste": { + "textures": { + "layer0": "bloodmagic:items/ReagentHaste" + } + }, + "reagent_compression": { + "textures": { + "layer0": "bloodmagic:items/ReagentCompression" + } + }, + "reagent_bridge": { + "textures": { + "layer0": "bloodmagic:items/ReagentBridge" + } + }, + "reagent_severance": { + "textures": { + "layer0": "bloodmagic:items/ReagentSeverance" + } + }, + "reagent_teleposition": { + "textures": { + "layer0": "bloodmagic:items/ReagentTeleposition" + } + }, + "reagent_transposition": { + "textures": { + "layer0": "bloodmagic:items/ReagentTransposition" + } + }, + "reagent_holding": { + "textures": { + "layer0": "bloodmagic:items/ReagentHolding" + } + }, + "reagent_claw": { + "textures": { + "layer0": "bloodmagic:items/ReagentClaw" + } + }, + "reagent_bounce": { + "textures": { + "layer0": "bloodmagic:items/ReagentBounce" + } + }, + "reagent_frost": { + "textures": { + "layer0": "bloodmagic:items/ReagentFrost" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 1c8ac9bf..bc712392 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -66,47 +66,44 @@ item.bloodmagic.reagent.potentia.name=Potentia item.bloodmagic.bloodShard.weak.name=Weak Blood Shard item.bloodmagic.bloodShard.demon.name=Demon Blood Shard -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.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.baseComponent.reagentHaste.name=Haste Reagent -item.bloodmagic.baseComponent.reagentBridge.name=Phantom Bridge Reagent -item.bloodmagic.baseComponent.reagentCompression.name=Compression Reagent -item.bloodmagic.baseComponent.reagentSeverance.name=Severance Reagent -item.bloodmagic.baseComponent.reagentHolding.name=Holding Reagent -item.bloodmagic.baseComponent.reagentClaw.name=Claw Reagent -item.bloodmagic.baseComponent.reagentBounce.name=Elasticity Reagent -item.bloodmagic.baseComponent.reagentFrost.name=Frost Reagent +item.bloodmagic.reagent.reagent_water.name=Water Reagent +item.bloodmagic.reagent.reagent_lava.name=Lava Reagent +item.bloodmagic.reagent.reagent_air.name=Air Reagent +item.bloodmagic.reagent.reagent_fastMiner.name=Mining Reagent +item.bloodmagic.reagent.reagent_void.name=Void Reagent +item.bloodmagic.reagent.reagent_growth.name=Growth Reagent +item.bloodmagic.reagent.reagent_affinity.name=Elemental Affinity Reagent +item.bloodmagic.reagent.reagent_sight.name=Sight Reagent +item.bloodmagic.reagent.reagent_binding.name=Binding Reagent +item.bloodmagic.reagent.reagent_suppression.name=Suppression Reagent +item.bloodmagic.reagent.reagent_bloodlight.name=Blood Lamp Reagent +item.bloodmagic.reagent.reagent_magnetism.name=Magnetism Reagent +item.bloodmagic.reagent.reagent_haste.name=Haste Reagent +item.bloodmagic.reagent.reagent_bridge.name=Phantom Bridge Reagent +item.bloodmagic.reagent.reagent_compression.name=Compression Reagent +item.bloodmagic.reagent.reagent_severance.name=Severance Reagent +item.bloodmagic.reagent.reagent_holding.name=Holding Reagent +item.bloodmagic.reagent.reagent_claw.name=Claw Reagent +item.bloodmagic.reagent.reagent_bounce.name=Elasticity Reagent +item.bloodmagic.reagent.reagent_frost.name=Frost Reagent +item.bloodmagic.reagent.reagent_teleposition.name=Teleposition Reagent +item.bloodmagic.reagent.reagent_transposition.name=Transposition Reagent -item.bloodmagic.baseComponent.reagentTeleposition.name=Teleposition Reagent -item.bloodmagic.baseComponent.reagentTransposition.name=Transposition Reagent - -item.bloodmagic.baseComponent.ironSand.name=Iron Sand -item.bloodmagic.baseComponent.goldSand.name=Gold Sand -item.bloodmagic.baseComponent.coalSand.name=Coal Sand -item.bloodmagic.baseComponent.plantOil.name=Plant Oil -item.bloodmagic.baseComponent.sulfur.name=Sulfur -item.bloodmagic.baseComponent.saltpeter.name=Saltpeter -item.bloodmagic.baseComponent.neurotoxin.name=Neuro Toxin -item.bloodmagic.baseComponent.antiseptic.name=Antiseptic +item.bloodmagic.component.frame_part.name=Frame Parts +item.bloodmagic.component.sand_iron.name=Iron Sand +item.bloodmagic.component.sand_gold.name=Gold Sand +item.bloodmagic.component.sand_coal.name=Coal Sand +item.bloodmagic.component.plant_oil.name=Plant Oil +item.bloodmagic.component.sulfur.name=Sulfur +item.bloodmagic.component.saltpeter.name=Saltpeter +item.bloodmagic.component.neuro_toxin.name=Neuro Toxin +item.bloodmagic.component.antiseptic.name=Antiseptic +item.bloodmagic.component.catalyst_length_1.name=Simple Lengthening Catalyst +item.bloodmagic.component.catalyst_power_1.name=Simple Power Catalyst item.bloodmagic.cuttingFluid.basicCuttingFluid.name=Basic Cutting Fluid item.bloodmagic.cuttingFluid.explosive.name=Explosive Powder -item.bloodmagic.baseComponent.mundaneLength.name=Simple Lengthening Catalyst -item.bloodmagic.baseComponent.mundanePower.name=Simple Power Catalyst - - item.bloodmagic.demonCrystal.crystalDefault.name=Demon Will Crystal item.bloodmagic.demonCrystal.crystalCorrosive.name=Corrosive Will Crystal item.bloodmagic.demonCrystal.crystalDestructive.name=Destructive Will Crystal