diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index b11cad7b..19d65e9e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -112,6 +112,7 @@ import WayofTime.alchemicalWizardry.common.harvest.CactusReedHarvestHandler; import WayofTime.alchemicalWizardry.common.harvest.GourdHarvestHandler; import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry; import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; +import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmEarth; @@ -1326,9 +1327,9 @@ public class AlchemicalWizardry ReagentRegistry.registerItemAndReagent(new ItemStack(ModItems.baseAlchemyItems, 1, 7), new ReagentStack(ReagentRegistry.reductusReagent, 1000)); ReagentRegistry.registerItemAndReagent(new ItemStack(ModItems.baseAlchemyItems, 1, 8), new ReagentStack(ReagentRegistry.potentiaReagent, 1000)); - OmegaRegistry.registerParadigm(ReagentRegistry.aquasalusReagent, new OmegaParadigmWater(ModItems.boundHelmetWater, ModItems.boundPlateWater, ModItems.boundLeggingsWater, ModItems.boundBootsWater)); - OmegaRegistry.registerParadigm(ReagentRegistry.terraeReagent, new OmegaParadigmEarth(ModItems.boundHelmetEarth, ModItems.boundPlateEarth, ModItems.boundLeggingsEarth, ModItems.boundBootsEarth)); - OmegaRegistry.registerParadigm(ReagentRegistry.aetherReagent, new OmegaParadigmWind(ModItems.boundHelmetWind, ModItems.boundPlateWind, ModItems.boundLeggingsWind, ModItems.boundBootsWind)); + OmegaRegistry.registerParadigm(ReagentRegistry.aquasalusReagent, new OmegaParadigmWater((OmegaArmour)ModItems.boundHelmetWater, (OmegaArmour)ModItems.boundPlateWater, (OmegaArmour)ModItems.boundLeggingsWater, (OmegaArmour)ModItems.boundBootsWater)); + OmegaRegistry.registerParadigm(ReagentRegistry.terraeReagent, new OmegaParadigmEarth((OmegaArmour)ModItems.boundHelmetEarth, (OmegaArmour)ModItems.boundPlateEarth, (OmegaArmour)ModItems.boundLeggingsEarth, (OmegaArmour)ModItems.boundBootsEarth)); + OmegaRegistry.registerParadigm(ReagentRegistry.aetherReagent, new OmegaParadigmWind((OmegaArmour)ModItems.boundHelmetWind, (OmegaArmour)ModItems.boundPlateWind, (OmegaArmour)ModItems.boundLeggingsWind, (OmegaArmour)ModItems.boundBootsWind)); } public static void initDemonPacketRegistiry() diff --git a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java index 754d41e7..05ec84c3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java @@ -46,7 +46,6 @@ import WayofTime.alchemicalWizardry.common.items.TelepositionFocus; import WayofTime.alchemicalWizardry.common.items.TranscendentBloodOrb; import WayofTime.alchemicalWizardry.common.items.WaterScribeTool; import WayofTime.alchemicalWizardry.common.items.armour.BoundArmour; -import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourEarth; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourWater; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourWind; @@ -213,20 +212,20 @@ public class ModItems public static Item transcendentBloodOrb; public static Item itemAssassinSigil; - public static OmegaArmour boundHelmetWater; - public static OmegaArmour boundPlateWater; - public static OmegaArmour boundLeggingsWater; - public static OmegaArmour boundBootsWater; + public static Item boundHelmetWater; + public static Item boundPlateWater; + public static Item boundLeggingsWater; + public static Item boundBootsWater; - public static OmegaArmour boundHelmetEarth; - public static OmegaArmour boundPlateEarth; - public static OmegaArmour boundLeggingsEarth; - public static OmegaArmour boundBootsEarth; + public static Item boundHelmetEarth; + public static Item boundPlateEarth; + public static Item boundLeggingsEarth; + public static Item boundBootsEarth; - public static OmegaArmour boundHelmetWind; - public static OmegaArmour boundPlateWind; - public static OmegaArmour boundLeggingsWind; - public static OmegaArmour boundBootsWind; + public static Item boundHelmetWind; + public static Item boundPlateWind; + public static Item boundLeggingsWind; + public static Item boundBootsWind; public static Item inputRoutingFocus; public static Item outputRoutingFocus; @@ -334,20 +333,20 @@ public class ModItems itemCompressionSigil = new ItemPackRatSigil().setUnlocalizedName("itemCompressionSigil"); itemAssassinSigil = new ItemSigilOfTheAssassin().setUnlocalizedName("itemAssassinSigil"); - boundHelmetWater = (OmegaArmour) new OmegaArmourWater(0).setUnlocalizedName("boundHelmetWater"); - boundPlateWater = (OmegaArmour) new OmegaArmourWater(1).setUnlocalizedName("boundPlateWater"); - boundLeggingsWater = (OmegaArmour) new OmegaArmourWater(2).setUnlocalizedName("boundLeggingsWater"); - boundBootsWater = (OmegaArmour) new OmegaArmourWater(3).setUnlocalizedName("boundBootsWater"); + boundHelmetWater = new OmegaArmourWater(0).setUnlocalizedName("boundHelmetWater"); + boundPlateWater = new OmegaArmourWater(1).setUnlocalizedName("boundPlateWater"); + boundLeggingsWater = new OmegaArmourWater(2).setUnlocalizedName("boundLeggingsWater"); + boundBootsWater = new OmegaArmourWater(3).setUnlocalizedName("boundBootsWater"); - boundHelmetEarth = (OmegaArmour) new OmegaArmourEarth(0).setUnlocalizedName("boundHelmetEarth"); - boundPlateEarth = (OmegaArmour) new OmegaArmourEarth(1).setUnlocalizedName("boundPlateEarth"); - boundLeggingsEarth = (OmegaArmour) new OmegaArmourEarth(2).setUnlocalizedName("boundLeggingsEarth"); - boundBootsEarth = (OmegaArmour) new OmegaArmourEarth(3).setUnlocalizedName("boundBootsEarth"); + boundHelmetEarth = new OmegaArmourEarth(0).setUnlocalizedName("boundHelmetEarth"); + boundPlateEarth = new OmegaArmourEarth(1).setUnlocalizedName("boundPlateEarth"); + boundLeggingsEarth = new OmegaArmourEarth(2).setUnlocalizedName("boundLeggingsEarth"); + boundBootsEarth = new OmegaArmourEarth(3).setUnlocalizedName("boundBootsEarth"); - boundHelmetWind = (OmegaArmour) new OmegaArmourWind(0).setUnlocalizedName("boundHelmetWind"); - boundPlateWind = (OmegaArmour) new OmegaArmourWind(1).setUnlocalizedName("boundPlateWind"); - boundLeggingsWind = (OmegaArmour) new OmegaArmourWind(2).setUnlocalizedName("boundLeggingsWind"); - boundBootsWind = (OmegaArmour) new OmegaArmourWind(3).setUnlocalizedName("boundBootsWind"); + boundHelmetWind = new OmegaArmourWind(0).setUnlocalizedName("boundHelmetWind"); + boundPlateWind = new OmegaArmourWind(1).setUnlocalizedName("boundPlateWind"); + boundLeggingsWind = new OmegaArmourWind(2).setUnlocalizedName("boundLeggingsWind"); + boundBootsWind = new OmegaArmourWind(3).setUnlocalizedName("boundBootsWind"); inputRoutingFocus = new InputRoutingFocus().setUnlocalizedName("inputRoutingFocus"); outputRoutingFocus = new OutputRoutingFocus().setUnlocalizedName("outputRoutingFocus");