diff --git a/README.md b/README.md index 6fc227a..de2f476 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,8 @@ Electro-Magic Tools is a Minecraft mod which integrates Thaumcraft 4 with Indust #Downloads -Github: - -https://github.com/fewizz/Electro-Magic-Tools/releases +[CURSE](http://minecraft.curseforge.com/projects/electro-magic-tools) +[Github](https://github.com/fewizz/Electro-Magic-Tools/releases) #Issues diff --git a/build.properties b/build.properties index d56c816..2dcf0b2 100644 --- a/build.properties +++ b/build.properties @@ -3,5 +3,5 @@ package_group=com.tombenpotter.emt mc_version=1.7.10 forge_version=10.13.4.1481 -mod_version=1.2.0 +mod_version=1.2.1 mod_name=ElectroMagicTools diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java index da2539c..e113dd7 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java @@ -36,6 +36,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { public int hitCost = 300; public int tier = 2; public static AudioSource audio; + boolean dropped = false; public ItemDiamondChainsaw() { super(ToolMaterial.EMERALD); @@ -125,12 +126,24 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); } + @Override + public boolean onDroppedByPlayer(ItemStack item, EntityPlayer player) + { + if (audio != null) { + audio.stop(); + audio.remove(); + audio = null; + dropped = true; + } + return true; + } + @Override public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag) { if(entity instanceof EntityLivingBase){ if (IC2.platform.isRendering()) { - if (flag) { + if (flag && !dropped) { if (audio == null) audio = IC2.audioManager.createSource(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawIdle.ogg", true, false, IC2.audioManager.getDefaultVolume()); if (audio != null) { audio.updatePosition(); @@ -142,6 +155,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { audio = null; IC2.audioManager.playOnce(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawStop.ogg", true, IC2.audioManager.getDefaultVolume()); } + dropped = false; } } } diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java index 40f8908..d310182 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java @@ -81,7 +81,7 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw { { if(entity instanceof EntityLivingBase){ if (IC2.platform.isRendering()) { - if (flag) { + if (flag && !dropped) { if (audio == null) audio = IC2.audioManager.createSource(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawIdle.ogg", true, false, IC2.audioManager.getDefaultVolume()); if (audio != null) { audio.updatePosition(); @@ -93,9 +93,22 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw { audio = null; IC2.audioManager.playOnce(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawStop.ogg", true, IC2.audioManager.getDefaultVolume()); } + dropped = false; } } } + + @Override + public boolean onDroppedByPlayer(ItemStack item, EntityPlayer player) + { + if(audio != null){ + audio.stop(); + audio.remove(); + audio = null; + dropped = true; + } + return true; + } @Override public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java index 85a62bd..74a6c73 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java @@ -35,7 +35,7 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw { { if(entity instanceof EntityLivingBase){ if (IC2.platform.isRendering()) { - if (flag) { + if (flag && !dropped) { if (audio == null) audio = IC2.audioManager.createSource(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawIdle.ogg", true, false, IC2.audioManager.getDefaultVolume()); if (audio != null) { audio.updatePosition(); @@ -47,9 +47,22 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw { audio = null; IC2.audioManager.playOnce(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawStop.ogg", true, IC2.audioManager.getDefaultVolume()); } + dropped = false; } } } + + @Override + public boolean onDroppedByPlayer(ItemStack item, EntityPlayer player) + { + if (audio != null) { + audio.stop(); + audio.remove(); + audio = null; + dropped = true; + } + return true; + } @SideOnly(Side.CLIENT) @Override diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearch.java b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java index 97d9af2..772b48e 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTResearch.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java @@ -23,369 +23,317 @@ public class EMTResearch { } public static void addResearch() { - ResearchItem research; - String text; - /** Research that can't be disabled **/ - text = "1"; - research = new EMTResearchItem("Electric Magic Tools", "EMT", new AspectList(), 0, 0, 0, new ResourceLocation("electromagictools:textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text)); + new EMTResearchItem("Electric Magic Tools", "EMT", new AspectList(), 0, 0, 0, new ResourceLocation("electromagictools:textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem() + .setPages(new ResearchPage("1")); + + new EMTResearchItem("Diamond Chainsaw", "EMT", new AspectList(), 5, -6, 0, new ItemStack(ItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.diamondChainsaw)); - text = "1"; - research = new EMTResearchItem("Diamond Chainsaw", "EMT", new AspectList(), 5, -6, 0, new ItemStack(ItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.diamondChainsaw)); + new EMTResearchItem("Thaumium Plate", "EMT", new AspectList(), 6, -6, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumPlate)); - text = "1"; - research = new EMTResearchItem("Thaumium Plate", "EMT", new AspectList(), 6, -6, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumiumPlate)); + new EMTResearchItem("Macerating Native Ore Clusters", "EMT", new AspectList(), 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem() + .setPages(new ResearchPage("1")); - text = "1"; - research = new EMTResearchItem("Macerating Native Ore Clusters", "EMT", new AspectList(), 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text)); + new EMTResearchItem("The Legend", "EMT", new AspectList(), 5, -5, 0, new ItemStack(ItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem() + .setPages(new ResearchPage("1")); - text = "1"; - research = new EMTResearchItem("The Legend", "EMT", new AspectList(), 5, -5, 0, new ItemStack(ItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text)); + new EMTResearchItem("Lightning Summoner", "EMT", new AspectList(), 6, -5, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem() + .setPages(new ResearchPage("1")); - text = "1"; - research = new EMTResearchItem("Lightning Summoner", "EMT", new AspectList(), 6, -5, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text)); + new EMTResearchItem("The One Ring", "EMT", new AspectList(), 6, -7, 0, new ItemStack(ItemRegistry.onering)).setRound().setAutoUnlock().registerResearchItem() + .setPages(new ResearchPage("1")); - text = "1"; - research = new EMTResearchItem("The One Ring", "EMT", new AspectList(), 6, -7, 0, new ItemStack(ItemRegistry.onering)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text)); - - text = "1"; - research = new EMTResearchItem("Feather Wings", "EMT", new AspectList(), 0, 2, 0, new ItemStack(ItemRegistry.featherWing)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.rubberBall), new ResearchPage(RecipeRegistry.ductTape), new ResearchPage(RecipeRegistry.featherMesh), new ResearchPage(RecipeRegistry.cardboard), new ResearchPage(RecipeRegistry.featherWing), new ResearchPage(RecipeRegistry.featherWings)); + new EMTResearchItem("Feather Wings", "EMT", new AspectList(), 0, 2, 0, new ItemStack(ItemRegistry.featherWing)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem() + .setPages(new ResearchPage(RecipeRegistry.cardboard), new ResearchPage(RecipeRegistry.featherWing), new ResearchPage(RecipeRegistry.featherWings)); /** Research that can be disabled **/ if (ConfigHandler.thaumiumDrillResearch == false) { - text = "1"; - research = new EMTResearchItem("Thaumium Drill", "EMT", ResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumiumDrill)); + new EMTResearchItem("Thaumium Drill", "EMT", ResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumDrill)); } if (ConfigHandler.thaumiumChainsawResearch == false) { - text = "1"; - research = new EMTResearchItem("Thaumium Chainsaw", "EMT", ResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumiumChainsaw)); + new EMTResearchItem("Thaumium Chainsaw", "EMT", ResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumChainsaw)); } if (ConfigHandler.electricGooglesResearch == false) { - text = "1"; - research = new EMTResearchItem("Electric Goggles", "EMT", ResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.electricGoggles)); + new EMTResearchItem("Electric Goggles", "EMT", ResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricGoggles)); } if (ConfigHandler.electricGooglesResearch == false) { - if (ConfigHandler.nanoGooglesResearch == false) { - text = "1"; - research = new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", ResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumicNanoHelmet)); + if (ConfigHandler.nanoGooglesResearch == false) {; + new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", ResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumicNanoHelmet)); } } if (ConfigHandler.electricGooglesResearch == false) { if (ConfigHandler.nanoGooglesResearch == false) { if (ConfigHandler.quantumGooglesResearch == false) { - text = "1"; - research = new EMTResearchItem("Quantum Goggles of Revealing", "EMT", ResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumicQuantumHelmet)); + new EMTResearchItem("Quantum Goggles of Revealing", "EMT", ResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumicQuantumHelmet)); } } } if (ConfigHandler.ironOmnitoolResearch == false) { - text = "1"; - research = new EMTResearchItem("Iron Omnitool", "EMT", new AspectList(), -2, 0, 0, new ItemStack(ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.ironOmnitool)); + new EMTResearchItem("Iron Omnitool", "EMT", new AspectList(), -2, 0, 0, new ItemStack(ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.ironOmnitool)); } if (ConfigHandler.ironOmnitoolResearch == false) { if (ConfigHandler.diamondOmnitoolResearch == false) { - text = "1"; - research = new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.diamondOmnitool), new ResearchPage(RecipeRegistry.ironOmnitoolToDiamond)); + new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.diamondOmnitool), new ResearchPage(RecipeRegistry.ironOmnitoolToDiamond)); } } if (ConfigHandler.thaumiumDrillResearch == false && ConfigHandler.thaumiumChainsawResearch == false) { if (ConfigHandler.thaumiumOmnitoolResearch == false) { - text = "1"; - research = new EMTResearchItem("Thaumium Omnitool", "EMT", ResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumiumOmnitool), new ResearchPage(RecipeRegistry.diamondOmnitoolToThaumium)); + new EMTResearchItem("Thaumium Omnitool", "EMT", ResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumOmnitool), new ResearchPage(RecipeRegistry.diamondOmnitoolToThaumium)); } } if (ConfigHandler.explosionFocusResearch == false) { - text = "1"; - research = new EMTResearchItem("Explosion Focus", "EMT", ResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.explosionFocus)); + new EMTResearchItem("Explosion Focus", "EMT", ResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.explosionFocus)); } if (ConfigHandler.christmasFocusResearch == false) { - text = "1"; - research = new EMTResearchItem("Kris-tmas Focus", "EMT", ResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.christmasFocus)); + new EMTResearchItem("Kris-tmas Focus", "EMT", ResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.christmasFocus)); } if (ConfigHandler.shieldFocusResearch == false) { - text = "1"; - research = new EMTResearchItem("Shield Focus", "EMT", ResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.shieldFocus)); + new EMTResearchItem("Shield Focus", "EMT", ResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.shieldFocus)); } if (ConfigHandler.shieldFocusResearch == false) { if (ConfigHandler.shieldBlockResearch == false) { - text = "1"; - research = new EMTResearchItem("Shield Block", "EMT", ResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.shieldBlock)); + new EMTResearchItem("Shield Block", "EMT", ResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.shieldBlock)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { - text = "1"; - research = new EMTResearchItem("Potentia Generator", "EMT", ResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.potentiaGenerator)); + new EMTResearchItem("Potentia Generator", "EMT", ResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.potentiaGenerator)); } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.ignisGeneratorResearch == false) { - text = "1"; - research = new EMTResearchItem("Ignis Generator", "EMT", ResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.ignisGenerator)); + new EMTResearchItem("Ignis Generator", "EMT", ResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.ignisGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.auramGeneratorResearch == false) { - text = "1"; - research = new EMTResearchItem("Auram Generator", "EMT", ResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.auramGenerator)); + new EMTResearchItem("Auram Generator", "EMT", ResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.auramGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.arborGeneratorResearch == false) { - text = "1"; - research = new EMTResearchItem("Arbor Generator", "EMT", ResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.arborGenerator)); + new EMTResearchItem("Arbor Generator", "EMT", ResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.arborGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.aerGeneratorResearch == false) { - text = "1"; - research = new EMTResearchItem("Aer Generator", "EMT", ResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.aerGenerator)); + new EMTResearchItem("Aer Generator", "EMT", ResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.aerGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.wandChargingSationResearch == false) { - text = "1"; - research = new EMTResearchItem("Industrial Wand Charging Station", "EMT", ResearchAspects.wandCharger, -4, 2, 3, new ItemStack(BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.wandRecharger)); + new EMTResearchItem("Industrial Wand Charging Station", "EMT", ResearchAspects.wandCharger, -4, 2, 3, new ItemStack(BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.wandRecharger)); } } if (ConfigHandler.thaumiumChainsawResearch == false) { if (ConfigHandler.streamChainsawResearch == false) { - text = "1"; - research = new EMTResearchItem("Chainsaw of the Stream", "EMT", ResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.streamChainsaw)); + new EMTResearchItem("Chainsaw of the Stream", "EMT", ResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.streamChainsaw)); } } if (ConfigHandler.thaumiumDrillResearch == false) { if (ConfigHandler.rockbreakerDrillResearch == false) { - text = "1"; - research = new EMTResearchItem("Drill of the Rockbreaker", "EMT", ResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.rockbreakerDrill)); + new EMTResearchItem("Drill of the Rockbreaker", "EMT", ResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.rockbreakerDrill)); } } if (ConfigHandler.tinyUraniumResearch == false) { - text = "1"; - research = new EMTResearchItem("Tiny Uranium", "EMT", ResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.tinyUranium)); + new EMTResearchItem("Tiny Uranium", "EMT", ResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.tinyUranium)); } if (ConfigHandler.thorHammerResearch == false) { - text = "1"; - research = new EMTResearchItem("Mjolnir", "EMT", ResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thorHammer)); + new EMTResearchItem("Mjolnir", "EMT", ResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thorHammer)); } if (ConfigHandler.thorHammerResearch == false) { if (ConfigHandler.superchargedThorHammerResearch == false) { - text = "1"; - research = new EMTResearchItem("Supercharged Mjolnir", "EMT", ResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.superchargedThorHammer)); + new EMTResearchItem("Supercharged Mjolnir", "EMT", ResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.superchargedThorHammer)); } } if (ConfigHandler.compressedSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Compressed Solars", "EMT", ResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.compressedSolar), new ResearchPage(RecipeRegistry.doubleCompressedSolar), new ResearchPage(RecipeRegistry.tripleCompressedSolar)); + new EMTResearchItem("Compressed Solars", "EMT", ResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.compressedSolar), new ResearchPage(RecipeRegistry.doubleCompressedSolar), new ResearchPage(RecipeRegistry.tripleCompressedSolar)); } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.solarHelmetResearch == false) { - text = "1"; - research = new EMTResearchItem("Solar Helmet of Revealing", "EMT", ResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.solarHelmetRevealing)); + new EMTResearchItem("Solar Helmet of Revealing", "EMT", ResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.solarHelmetRevealing)); } } if (ConfigHandler.electricBootsResearch == false) { - text = "1"; - research = new EMTResearchItem("Electric Boots of the Traveller", "EMT", ResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.electricBootsTravel)); + new EMTResearchItem("Electric Boots of the Traveller", "EMT", ResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricBootsTravel)); } if (ConfigHandler.electricBootsResearch == false) { if (ConfigHandler.nanoBootsResearch == false) { - text = "1"; - research = new EMTResearchItem("Nano Boots of the Traveller", "EMT", ResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.nanoBootsTravel)); + new EMTResearchItem("Nano Boots of the Traveller", "EMT", ResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.nanoBootsTravel)); } } if (ConfigHandler.electricBootsResearch == false) { if (ConfigHandler.nanoBootsResearch == false) { if (ConfigHandler.quantumBootsResearch == false) { - text = "1"; - research = new EMTResearchItem("Quantum Boots of the Traveller", "EMT", ResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.quantumBootsTravel)); + new EMTResearchItem("Quantum Boots of the Traveller", "EMT", ResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.quantumBootsTravel)); } } } if (ConfigHandler.electricScribingToolsResearch == false) { - text = "1"; - research = new EMTResearchItem("Electric Scribing Tools", "EMT", ResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.electricScribingTools)); + new EMTResearchItem("Electric Scribing Tools", "EMT", ResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricScribingTools)); } if (ConfigHandler.etherealProcessorResearch == false) { - text = "1"; - research = new EMTResearchItem("Etheral Processor", "EMT", ResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.etheralProcessor)); + new EMTResearchItem("Etheral Processor", "EMT", ResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.etheralProcessor)); } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.waterSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Water Infused Solar Panels", "EMT", ResearchAspects.waterSolars, -7, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.waterSolar), new ResearchPage(RecipeRegistry.doubleWaterSolar), new ResearchPage(RecipeRegistry.tripleWaterSolar)); + new EMTResearchItem("Water Infused Solar Panels", "EMT", ResearchAspects.waterSolars, -7, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.waterSolar), new ResearchPage(RecipeRegistry.doubleWaterSolar), new ResearchPage(RecipeRegistry.tripleWaterSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.darkSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Entropy Infused Solar Panels", "EMT", ResearchAspects.darkSolars, -8, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.darkSolar), new ResearchPage(RecipeRegistry.doubleDarkSolar), new ResearchPage(RecipeRegistry.tripleDarkSolar)); + new EMTResearchItem("Entropy Infused Solar Panels", "EMT", ResearchAspects.darkSolars, -8, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.darkSolar), new ResearchPage(RecipeRegistry.doubleDarkSolar), new ResearchPage(RecipeRegistry.tripleDarkSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.orderSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Order Infused Solar Panels", "EMT", ResearchAspects.orderSolars, -6, -8, 1, new ItemStack(BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.orderSolar), new ResearchPage(RecipeRegistry.doubleOrderSolar), new ResearchPage(RecipeRegistry.tripleOrderSolar)); + new EMTResearchItem("Order Infused Solar Panels", "EMT", ResearchAspects.orderSolars, -6, -8, 1, new ItemStack(BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.orderSolar), new ResearchPage(RecipeRegistry.doubleOrderSolar), new ResearchPage(RecipeRegistry.tripleOrderSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.fireSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Fire Infused Solar Panels", "EMT", ResearchAspects.fireSolars, -5, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.fireSolar), new ResearchPage(RecipeRegistry.doubleFireSolar), new ResearchPage(RecipeRegistry.tripleFireSolar)); + new EMTResearchItem("Fire Infused Solar Panels", "EMT", ResearchAspects.fireSolars, -5, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.fireSolar), new ResearchPage(RecipeRegistry.doubleFireSolar), new ResearchPage(RecipeRegistry.tripleFireSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.airSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Air Infused Solar Panels", "EMT", ResearchAspects.airSolars, -4, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.airSolar), new ResearchPage(RecipeRegistry.doubleAirSolar), new ResearchPage(RecipeRegistry.tripleAirSolar)); + new EMTResearchItem("Air Infused Solar Panels", "EMT", ResearchAspects.airSolars, -4, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.airSolar), new ResearchPage(RecipeRegistry.doubleAirSolar), new ResearchPage(RecipeRegistry.tripleAirSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.earthSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Earth Infused Solar Panels", "EMT", ResearchAspects.earthSolars, -6, -7, 1, new ItemStack(BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.earthSolar), new ResearchPage(RecipeRegistry.doubleEarthSolar), new ResearchPage(RecipeRegistry.tripleEarthSolar)); + new EMTResearchItem("Earth Infused Solar Panels", "EMT", ResearchAspects.earthSolars, -6, -7, 1, new ItemStack(BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.earthSolar), new ResearchPage(RecipeRegistry.doubleEarthSolar), new ResearchPage(RecipeRegistry.tripleEarthSolar)); } } if (ConfigHandler.uuMInfusionResearch == false) { - text = "1"; - research = new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(ItemRegistry.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.charcoalToCoal), new ResearchPage(RecipeRegistry.glowstoneDustToBlock), new ResearchPage(RecipeRegistry.stoneBricksToIronOre), new ResearchPage(RecipeRegistry.arcaneStoneToCopperOre), new ResearchPage(RecipeRegistry.arcaneStoneBricksToTinOre), new ResearchPage(RecipeRegistry.amberBlockToLeadOre), new ResearchPage(RecipeRegistry.amberBricksToUraniumOre), new ResearchPage(RecipeRegistry.shardToResin), new ResearchPage(RecipeRegistry.shardToRedstone), new ResearchPage(RecipeRegistry.shardToLapis), new ResearchPage(RecipeRegistry.ironToGold), new ResearchPage(RecipeRegistry.goldToDiamond), new ResearchPage(RecipeRegistry.diamondToUranium), new ResearchPage(RecipeRegistry.uraniumToIridium)); + new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(ItemRegistry.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.charcoalToCoal), new ResearchPage(RecipeRegistry.glowstoneDustToBlock), new ResearchPage(RecipeRegistry.stoneBricksToIronOre), new ResearchPage(RecipeRegistry.arcaneStoneToCopperOre), new ResearchPage(RecipeRegistry.arcaneStoneBricksToTinOre), new ResearchPage(RecipeRegistry.amberBlockToLeadOre), new ResearchPage(RecipeRegistry.amberBricksToUraniumOre), new ResearchPage(RecipeRegistry.shardToResin), new ResearchPage(RecipeRegistry.shardToRedstone), new ResearchPage(RecipeRegistry.shardToLapis), new ResearchPage(RecipeRegistry.ironToGold), new ResearchPage(RecipeRegistry.goldToDiamond), new ResearchPage(RecipeRegistry.diamondToUranium), new ResearchPage(RecipeRegistry.uraniumToIridium)); } if (ConfigHandler.portableNodeResarch == false) { - text = "1"; - research = new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.portableNode)); + new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.portableNode)); } if (ConfigHandler.electricHoeGrowthResearch == false) { - text = "1"; - research = new EMTResearchItem("Electric Hoe of Growth", "EMT", ResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.electricHoeGrowth)); + new EMTResearchItem("Electric Hoe of Growth", "EMT", ResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricHoeGrowth)); } if (ConfigHandler.chargeFocusResearch == false) { - text = "1"; - research = new EMTResearchItem("Wand Focus: Charging", "EMT", ResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.chargeFocus)); + new EMTResearchItem("Wand Focus: Charging", "EMT", ResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.chargeFocus)); } if (ConfigHandler.wandChargeFocusResearch == false) { - text = "1"; - research = new EMTResearchItem("Wand Focus: Wand Charging", "EMT", ResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.wandChargeFocus)); + new EMTResearchItem("Wand Focus: Wand Charging", "EMT", ResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.wandChargeFocus)); } if (ConfigHandler.inventoryChargingRing == false) { - text = "1"; - research = new EMTResearchItem("Inventory Charging Ring", "EMT", ResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.inventoryChargingRing)); + new EMTResearchItem("Inventory Charging Ring", "EMT", ResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.inventoryChargingRing)); } if (ConfigHandler.armorChargingRing == false) { - text = "1"; - research = new EMTResearchItem("Armor Charging Ring", "EMT", ResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.armorChargingRing)); + new EMTResearchItem("Armor Charging Ring", "EMT", ResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.armorChargingRing)); } if (ConfigHandler.thaumiumWingResearch == false) { - text = "1"; - research = new EMTResearchItem("Thaumium Reinforced Wings", "EMT", ResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.thaumiumWing), new ResearchPage(RecipeRegistry.thaumiumWings)); + new EMTResearchItem("Thaumium Reinforced Wings", "EMT", ResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumWing), new ResearchPage(RecipeRegistry.thaumiumWings)); } if (ConfigHandler.nanoWingResearch == false) { - text = "1"; - research = new EMTResearchItem("Nanosuit Wings", "EMT", ResearchAspects.nanoWing, 0, 6, 2, new ItemStack(ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.nanoWings)); + new EMTResearchItem("Nanosuit Wings", "EMT", ResearchAspects.nanoWing, 0, 6, 2, new ItemStack(ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.nanoWings)); } if (ConfigHandler.quantumWingsResearch == false) { - text = "1"; - research = new EMTResearchItem("Quantum Wings", "EMT", ResearchAspects.quantumWing, 0, 8, 3, new ItemStack(ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.quantumWings)); + new EMTResearchItem("Quantum Wings", "EMT", ResearchAspects.quantumWing, 0, 8, 3, new ItemStack(ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.quantumWings)); } - text = "1"; - research = new EMTResearchItem("Infused Quantum Armor", "EMT", ResearchAspects.quantumWing, 0, 10, 4, new ItemStack(ItemRegistry.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.infusedQuantumArmor)); + if(ConfigHandler.thaumiumWingResearch == false){ + if(ConfigHandler.nanoWingResearch == false){ + if(ConfigHandler.quantumWingsResearch == false){ + new EMTResearchItem("Infused Quantum Armor", "EMT", ResearchAspects.quantumWing, 0, 10, 4, new ItemStack(ItemRegistry.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem() + .setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.infusedQuantumArmor)); + } + } + } } }