diff --git a/build.properties b/build.properties index 2dcf0b2..972dcbd 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.1 +mod_version=1.2.2 mod_name=ElectroMagicTools diff --git a/src/main/java/tombenpotter/emt/ModInformation.java b/src/main/java/tombenpotter/emt/ModInformation.java index f5a4174..4a023fc 100644 --- a/src/main/java/tombenpotter/emt/ModInformation.java +++ b/src/main/java/tombenpotter/emt/ModInformation.java @@ -4,7 +4,7 @@ public class ModInformation { public static final String name = "Electro-Magic Tools"; public static final String modid = "EMT"; - public static final String version = "1.2.0"; + public static final String version = "1.2.2"; public static final String texturePath = "electromagictools"; public static final String guiFactory = "tombenpotter.emt.client.gui.config.EMTGuiFactory"; public static final String clientProxy = "tombenpotter.emt.proxies.ClientProxy"; diff --git a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java b/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java index a184420..6c7f60f 100644 --- a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java +++ b/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java @@ -24,10 +24,10 @@ public class EMTGuiConfig extends GuiConfig { private static List getConfigElements(GuiScreen parent) { List list = new ArrayList(); - list.add(new ConfigElement(config.getCategory(CATEGORY_RANDOM.toLowerCase(Locale.US)))); - list.add(new ConfigElement(config.getCategory(CATEGORY_VALUES.toLowerCase(Locale.US)))); - list.add(new ConfigElement(config.getCategory(CATEGORY_RESEARCH.toLowerCase(Locale.US)))); - list.add(new ConfigElement(config.getCategory(CATEGORY_OUTPUTS.toLowerCase(Locale.US)))); + list.add(new ConfigElement(config.getCategory(RANDOM.toLowerCase(Locale.US)))); + list.add(new ConfigElement(config.getCategory(VALUES.toLowerCase(Locale.US)))); + list.add(new ConfigElement(config.getCategory(RESEARCH.toLowerCase(Locale.US)))); + list.add(new ConfigElement(config.getCategory(OUTPUTS.toLowerCase(Locale.US)))); return list; } diff --git a/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java index 5332ac1..74691fa 100644 --- a/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java @@ -1,7 +1,12 @@ package tombenpotter.emt.common.init; import cpw.mods.fml.common.registry.GameRegistry; +import ic2.api.item.IC2Items; import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import static thaumcraft.api.ThaumcraftApi.*; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; import tombenpotter.emt.ModInformation; import tombenpotter.emt.common.blocks.BlockEMTMachines; import tombenpotter.emt.common.blocks.BlockEMTSolars; @@ -45,4 +50,25 @@ public class BlockRegistry { essentiaGens = new BlockEssentiaGenerators().setBlockName(ModInformation.modid + ".essentiaGens"); GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "EssentiaGenerators"); } + + public static void addAspects(){ + registerObjectTag(IC2Items.getItem("rubberTrampoline"), new AspectList().add(Aspect.AIR, 5)); + registerObjectTag(IC2Items.getItem("ironFence"), new AspectList().add(Aspect.ENERGY, 1).add(Aspect.METAL, 2).add(Aspect.WEATHER, 1)); + registerObjectTag(IC2Items.getItem("reinforcedGlass"), new AspectList().add(Aspect.METAL, 2).add(Aspect.COLD, 2)); + registerObjectTag(IC2Items.getItem("scaffold"), new AspectList().add(Aspect.TREE, 4)); + registerObjectTag(IC2Items.getItem("ironScaffold"), new AspectList().add(Aspect.METAL, 4)); + registerObjectTag(IC2Items.getItem("generator"), new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 2).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("waterMill"), new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 1).add(Aspect.WATER, 2).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("solarPanel"), new AspectList().add(Aspect.METAL, 1).add(Aspect.ENERGY, 1).add(Aspect.LIGHT, 2).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("windMill"), new AspectList().add(Aspect.ENERGY, 1).add(Aspect.WEATHER, 3).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("batBox"), new AspectList().add(Aspect.METAL, 1).add(Aspect.ENERGY, 3).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("cesuUnit"), new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 4).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("mfeUnit"), new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 5).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("mfsUnit"), new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 7).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("ironFurnace"), new AspectList().add(Aspect.METAL, 2).add(Aspect.FIRE, 2).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("electroFurnace"), new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 1).add(Aspect.FIRE, 3).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("macerator"), new AspectList().add(Aspect.METAL, 1).add(Aspect.ENERGY, 2).add(Aspect.MINE, 2).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("extractor"), new AspectList().add(Aspect.METAL, 2).add(Aspect.ENERGY, 1).add(Aspect.CRAFT, 2).add(Aspect.MECHANISM, 1)); + registerObjectTag(IC2Items.getItem("compressor"), new AspectList().add(Aspect.METAL, 1).add(Aspect.ENERGY, 2).add(Aspect.VOID, 3).add(Aspect.MECHANISM, 1)); + } } diff --git a/src/main/java/tombenpotter/emt/common/init/Registry.java b/src/main/java/tombenpotter/emt/common/init/Registry.java index 245e4f6..a1071b1 100644 --- a/src/main/java/tombenpotter/emt/common/init/Registry.java +++ b/src/main/java/tombenpotter/emt/common/init/Registry.java @@ -9,6 +9,7 @@ public class Registry{ } public static void registerLate(){ + BlockRegistry.addAspects(); RecipeRegistry.registerLateRecipes(); RecipeRegistry.registerUUMInfusionRecipes(); } diff --git a/src/main/java/tombenpotter/emt/common/util/ConfigHandler.java b/src/main/java/tombenpotter/emt/common/util/ConfigHandler.java index 6640290..5734568 100644 --- a/src/main/java/tombenpotter/emt/common/util/ConfigHandler.java +++ b/src/main/java/tombenpotter/emt/common/util/ConfigHandler.java @@ -9,10 +9,10 @@ public class ConfigHandler { public static Configuration config; // sections - public static String CATEGORY_RANDOM = "Random Configs"; - public static String CATEGORY_RESEARCH = "Research"; - public static String CATEGORY_VALUES = "Numeric Values"; - public static String CATEGORY_OUTPUTS = "Essentia Generator Outputs"; + public static String RANDOM = "Random Configs"; + public static String RESEARCH = "Research"; + public static String VALUES = "Numeric Values"; + public static String OUTPUTS = "Essentia Generator Outputs"; public static int essentiaGeneratorsDelay; public static int etherealProcessorBaseSpeed; @@ -102,6 +102,7 @@ public class ConfigHandler { public static boolean thaumiumWingResearch; public static boolean nanoWingResearch; public static boolean quantumWingsResearch; + public static boolean infusedQuantumChestplate; public static boolean aerGeneratorResearch; public static void init(File file) { @@ -111,94 +112,95 @@ public class ConfigHandler { public static void syncConfig() { - config.addCustomCategoryComment(CATEGORY_VALUES, "The only way to change some numbers that my machines uses."); - config.addCustomCategoryComment(CATEGORY_RESEARCH, "The only way to disable some researches. " + "Be careful, if you disable some researches, " + "all researches linked to it will be removed too. " + "Really, don't touch that unless you know exactly what you are doing."); - config.addCustomCategoryComment(CATEGORY_OUTPUTS, "Change outputs linked to different Essentias here"); - config.addCustomCategoryComment(CATEGORY_RANDOM, "Options that don't fit into the other categories."); + config.addCustomCategoryComment(VALUES, "The only way to change some numbers that my machines uses."); + config.addCustomCategoryComment(RESEARCH, "The only way to disable some researches. " + "Be careful, if you disable some researches, " + "all researches linked to it will be removed too. " + "Really, don't touch that unless you know exactly what you are doing."); + config.addCustomCategoryComment(OUTPUTS, "Change outputs linked to different Essentias here"); + config.addCustomCategoryComment(RANDOM, "Options that don't fit into the other categories."); - capesOn = config.get(CATEGORY_RANDOM, "Enable capes", true, "This config option is to enable or disable capes for people who have them. " + "Seriously, you shouldn't touch that unless you have another cape and " + "it conflicts with it.").getBoolean(capesOn); - toolsInBore = config.get(CATEGORY_RANDOM, "Tools for Arcane Bore", false, "This will augment the durablilty of the tools, and will also decrease the EU cost to 1. " + "The tools should have the same number of uses than before.").getBoolean(toolsInBore); - nightVisionOff = config.get(CATEGORY_RANDOM, "Disable nightvision helmets", false, "This was added because of mods making you totally blind if using nightvision. For example, enable that when in the Deep Dark.").getBoolean(nightVisionOff); - enchanting = config.get(CATEGORY_RANDOM, "Enable enchanting tools", false, "Warning: the enchantability is low.").getBoolean(enchanting); - smoke = config.get(CATEGORY_RANDOM, "Disable smoke effect for boots", false, "This effect only appears when the player isn't on the ground").getBoolean(smoke); - oneRingSpawn = config.get(CATEGORY_RANDOM, "Disable One Ring in dungeon chests", false, "There is no other way to get this item.").getBoolean(oneRingSpawn); - chanceTaintedMjolnir = config.get(CATEGORY_RANDOM, "Tainted Mjolnir spawning change", 25, "If you have a lot of mods adding dungeon loot, you should definetely increase this").getInt(); - chanceOneRing = config.get(CATEGORY_RANDOM, "One Ring spawning chance", 15, "If you have a lot of mods adding dungeon loot, you should definetely increase this").getInt(); - removeAmberAndCinnabarMacerating = config.get(CATEGORY_RANDOM, "Clear Amber/Cinnabar Macerating", true, "This is here because of conflicts between mods that add the same input and different outputs").getBoolean(removeAmberAndCinnabarMacerating); - impactOfRain = config.get(CATEGORY_RANDOM, "Impact of rain", true, "The impact of rain on all wings").getBoolean(impactOfRain); + capesOn = config.get(RANDOM, "Enable capes", true, "This config option is to enable or disable capes for people who have them. " + "Seriously, you shouldn't touch that unless you have another cape and " + "it conflicts with it.").getBoolean(capesOn); + toolsInBore = config.get(RANDOM, "Tools for Arcane Bore", false, "This will augment the durablilty of the tools, and will also decrease the EU cost to 1. " + "The tools should have the same number of uses than before.").getBoolean(toolsInBore); + nightVisionOff = config.get(RANDOM, "Disable nightvision helmets", false, "This was added because of mods making you totally blind if using nightvision. For example, enable that when in the Deep Dark.").getBoolean(nightVisionOff); + enchanting = config.get(RANDOM, "Enable enchanting tools", false, "Warning: the enchantability is low.").getBoolean(enchanting); + smoke = config.get(RANDOM, "Disable smoke effect for boots", false, "This effect only appears when the player isn't on the ground").getBoolean(smoke); + oneRingSpawn = config.get(RANDOM, "Disable One Ring in dungeon chests", false, "There is no other way to get this item.").getBoolean(oneRingSpawn); + chanceTaintedMjolnir = config.get(RANDOM, "Tainted Mjolnir spawning change", 25, "If you have a lot of mods adding dungeon loot, you should definetely increase this").getInt(); + chanceOneRing = config.get(RANDOM, "One Ring spawning chance", 15, "If you have a lot of mods adding dungeon loot, you should definetely increase this").getInt(); + removeAmberAndCinnabarMacerating = config.get(RANDOM, "Clear Amber/Cinnabar Macerating", true, "This is here because of conflicts between mods that add the same input and different outputs").getBoolean(removeAmberAndCinnabarMacerating); + impactOfRain = config.get(RANDOM, "Impact of rain", true, "The impact of rain on all wings").getBoolean(impactOfRain); // DEFAULTS - Aer - 15,000 Aqua - 5,000 Ignis - 20,000 Ordo - 16,000 Perditio - 10,000 Terra - 2,000 - airOutput = config.get(CATEGORY_OUTPUTS, "Aer Output", 15000).getDouble(airOutput); - waterOutput = config.get(CATEGORY_OUTPUTS, "Aqua Output", 5000).getDouble(waterOutput); - fireOutput = config.get(CATEGORY_OUTPUTS, "Ignis Output", 20000).getDouble(fireOutput); - orderOutput = config.get(CATEGORY_OUTPUTS, "Ordo Output", 16000).getDouble(orderOutput); - entropyOutput = config.get(CATEGORY_OUTPUTS, "Perditio Output", 10000).getDouble(entropyOutput); - earthOutput = config.get(CATEGORY_OUTPUTS, "Terra Output", 2000).getDouble(earthOutput); - outputCap = config.get(CATEGORY_OUTPUTS, "Output Cap", -1).getDouble(outputCap); + airOutput = config.get(OUTPUTS, "Aer Output", 15000).getDouble(airOutput); + waterOutput = config.get(OUTPUTS, "Aqua Output", 5000).getDouble(waterOutput); + fireOutput = config.get(OUTPUTS, "Ignis Output", 20000).getDouble(fireOutput); + orderOutput = config.get(OUTPUTS, "Ordo Output", 16000).getDouble(orderOutput); + entropyOutput = config.get(OUTPUTS, "Perditio Output", 10000).getDouble(entropyOutput); + earthOutput = config.get(OUTPUTS, "Terra Output", 2000).getDouble(earthOutput); + outputCap = config.get(OUTPUTS, "Output Cap", -1).getDouble(outputCap); - wandChargerConsumption = config.get(CATEGORY_VALUES, "Wand Charging Station Consumption", 50000, "This is the number you have to modify if you want to make the Industrial Wand Charging " + "Station use more or less EU to charge 1 unit of Vis on your wand.").getDouble(wandChargerConsumption); - compressedSolarOutput = config.get(CATEGORY_VALUES, "Compressed Solar Panel Output", 10, "This is the number you have to modify if you want to make the Compressed Solar Panel yield " + "more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(compressedSolarOutput); - doubleCompressedSolarOutput = config.get(CATEGORY_VALUES, "Double Compressed Solar Panel Output", 100, "This is the number you have to modify if you want to make the Double Compressed Solar Panel " + "yield more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(doubleCompressedSolarOutput); - tripleCompressedSolarOutput = config.get(CATEGORY_VALUES, "Triple Compressed Solar Panel Output", 1000, "This is the number you have to modify if you want to make the Triple Compressed Solar Panel " + "yield more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(tripleCompressedSolarOutput); - essentiaGeneratorsDelay = config.get(CATEGORY_VALUES, "Essentia Generators draw rate", 120, "The number of ticks the Essentia Generators wait before using 2 Essentia. " + "If you want them to be slower, increase the number.").getInt(essentiaGeneratorsDelay); - nanoBootsSpeed = config.get(CATEGORY_VALUES, "Nano Boots of the Traveller Speed", 0.25, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsSpeed); - quantumBootsSpeed = config.get(CATEGORY_VALUES, "Quantum Boots of the Traveller Speed", 0.5, "Watch out, that goes up REALLY quickly.").getDouble(quantumBootsSpeed); - nanoBootsJump = config.get(CATEGORY_VALUES, "Nano Boots of the Traveller jump", 0.6, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsJump); - quantumBootsJump = config.get(CATEGORY_VALUES, "Quantum Boots of the Traveller jump", 0.9, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsJump); - etherealProcessorBaseSpeed = config.get(CATEGORY_VALUES, "Etheral Processor speed", 400, "Default is 400, the double of a regular furnace").getInt(); - etherealProcessorBonus = config.get(CATEGORY_VALUES, "Ethereal Processor Bonus", 10, "This number is the chance of getting a Thaumium Ingot as a bonus when " + "processing an item in the machine. It is 1 out of the number you will enter. " + "The default is 1/10 chance.").getInt(); - chargeFocusProduction = config.get(CATEGORY_VALUES, "Wand Focus: Charge production", 64, "Default is 64").getInt(); - armorBaubleProduction = config.get(CATEGORY_VALUES, "Armor Charging Ring production", 32, "Default is 32").getInt(); - inventoryBaubleProdution = config.get(CATEGORY_VALUES, "Inventory Charging Ring production", 32, "Default is 32").getInt(); - wandChargeFocusCost = config.get(CATEGORY_VALUES, "Wand Focus: Wand Charging Cost", 40000, "Default is 40000").getInt(); + wandChargerConsumption = config.get(VALUES, "Wand Charging Station Consumption", 50000, "This is the number you have to modify if you want to make the Industrial Wand Charging " + "Station use more or less EU to charge 1 unit of Vis on your wand.").getDouble(wandChargerConsumption); + compressedSolarOutput = config.get(VALUES, "Compressed Solar Panel Output", 10, "This is the number you have to modify if you want to make the Compressed Solar Panel yield " + "more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(compressedSolarOutput); + doubleCompressedSolarOutput = config.get(VALUES, "Double Compressed Solar Panel Output", 100, "This is the number you have to modify if you want to make the Double Compressed Solar Panel " + "yield more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(doubleCompressedSolarOutput); + tripleCompressedSolarOutput = config.get(VALUES, "Triple Compressed Solar Panel Output", 1000, "This is the number you have to modify if you want to make the Triple Compressed Solar Panel " + "yield more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(tripleCompressedSolarOutput); + essentiaGeneratorsDelay = config.get(VALUES, "Essentia Generators draw rate", 120, "The number of ticks the Essentia Generators wait before using 2 Essentia. " + "If you want them to be slower, increase the number.").getInt(essentiaGeneratorsDelay); + nanoBootsSpeed = config.get(VALUES, "Nano Boots of the Traveller Speed", 0.25, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsSpeed); + quantumBootsSpeed = config.get(VALUES, "Quantum Boots of the Traveller Speed", 0.5, "Watch out, that goes up REALLY quickly.").getDouble(quantumBootsSpeed); + nanoBootsJump = config.get(VALUES, "Nano Boots of the Traveller jump", 0.6, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsJump); + quantumBootsJump = config.get(VALUES, "Quantum Boots of the Traveller jump", 0.9, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsJump); + etherealProcessorBaseSpeed = config.get(VALUES, "Etheral Processor speed", 400, "Default is 400, the double of a regular furnace").getInt(); + etherealProcessorBonus = config.get(VALUES, "Ethereal Processor Bonus", 10, "This number is the chance of getting a Thaumium Ingot as a bonus when " + "processing an item in the machine. It is 1 out of the number you will enter. " + "The default is 1/10 chance.").getInt(); + chargeFocusProduction = config.get(VALUES, "Wand Focus: Charge production", 64, "Default is 64").getInt(); + armorBaubleProduction = config.get(VALUES, "Armor Charging Ring production", 32, "Default is 32").getInt(); + inventoryBaubleProdution = config.get(VALUES, "Inventory Charging Ring production", 32, "Default is 32").getInt(); + wandChargeFocusCost = config.get(VALUES, "Wand Focus: Wand Charging Cost", 40000, "Default is 40000").getInt(); - thaumiumDrillResearch = config.get(CATEGORY_RESEARCH, "Thaumium Drill", false).getBoolean(thaumiumDrillResearch); - thaumiumChainsawResearch = config.get(CATEGORY_RESEARCH, "Thaumium Chainsaw", false).getBoolean(thaumiumChainsawResearch); - thaumiumDrillResearch = config.get(CATEGORY_RESEARCH, "Thaumium Omnitool", false).getBoolean(thaumiumOmnitoolResearch); - rockbreakerDrillResearch = config.get(CATEGORY_RESEARCH, "Drill of the Rockbreaker", false).getBoolean(rockbreakerDrillResearch); - streamChainsawResearch = config.get(CATEGORY_RESEARCH, "Chainsaw of the Stream", false).getBoolean(streamChainsawResearch); - electricGooglesResearch = config.get(CATEGORY_RESEARCH, "Electric Googles of Revealing", false).getBoolean(electricGooglesResearch); - nanoGooglesResearch = config.get(CATEGORY_RESEARCH, "Nanosuit Googles of Revealing", false).getBoolean(nanoGooglesResearch); - quantumGooglesResearch = config.get(CATEGORY_RESEARCH, "Quantum Googles of Revealing", false).getBoolean(quantumGooglesResearch); - ironOmnitoolResearch = config.get(CATEGORY_RESEARCH, "Omnitool", false).getBoolean(ironOmnitoolResearch); - diamondOmnitoolResearch = config.get(CATEGORY_RESEARCH, "Diamond Omnitool", false).getBoolean(diamondOmnitoolResearch); - explosionFocusResearch = config.get(CATEGORY_RESEARCH, "Explosion Focus", false).getBoolean(explosionFocusResearch); - christmasFocusResearch = config.get(CATEGORY_RESEARCH, "Kris-tmas Focus", false).getBoolean(christmasFocusResearch); - shieldFocusResearch = config.get(CATEGORY_RESEARCH, "Shield Focus", false).getBoolean(shieldFocusResearch); - shieldBlockResearch = config.get(CATEGORY_RESEARCH, "Shield Block", false).getBoolean(shieldBlockResearch); - potentiaGeneratorResearch = config.get(CATEGORY_RESEARCH, "Potentia Generator", false).getBoolean(potentiaGeneratorResearch); - ignisGeneratorResearch = config.get(CATEGORY_RESEARCH, "Ignis Generator", false).getBoolean(ignisGeneratorResearch); - auramGeneratorResearch = config.get(CATEGORY_RESEARCH, "Auram Generator", false).getBoolean(auramGeneratorResearch); - arborGeneratorResearch = config.get(CATEGORY_RESEARCH, "Arbor Generator", false).getBoolean(arborGeneratorResearch); - wandChargingSationResearch = config.get(CATEGORY_RESEARCH, "Industrial Wand Charging Station", false).getBoolean(wandChargingSationResearch); - tinyUraniumResearch = config.get(CATEGORY_RESEARCH, "Tiny Piles of Uranium", false).getBoolean(tinyUraniumResearch); - thorHammerResearch = config.get(CATEGORY_RESEARCH, "Mjolnir", false).getBoolean(thorHammerResearch); - superchargedThorHammerResearch = config.get(CATEGORY_RESEARCH, "Supercharged Mjolnir", false).getBoolean(superchargedThorHammerResearch); - compressedSolarsResearch = config.get(CATEGORY_RESEARCH, "Compressed Solars", false).getBoolean(compressedSolarsResearch); - solarHelmetResearch = config.get(CATEGORY_RESEARCH, "Solar Helmet of Revealing", false).getBoolean(solarHelmetResearch); - electricBootsResearch = config.get(CATEGORY_RESEARCH, "Electric Boots of the Traveller", false).getBoolean(electricBootsResearch); - nanoBootsResearch = config.get(CATEGORY_RESEARCH, "Nano Boots of the Traveller", false).getBoolean(nanoBootsResearch); - quantumBootsResearch = config.get(CATEGORY_RESEARCH, "Quantum Boots of the Traveller", false).getBoolean(quantumBootsResearch); - electricScribingToolsResearch = config.get(CATEGORY_RESEARCH, "Electric Scribing Tools", false).getBoolean(electricScribingToolsResearch); - etherealProcessorResearch = config.get(CATEGORY_RESEARCH, "Ethereal Processor", false).getBoolean(etherealProcessorResearch); - waterSolarsResearch = config.get(CATEGORY_RESEARCH, "Water Solar Panels", false).getBoolean(waterSolarsResearch); - darkSolarsResearch = config.get(CATEGORY_RESEARCH, "Entropy Solar Panels", false).getBoolean(darkSolarsResearch); - orderSolarsResearch = config.get(CATEGORY_RESEARCH, "Order Solar Panels", false).getBoolean(orderSolarsResearch); - fireSolarsResearch = config.get(CATEGORY_RESEARCH, "Fire Solar Panels", false).getBoolean(fireSolarsResearch); - airSolarsResearch = config.get(CATEGORY_RESEARCH, "Air Solar Panels", false).getBoolean(airSolarsResearch); - earthSolarsResearch = config.get(CATEGORY_RESEARCH, "Earth Solar Panels", false).getBoolean(earthSolarsResearch); - saxumGenResearch = config.get(CATEGORY_RESEARCH, "Saxum Generator", false).getBoolean(saxumGenResearch); - uuMInfusionResearch = config.get(CATEGORY_RESEARCH, "UU-Mater Infusion", false).getBoolean(uuMInfusionResearch); - portableNodeResarch = config.get(CATEGORY_RESEARCH, "Portable Node", false).getBoolean(portableNodeResarch); - electricHoeGrowthResearch = config.get(CATEGORY_RESEARCH, "Electric Hoe of Growth", false).getBoolean(electricHoeGrowthResearch); - chargeFocusResearch = config.get(CATEGORY_RESEARCH, "Wand Focus: Charging", false).getBoolean(chargeFocusResearch); - wandChargeFocusResearch = config.get(CATEGORY_RESEARCH, "Wand Focus: Wand Charging", false).getBoolean(wandChargeFocusResearch); - inventoryChargingRing = config.get(CATEGORY_RESEARCH, "Inventory Charging Ring", false).getBoolean(inventoryChargingRing); - armorChargingRing = config.get(CATEGORY_RESEARCH, "Armor Charging Ring", false).getBoolean(armorChargingRing); - thaumiumWingResearch = config.get(CATEGORY_RESEARCH, "Thaumium Reinforced Wings", false).getBoolean(thaumiumWingResearch); - nanoWingResearch = config.get(CATEGORY_RESEARCH, "Nanosuit Wings", false).getBoolean(nanoWingResearch); - quantumWingsResearch = config.get(CATEGORY_RESEARCH, "Quantum Wings", false).getBoolean(quantumWingsResearch); - aerGeneratorResearch = config.get(CATEGORY_RESEARCH, "Aer Generator", false).getBoolean(aerGeneratorResearch); + thaumiumDrillResearch = config.get(RESEARCH, "Thaumium Drill", false).getBoolean(thaumiumDrillResearch); + thaumiumChainsawResearch = config.get(RESEARCH, "Thaumium Chainsaw", false).getBoolean(thaumiumChainsawResearch); + thaumiumDrillResearch = config.get(RESEARCH, "Thaumium Omnitool", false).getBoolean(thaumiumOmnitoolResearch); + rockbreakerDrillResearch = config.get(RESEARCH, "Drill of the Rockbreaker", false).getBoolean(rockbreakerDrillResearch); + streamChainsawResearch = config.get(RESEARCH, "Chainsaw of the Stream", false).getBoolean(streamChainsawResearch); + electricGooglesResearch = config.get(RESEARCH, "Electric Googles of Revealing", false).getBoolean(electricGooglesResearch); + nanoGooglesResearch = config.get(RESEARCH, "Nanosuit Googles of Revealing", false).getBoolean(nanoGooglesResearch); + quantumGooglesResearch = config.get(RESEARCH, "Quantum Googles of Revealing", false).getBoolean(quantumGooglesResearch); + ironOmnitoolResearch = config.get(RESEARCH, "Omnitool", false).getBoolean(ironOmnitoolResearch); + diamondOmnitoolResearch = config.get(RESEARCH, "Diamond Omnitool", false).getBoolean(diamondOmnitoolResearch); + explosionFocusResearch = config.get(RESEARCH, "Explosion Focus", false).getBoolean(explosionFocusResearch); + christmasFocusResearch = config.get(RESEARCH, "Kris-tmas Focus", false).getBoolean(christmasFocusResearch); + shieldFocusResearch = config.get(RESEARCH, "Shield Focus", false).getBoolean(shieldFocusResearch); + shieldBlockResearch = config.get(RESEARCH, "Shield Block", false).getBoolean(shieldBlockResearch); + potentiaGeneratorResearch = config.get(RESEARCH, "Potentia Generator", false).getBoolean(potentiaGeneratorResearch); + ignisGeneratorResearch = config.get(RESEARCH, "Ignis Generator", false).getBoolean(ignisGeneratorResearch); + auramGeneratorResearch = config.get(RESEARCH, "Auram Generator", false).getBoolean(auramGeneratorResearch); + arborGeneratorResearch = config.get(RESEARCH, "Arbor Generator", false).getBoolean(arborGeneratorResearch); + wandChargingSationResearch = config.get(RESEARCH, "Industrial Wand Charging Station", false).getBoolean(wandChargingSationResearch); + tinyUraniumResearch = config.get(RESEARCH, "Tiny Piles of Uranium", false).getBoolean(tinyUraniumResearch); + thorHammerResearch = config.get(RESEARCH, "Mjolnir", false).getBoolean(thorHammerResearch); + superchargedThorHammerResearch = config.get(RESEARCH, "Supercharged Mjolnir", false).getBoolean(superchargedThorHammerResearch); + compressedSolarsResearch = config.get(RESEARCH, "Compressed Solars", false).getBoolean(compressedSolarsResearch); + solarHelmetResearch = config.get(RESEARCH, "Solar Helmet of Revealing", false).getBoolean(solarHelmetResearch); + electricBootsResearch = config.get(RESEARCH, "Electric Boots of the Traveller", false).getBoolean(electricBootsResearch); + nanoBootsResearch = config.get(RESEARCH, "Nano Boots of the Traveller", false).getBoolean(nanoBootsResearch); + quantumBootsResearch = config.get(RESEARCH, "Quantum Boots of the Traveller", false).getBoolean(quantumBootsResearch); + electricScribingToolsResearch = config.get(RESEARCH, "Electric Scribing Tools", false).getBoolean(electricScribingToolsResearch); + etherealProcessorResearch = config.get(RESEARCH, "Ethereal Processor", false).getBoolean(etherealProcessorResearch); + waterSolarsResearch = config.get(RESEARCH, "Water Solar Panels", false).getBoolean(waterSolarsResearch); + darkSolarsResearch = config.get(RESEARCH, "Entropy Solar Panels", false).getBoolean(darkSolarsResearch); + orderSolarsResearch = config.get(RESEARCH, "Order Solar Panels", false).getBoolean(orderSolarsResearch); + fireSolarsResearch = config.get(RESEARCH, "Fire Solar Panels", false).getBoolean(fireSolarsResearch); + airSolarsResearch = config.get(RESEARCH, "Air Solar Panels", false).getBoolean(airSolarsResearch); + earthSolarsResearch = config.get(RESEARCH, "Earth Solar Panels", false).getBoolean(earthSolarsResearch); + saxumGenResearch = config.get(RESEARCH, "Saxum Generator", false).getBoolean(saxumGenResearch); + uuMInfusionResearch = config.get(RESEARCH, "UU-Mater Infusion", false).getBoolean(uuMInfusionResearch); + portableNodeResarch = config.get(RESEARCH, "Portable Node", false).getBoolean(portableNodeResarch); + electricHoeGrowthResearch = config.get(RESEARCH, "Electric Hoe of Growth", false).getBoolean(electricHoeGrowthResearch); + chargeFocusResearch = config.get(RESEARCH, "Wand Focus: Charging", false).getBoolean(chargeFocusResearch); + wandChargeFocusResearch = config.get(RESEARCH, "Wand Focus: Wand Charging", false).getBoolean(wandChargeFocusResearch); + inventoryChargingRing = config.get(RESEARCH, "Inventory Charging Ring", false).getBoolean(inventoryChargingRing); + armorChargingRing = config.get(RESEARCH, "Armor Charging Ring", false).getBoolean(armorChargingRing); + thaumiumWingResearch = config.get(RESEARCH, "Thaumium Reinforced Wings", false).getBoolean(thaumiumWingResearch); + nanoWingResearch = config.get(RESEARCH, "Nanosuit Wings", false).getBoolean(nanoWingResearch); + quantumWingsResearch = config.get(RESEARCH, "Quantum Wings", false).getBoolean(quantumWingsResearch); + infusedQuantumChestplate = config.get(RESEARCH, "Infused Quantum Chestplate", false).getBoolean(infusedQuantumChestplate); + aerGeneratorResearch = config.get(RESEARCH, "Aer Generator", false).getBoolean(aerGeneratorResearch); if (config.hasChanged()) { config.save(); diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearch.java b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java index 772b48e..ca33c10 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTResearch.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java @@ -7,6 +7,7 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; +import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.EMTKeys; import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.init.ItemRegistry; @@ -18,7 +19,7 @@ import tombenpotter.emt.common.util.ResearchAspects; public class EMTResearch { public static void addResearchTab(){ - ResourceLocation background = new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"); + ResourceLocation background = new ResourceLocation(ModInformation.texturePath, "textures/misc/background.png"); ResearchCategories.registerCategory("EMT", new ResourceLocation("electromagictools:textures/misc/emt.png"), background); } @@ -49,291 +50,287 @@ public class EMTResearch { .setPages(new ResearchPage(RecipeRegistry.cardboard), new ResearchPage(RecipeRegistry.featherWing), new ResearchPage(RecipeRegistry.featherWings)); /** Research that can be disabled **/ - if (ConfigHandler.thaumiumDrillResearch == false) { + if (!ConfigHandler.thaumiumDrillResearch) { 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) { + if (!ConfigHandler.thaumiumChainsawResearch) { 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) { + if (!ConfigHandler.electricGooglesResearch) { 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) {; + if (!ConfigHandler.electricGooglesResearch) { + if (!ConfigHandler.nanoGooglesResearch) {; 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) { + if (!ConfigHandler.electricGooglesResearch) { + if (!ConfigHandler.nanoGooglesResearch) { + if (!ConfigHandler.quantumGooglesResearch) { 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) { + if (!ConfigHandler.ironOmnitoolResearch) { 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) { - new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem() + if (!ConfigHandler.ironOmnitoolResearch) { + if (!ConfigHandler.diamondOmnitoolResearch) { + new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Iron Omnitool").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) { + if (!ConfigHandler.thaumiumDrillResearch && !ConfigHandler.thaumiumChainsawResearch) { + if (!ConfigHandler.thaumiumOmnitoolResearch) { 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) { + if (!ConfigHandler.explosionFocusResearch) { 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) { + if (!ConfigHandler.christmasFocusResearch) { 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) { + if (!ConfigHandler.shieldFocusResearch) { 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) { + if (!ConfigHandler.shieldFocusResearch) { + if (!ConfigHandler.shieldBlockResearch) { 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) { + if (!ConfigHandler.potentiaGeneratorResearch) { 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) { + if (!ConfigHandler.potentiaGeneratorResearch) { + if (!ConfigHandler.ignisGeneratorResearch) { 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) { + if (!ConfigHandler.potentiaGeneratorResearch) { + if (!ConfigHandler.auramGeneratorResearch) { 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) { + if (!ConfigHandler.potentiaGeneratorResearch) { + if (!ConfigHandler.arborGeneratorResearch) { 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) { + if (!ConfigHandler.potentiaGeneratorResearch) { + if (!ConfigHandler.aerGeneratorResearch) { 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) { + if (!ConfigHandler.potentiaGeneratorResearch) { + if (!ConfigHandler.wandChargingSationResearch) { 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) { + if (!ConfigHandler.thaumiumChainsawResearch) { + if (!ConfigHandler.streamChainsawResearch) { 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) { + if (!ConfigHandler.thaumiumDrillResearch) { + if (!ConfigHandler.rockbreakerDrillResearch) { 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) { + if (!ConfigHandler.tinyUraniumResearch) { 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) { + if (!ConfigHandler.thorHammerResearch) { 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) { + if (!ConfigHandler.thorHammerResearch) { + if (!ConfigHandler.superchargedThorHammerResearch) { 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) { + if (!ConfigHandler.compressedSolarsResearch) { 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) { + if (!ConfigHandler.compressedSolarsResearch) { + if (!ConfigHandler.solarHelmetResearch) { 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) { + if (!ConfigHandler.electricBootsResearch) { 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) { + if (!ConfigHandler.electricBootsResearch) { + if (!ConfigHandler.nanoBootsResearch) { 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) { + if (!ConfigHandler.electricBootsResearch) { + if (!ConfigHandler.nanoBootsResearch) { + if (!ConfigHandler.quantumBootsResearch) { 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) { + if (!ConfigHandler.electricScribingToolsResearch) { 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) { + if (!ConfigHandler.etherealProcessorResearch) { 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) { + if (!ConfigHandler.compressedSolarsResearch) { + if (!ConfigHandler.waterSolarsResearch) { 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) { + if (!ConfigHandler.compressedSolarsResearch) { + if (!ConfigHandler.darkSolarsResearch) { 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) { + if (!ConfigHandler.compressedSolarsResearch) { + if (!ConfigHandler.orderSolarsResearch) { 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) { + if (!ConfigHandler.compressedSolarsResearch) { + if (!ConfigHandler.fireSolarsResearch) { 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) { + if (!ConfigHandler.compressedSolarsResearch) { + if (!ConfigHandler.airSolarsResearch) { 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) { + if (!ConfigHandler.compressedSolarsResearch) { + if (!ConfigHandler.earthSolarsResearch) { 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) { + if (!ConfigHandler.uuMInfusionResearch) { 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) { + if (!ConfigHandler.portableNodeResarch) { 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) { + if (!ConfigHandler.electricHoeGrowthResearch) { 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) { + if (!ConfigHandler.chargeFocusResearch) { 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) { + if (!ConfigHandler.wandChargeFocusResearch) { 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) { + if (!ConfigHandler.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) { + if (!ConfigHandler.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) { + if (!ConfigHandler.thaumiumWingResearch) { 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) { + if (!ConfigHandler.nanoWingResearch && !ConfigHandler.thaumiumWingResearch) { 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) { + if (!ConfigHandler.quantumWingsResearch && !ConfigHandler.thaumiumWingResearch && !ConfigHandler.nanoWingResearch) { 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)); } - 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)); - } - } + if(!ConfigHandler.infusedQuantumChestplate && !ConfigHandler.thaumiumWingResearch && !ConfigHandler.nanoWingResearch && !ConfigHandler.quantumWingsResearch){ + 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)); } } } diff --git a/src/main/resources/assets/electromagictools/textures/misc/background.png b/src/main/resources/assets/electromagictools/textures/misc/background.png new file mode 100644 index 0000000..95919b4 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/misc/background.png differ