diff --git a/src/main/java/ExAstris/Block/BlockBarrelThaumium.java b/src/main/java/ExAstris/Block/BlockBarrelThaumium.java index 71f7057..6060bf8 100644 --- a/src/main/java/ExAstris/Block/BlockBarrelThaumium.java +++ b/src/main/java/ExAstris/Block/BlockBarrelThaumium.java @@ -274,7 +274,7 @@ else if(FluidContainerRegistry.isContainer(item)) } - if(ExAstris.Data.ModData.ALLOW_BEE_TRAP_INFUSED && item.getItem() == Item.getItemFromBlock(ENBlocks.BeeTrap)) + if(ExAstris.Data.ModData.allowBeeTrapInfused && item.getItem() == Item.getItemFromBlock(ENBlocks.BeeTrap)) { barrel.setMode(BarrelMode.BEEINFUSED); barrel.resetColor(); diff --git a/src/main/java/ExAstris/Block/TileEntity/TileEntityBarrelThaumium.java b/src/main/java/ExAstris/Block/TileEntity/TileEntityBarrelThaumium.java index 1ff717b..28bbcba 100644 --- a/src/main/java/ExAstris/Block/TileEntity/TileEntityBarrelThaumium.java +++ b/src/main/java/ExAstris/Block/TileEntity/TileEntityBarrelThaumium.java @@ -1277,7 +1277,7 @@ public void setInventorySlotContents(int slot, ItemStack stack) { setMode(BarrelMode.OBSIDIANTOTEM); } - if(ExAstris.Data.ModData.ALLOW_BEE_TRAP_INFUSED && Block.getBlockFromItem(item) == ENBlocks.BeeTrap ) + if(ExAstris.Data.ModData.allowBeeTrapInfused && Block.getBlockFromItem(item) == ENBlocks.BeeTrap ) { resetColor(); setMode(BarrelMode.BEEINFUSED); diff --git a/src/main/java/ExAstris/Bridge/BloodMagic.java b/src/main/java/ExAstris/Bridge/BloodMagic.java index 1659d70..fc23e22 100644 --- a/src/main/java/ExAstris/Bridge/BloodMagic.java +++ b/src/main/java/ExAstris/Bridge/BloodMagic.java @@ -12,7 +12,7 @@ public static void Initialize() } public static void addAlterRegistry() { - if(ModData.ALLOW_UNCHARGED_NETHERSTAR) + if(ModData.allowUnchargedNetherstar) { AltarRecipeRegistry.registerAltarRecipe(new ItemStack(Items.nether_star), new ItemStack(ExAstrisItem.UnchargedNetherStar), 4, 20000, 20, 20, true); } diff --git a/src/main/java/ExAstris/Bridge/Metallurgy.java b/src/main/java/ExAstris/Bridge/Metallurgy.java index fbe9564..eb2c794 100644 --- a/src/main/java/ExAstris/Bridge/Metallurgy.java +++ b/src/main/java/ExAstris/Bridge/Metallurgy.java @@ -19,7 +19,7 @@ public static void init() } public static void addHammerRegistry() { - if(ModData.ALLOW_METALLURGY_ORES) + if(ModData.allowMetallurgyOres) { RegistryFactory.HammerOreRegistryFactory(ExAstrisBlock.eximiteOreBlock, ExAstrisItem.eximiteOreItem); RegistryFactory.HammerOreRegistryFactory(ExAstrisBlock.meutoiteOreBlock, ExAstrisItem.meutoiteOreItem); @@ -52,7 +52,7 @@ public static void addHammerRegistry() } public static void addSieveRegistry() { - if(ModData.ALLOW_METALLURGY_ORES) + if(ModData.allowMetallurgyOres) { //Sulfur SieveRegistry.register(Blocks.sand, 0, GameRegistry.findItem("Metallurgy", "utility.item"), 0, 128); diff --git a/src/main/java/ExAstris/Bridge/MineFactoryReloaded.java b/src/main/java/ExAstris/Bridge/MineFactoryReloaded.java index bd191d4..66907e7 100644 --- a/src/main/java/ExAstris/Bridge/MineFactoryReloaded.java +++ b/src/main/java/ExAstris/Bridge/MineFactoryReloaded.java @@ -12,7 +12,7 @@ public class MineFactoryReloaded { public static void Initialize() { addColorRegistry(); - if(ModData.ALLOW_MFR_COMPOST) + if(ModData.allowMFRCompost) { addCompostRegistry(); } diff --git a/src/main/java/ExAstris/Bridge/TConstruct.java b/src/main/java/ExAstris/Bridge/TConstruct.java index de158db..902aa22 100644 --- a/src/main/java/ExAstris/Bridge/TConstruct.java +++ b/src/main/java/ExAstris/Bridge/TConstruct.java @@ -23,11 +23,11 @@ public class TConstruct { public static void Initialize() { addSmeltery(); - if(ModData.ALLOW_TCONSTRUCT_HEAT_REGISTRY) + if(ModData.allowTConstructHeat) { addHeatRegistry(); } - if(ModData.ALLOW_TCONSTRUCT_MODIFIERS) + if(ModData.allowTConstructModifiers) { addModifiers(); } @@ -36,7 +36,7 @@ public static void Initialize() } public static void addSieveRegistry() { - if(Loader.isModLoaded("TConstruct") && ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE) + if(Loader.isModLoaded("TConstruct") && ModData.allowAddTConstructNetherOre) { SieveRegistry.register(ENBlocks.NetherGravel, 0, ExAstrisItem.cobaltOreItem, 0, 128); SieveRegistry.register(ENBlocks.NetherGravel, 0, ExAstrisItem.arditeOreItem, 0, 128); @@ -44,7 +44,7 @@ public static void addSieveRegistry() } public static void addHammerRegistry() { - if(Loader.isModLoaded("TConstruct") && ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE) + if(Loader.isModLoaded("TConstruct") && ModData.allowAddTConstructNetherOre) { RegistryFactory.HammerOreRegistryFactory(ExAstrisBlock.cobaltOreBlock, ExAstrisItem.cobaltOreItem ); RegistryFactory.HammerOreRegistryFactory(ExAstrisBlock.arditeOreBlock, ExAstrisItem.arditeOreItem ); @@ -53,7 +53,7 @@ public static void addHammerRegistry() } public static void addSmeltery() { - if(ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE) + if(ModData.allowAddTConstructNetherOre) { Smeltery.addMelting(GameRegistry.findBlock("exastris", "CobaltOreBlock"), 0, 650, new FluidStack(TinkerSmeltery.moltenCobaltFluid, MoltenData.ingotCostSmeltery)); diff --git a/src/main/java/ExAstris/Bridge/TSteelworks.java b/src/main/java/ExAstris/Bridge/TSteelworks.java index bade029..72832dc 100644 --- a/src/main/java/ExAstris/Bridge/TSteelworks.java +++ b/src/main/java/ExAstris/Bridge/TSteelworks.java @@ -14,14 +14,14 @@ public class TSteelworks { public static void Initialize() { - if(ModData.ALLOW_TSTEELWORKS_MELTING) + if(ModData.allowSteelworksMelting) { addMeltingRecipe(); } } public static void addMeltingRecipe() { - if(Loader.isModLoaded("TConstruct") && ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE) + if(Loader.isModLoaded("TConstruct") && ModData.allowAddTConstructNetherOre) { AdvancedSmelting.addMelting(GameRegistry.findBlock("exastris", "CobaltOreBlock"),2,650, new FluidStack(TinkerSmeltery.moltenCobaltFluid, MoltenData.ingotCostHighoven)); AdvancedSmelting.addMelting(GameRegistry.findBlock("exastris", "ArditeOreBlock"),2,650, new FluidStack(TinkerSmeltery.moltenArditeFluid, MoltenData.ingotCostHighoven)); diff --git a/src/main/java/ExAstris/Bridge/Thaumcraft.java b/src/main/java/ExAstris/Bridge/Thaumcraft.java index d8b88db..94226ed 100644 --- a/src/main/java/ExAstris/Bridge/Thaumcraft.java +++ b/src/main/java/ExAstris/Bridge/Thaumcraft.java @@ -31,7 +31,7 @@ public static void Initialize() { addHammerRegistry(); addSieveRegistry(); - if(ModData.ALLOW_THAUMCRAFT_HEAT_REGISTRY) + if(ModData.allowThaumcraftHeat) { addHeatRegistry(); } @@ -39,7 +39,7 @@ public static void Initialize() addInfusion(); addArcane(); addCrucible(); - if(ModData.ALLOW_THAUMCRAFT_RESEARCH) + if(ModData.allowThaumcraftResearch) { addResearch(); } @@ -80,7 +80,7 @@ public static void addResearch() new ResearchPage("exastris.page.EXASTRISTHAUM.1"), new ResearchPage("exastris.page.EXASTRISTHAUM.2") }).setStub().setRound().setAutoUnlock().registerResearchItem(); - if(ModData.ALLOW_BARREL_THAUMIUM) + if(ModData.allowThaumiumbarrel) { new ResearchItem("EXASTRIS_BARRELTHAUMIUM", "EXASTRIS_THAUM", @@ -91,7 +91,7 @@ public static void addResearch() new ItemStack(ExAstrisBlock.BarrelThaumium, 1, 0)).setPages(new ResearchPage[] { new ResearchPage("exastris.page.EXASTRISTHAUM.3"), new ResearchPage((IArcaneRecipe)ConfigResearch.recipes.get("exastrisbarrelthaumium")) }).setConcealed().registerResearchItem(); - if(ModData.ALLOW_DOLL_THAUMIC) + if(ModData.allowDollThaumic) { new ResearchItem("EXASTRIS_DOLLTHAUMIC", "EXASTRIS_THAUM", @@ -105,7 +105,7 @@ public static void addResearch() } - if (Loader.isModLoaded("MagicBees") && ModData.ALLOW_BEE_TRAP_INFUSED) + if (Loader.isModLoaded("MagicBees") && ModData.allowBeeTrapInfused) { new ResearchItem("EXASTRIS_BEEHIVES", "EXASTRIS_THAUM", @@ -149,7 +149,7 @@ public static void addResearch() new ItemStack(GameRegistry.findItem("Thaumcraft", "blockStoneDevice"), 1, 2)).setPages(new ResearchPage[] { new ResearchPage("exastris.page.EXASTRISTHAUM.6"),new ResearchPage((IArcaneRecipe)ConfigResearch.recipes.get("exastrismatrix")) }).setConcealed().setParents("EXASTRIS_VISFILTER").registerResearchItem(); - if(ModData.ALLOW_HAMMER_THAUMIUM) + if(ModData.allowHammerThaumium) { new ResearchItem("EXASTRIS_HAMMERTHAUMIUM", "EXASTRIS_THAUM", diff --git a/src/main/java/ExAstris/Bridge/ThermalExpansion.java b/src/main/java/ExAstris/Bridge/ThermalExpansion.java index 5193d2a..ffbfc51 100644 --- a/src/main/java/ExAstris/Bridge/ThermalExpansion.java +++ b/src/main/java/ExAstris/Bridge/ThermalExpansion.java @@ -25,7 +25,7 @@ public class ThermalExpansion { public static void Initialize() { addHeatRegistry(); - if(ModData.ALLOW_THERMAL_EXPANSION_HIVE_REGISTRY) + if(ModData.allowThermalExpansionHive) { addHiveRegistry(); } @@ -58,7 +58,7 @@ public static void addHiveRegistry() } public static void addHeatRegistry() { - if(ModData.ALLOW_THERMAL_EXPANSION_HEAT_REGISTRY) + if(ModData.allowThermalExpansionHeat) { HeatRegistry.register(GameRegistry.findBlock("ThermalFoundation","FluidPyrotheum"), 0.5F); HeatRegistry.register(GameRegistry.findBlock("ThermalFoundation","FluidPyrotheum"), 0, 0.7F); diff --git a/src/main/java/ExAstris/Data/ModData.java b/src/main/java/ExAstris/Data/ModData.java index a9ba2d0..cbf151e 100644 --- a/src/main/java/ExAstris/Data/ModData.java +++ b/src/main/java/ExAstris/Data/ModData.java @@ -39,121 +39,121 @@ public static void setMetadata(ModMetadata data) public static String categoryBloodMagic="BloodMagic"; //BLOCKS - public static String ALLOW_BARREL_THAUMIUM_KEY = "thaumiumBarrel"; - public static boolean ALLOW_BARREL_THAUMIUM = true; + public static String allowThaumiumBarrelKey = "thaumiumBarrel"; + public static boolean allowThaumiumbarrel = true; - public static String ALLOW_BEE_TRAP_INFUSED_KEY = "infusedArtificialHive"; - public static boolean ALLOW_BEE_TRAP_INFUSED = true; + public static String allowBeeTrapInfusedKey = "infusedArtificialHive"; + public static boolean allowBeeTrapInfused = true; - public static String ALLOW_ENDCAKE_KEY = "endCake"; - public static boolean ALLOW_ENDCAKE = true; + public static String allowEndCakeKey = "endCake"; + public static boolean allowEndCake = true; - public static String ALLOW_SIEVE_AUTOMATIC_KEY = "autoSieve"; - public static boolean ALLOW_SIEVE_AUTOMATIC = true; - public static String SIEVE_AUTOMATIC_BASE_ENERGY_KEY = "autoSieveEnergy"; - public static int SIEVE_AUTOMATIC_BASE_ENERGY; + public static String allowSieveAutomaticKey = "autoSieve"; + public static boolean allowSieveAutomatic = true; + public static String sieveAutomaticBaseEnergyKey = "autoSieveEnergy"; + public static int sieveAutomaticBaseEnergy; //ITEMS - public static String ALLOW_DOLL_FREEZING_KEY = "freezingDoll"; - public static boolean ALLOW_DOLL_FREEZING = true; + public static String allowDollFreezingKey = "freezingDoll"; + public static boolean allowDollFreezing = true; - public static String ALLOW_DOLL_THAUMIC_KEY = "thaumicDoll"; - public static boolean ALLOW_DOLL_THAUMIC = true; + public static String allowDollThaumicKey = "thaumicDoll"; + public static boolean allowDollThaumic = true; - public static String ALLOW_HAMMER_RF_KEY = "fluxHammer"; - public static boolean ALLOW_HAMMER_RF = true; + public static String allowHammerRFKey = "fluxHammer"; + public static boolean allowHammerRF = true; - public static String ALLOW_HAMMER_THAUMIUM_KEY = "thaumiumHammer"; - public static boolean ALLOW_HAMMER_THAUMIUM = true; + public static String allowHammerThaumiumKey = "thaumiumHammer"; + public static boolean allowHammerThaumium = true; - public static String ALLOW_UNCHARGED_NETHERSTAR_KEY = "unchargedNetherStar"; - public static boolean ALLOW_UNCHARGED_NETHERSTAR = true; + public static String allowUnchargedNetherstarKey = "unchargedNetherStar"; + public static boolean allowUnchargedNetherstar = true; //BRIDGES - public static String ALLOW_MFR_COMPOST_KEY = "MFRCompost"; - public static boolean ALLOW_MFR_COMPOST = true; + public static String allowMFRCompostKey = "MFRCompost"; + public static boolean allowMFRCompost = true; - public static String ALLOW_ADD_TCONSTRUCT_NETHERORE_KEY = "tinkersOresFromSifting"; - public static boolean ALLOW_ADD_TCONSTRUCT_NETHERORE = true; + public static String allowAddTConstructNetherOreKey = "tinkersOresFromSifting"; + public static boolean allowAddTConstructNetherOre = true; - public static String ALLOW_TCONSTRUCT_HEAT_REGISTRY_KEY = "tinkersHeat"; - public static boolean ALLOW_TCONSTRUCT_HEAT_REGISTRY = true; + public static String allowTConstructHeatKey = "tinkersHeat"; + public static boolean allowTConstructHeat = true; //THAUMCRAFT RESEARCH - public static String ALLOW_THAUMCRAFT_RESEARCH_KEY = "research"; - public static boolean ALLOW_THAUMCRAFT_RESEARCH = true; + public static String allowThaumcraftResearchKey = "research"; + public static boolean allowThaumcraftResearch = true; - public static String ALLOW_THAUMCRAFT_HEAT_REGISTRY_KEY = "thaumHeat"; - public static boolean ALLOW_THAUMCRAFT_HEAT_REGISTRY = true; + public static String allowThaumcraftHeatKey = "thaumHeat"; + public static boolean allowThaumcraftHeat = true; //Thermal Expansion - public static String ALLOW_THERMAL_EXPANSION_HEAT_REGISTRY_KEY = "thermalHeat"; - public static boolean ALLOW_THERMAL_EXPANSION_HEAT_REGISTRY = true; + public static String allowThermalExpansionHeatKey = "thermalHeat"; + public static boolean allowThermalExpansionHeat = true; - public static String ALLOW_THERMAL_EXPANSION_HIVE_REGISTRY_KEY = "thermalHives"; - public static boolean ALLOW_THERMAL_EXPANSION_HIVE_REGISTRY = true; + public static String allowThermalExpansionHiveKey = "thermalHives"; + public static boolean allowThermalExpansionHive = true; - public static String ALLOW_TSTEELWORKS_MELTING_KEY = "steelworksMelting"; - public static boolean ALLOW_TSTEELWORKS_MELTING = true; + public static String allowSteelworksMeltingKey = "steelworksMelting"; + public static boolean allowSteelworksMelting = true; - public static String ALLOW_TCONSTRUCT_MODIFIERS_KEY = "modifiers"; - public static boolean ALLOW_TCONSTRUCT_MODIFIERS = true; + public static String allowTConstructModifiersKey = "modifiers"; + public static boolean allowTConstructModifiers = true; - public static String ALLOW_STRONGLY_COMPRESSED_STONE_KEY = "stronglyCompressedStone"; - public static boolean ALLOW_STRONGLY_COMPRESSED_STONE = true; + public static String allowStronglyCompressedStoneKey = "stronglyCompressedStone"; + public static boolean allowStronglyCompressedStone = true; - public static String ALLOW_METALLURGY_ORES_KEY = "metallurgySifting"; - public static boolean ALLOW_METALLURGY_ORES = true; + public static String allowMetallurgyOresKey = "metallurgySifting"; + public static boolean allowMetallurgyOres = true; public static String[] oreType = { "Gravel","Sand","Dust" }; public static void load(Configuration config) { //Thaumcraft - ALLOW_BARREL_THAUMIUM = config.get(categoryThaumcraft, ALLOW_BARREL_THAUMIUM_KEY, ALLOW_BARREL_THAUMIUM, "Enable Thaumium Barrel").getBoolean(); - ALLOW_DOLL_THAUMIC = config.get(categoryThaumcraft, ALLOW_DOLL_THAUMIC_KEY, ALLOW_DOLL_THAUMIC, "Enable Thaumic Doll").getBoolean(); - ALLOW_HAMMER_THAUMIUM = config.get(categoryThaumcraft, ALLOW_HAMMER_THAUMIUM_KEY, ALLOW_HAMMER_THAUMIUM, "Enable Thaumium Hammer").getBoolean(); - ALLOW_THAUMCRAFT_RESEARCH = config.get(categoryThaumcraft, ALLOW_THAUMCRAFT_RESEARCH_KEY, ALLOW_THAUMCRAFT_RESEARCH, "Enable Thaumcraft Research").getBoolean(); - ALLOW_THAUMCRAFT_HEAT_REGISTRY = config.get(categoryThaumcraft, ALLOW_THAUMCRAFT_HEAT_REGISTRY_KEY, ALLOW_THAUMCRAFT_HEAT_REGISTRY, "Add Thaumcraft Items as heat source for Crucible etc").getBoolean(); + allowThaumiumbarrel = config.get(categoryThaumcraft, allowThaumiumBarrelKey, allowThaumiumbarrel, "Enable Thaumium Barrel").getBoolean(); + allowDollThaumic = config.get(categoryThaumcraft, allowDollThaumicKey, allowDollThaumic, "Enable Thaumic Doll").getBoolean(); + allowHammerThaumium = config.get(categoryThaumcraft, allowHammerThaumiumKey, allowHammerThaumium, "Enable Thaumium Hammer").getBoolean(); + allowThaumcraftResearch = config.get(categoryThaumcraft, allowThaumcraftResearchKey, allowThaumcraftResearch, "Enable Thaumcraft Research").getBoolean(); + allowThaumcraftHeat = config.get(categoryThaumcraft, allowThaumcraftHeatKey, allowThaumcraftHeat, "Add Thaumcraft Items as heat source for Crucible etc").getBoolean(); //Magic Bees - ALLOW_BEE_TRAP_INFUSED = config.get(categoryMagicBees, ALLOW_BEE_TRAP_INFUSED_KEY, ALLOW_BEE_TRAP_INFUSED, "Enable Mana Infused Hives").getBoolean(); + allowBeeTrapInfused = config.get(categoryMagicBees, allowBeeTrapInfusedKey, allowBeeTrapInfused, "Enable Mana Infused Hives").getBoolean(); //Ex-Astris - ALLOW_ENDCAKE = config.get(categoryExAstris, ALLOW_ENDCAKE_KEY, ALLOW_ENDCAKE, "Enable End Cake").getBoolean(); - ALLOW_SIEVE_AUTOMATIC = config.get(categoryExAstris, ALLOW_SIEVE_AUTOMATIC_KEY, ALLOW_SIEVE_AUTOMATIC, "Enable Automatic Sieve").getBoolean(); - SIEVE_AUTOMATIC_BASE_ENERGY = config.get(categoryExAstris, SIEVE_AUTOMATIC_BASE_ENERGY_KEY, 40, "Base RF/t that is consumed by the Automatic Sieve").getInt(); + allowEndCake = config.get(categoryExAstris, allowEndCakeKey, allowEndCake, "Enable End Cake").getBoolean(); + allowSieveAutomatic = config.get(categoryExAstris, allowSieveAutomaticKey, allowSieveAutomatic, "Enable Automatic Sieve").getBoolean(); + sieveAutomaticBaseEnergy = config.get(categoryExAstris, sieveAutomaticBaseEnergyKey, 40, "Base RF/t that is consumed by the Automatic Sieve").getInt(); //Redstone Arsenal - ALLOW_HAMMER_RF = config.get(categoryRedstoneArsenal, ALLOW_HAMMER_RF_KEY, ALLOW_HAMMER_RF, "Enable RF Hammer").getBoolean(); - ALLOW_DOLL_FREEZING = config.get(categoryRedstoneArsenal, ALLOW_DOLL_FREEZING_KEY, ALLOW_DOLL_FREEZING, "Enable Freezing Doll").getBoolean(); + allowHammerRF = config.get(categoryRedstoneArsenal, allowHammerRFKey, allowHammerRF, "Enable RF Hammer").getBoolean(); + allowDollFreezing = config.get(categoryRedstoneArsenal, allowDollFreezingKey, allowDollFreezing, "Enable Freezing Doll").getBoolean(); //Blood Magic - ALLOW_UNCHARGED_NETHERSTAR = config.get(categoryBloodMagic, ALLOW_UNCHARGED_NETHERSTAR_KEY, ALLOW_UNCHARGED_NETHERSTAR, "Enable Uncharged Nether Star").getBoolean(); + allowUnchargedNetherstar = config.get(categoryBloodMagic, allowUnchargedNetherstarKey, allowUnchargedNetherstar, "Enable Uncharged Nether Star").getBoolean(); //MFR - ALLOW_MFR_COMPOST = config.get(categoryMFR, ALLOW_MFR_COMPOST_KEY, ALLOW_MFR_COMPOST, "Add MFR items to be composted").getBoolean(); + allowMFRCompost = config.get(categoryMFR, allowMFRCompostKey, allowMFRCompost, "Add MFR items to be composted").getBoolean(); //TiCon - ALLOW_ADD_TCONSTRUCT_NETHERORE = config.get(categoryTiCon, ALLOW_ADD_TCONSTRUCT_NETHERORE_KEY, ALLOW_ADD_TCONSTRUCT_NETHERORE, "Add Tinkers Nether Ores from sifter").getBoolean(); - ALLOW_TCONSTRUCT_HEAT_REGISTRY = config.get(categoryTiCon, ALLOW_TCONSTRUCT_HEAT_REGISTRY_KEY, ALLOW_TCONSTRUCT_HEAT_REGISTRY, "Add Tinkers Items as a heat source for Crucible etc").getBoolean(); - ALLOW_TCONSTRUCT_MODIFIERS = config.get(categoryTiCon, ALLOW_TCONSTRUCT_MODIFIERS_KEY, ALLOW_TCONSTRUCT_MODIFIERS, "Add Tinkers Modifiers (Smashing and Crooked").getBoolean(); + allowAddTConstructNetherOre = config.get(categoryTiCon, allowAddTConstructNetherOreKey, allowAddTConstructNetherOre, "Add Tinkers Nether Ores from sifter").getBoolean(); + allowTConstructHeat = config.get(categoryTiCon, allowTConstructHeatKey, allowTConstructHeat, "Add Tinkers Items as a heat source for Crucible etc").getBoolean(); + allowTConstructModifiers = config.get(categoryTiCon, allowTConstructModifiersKey, allowTConstructModifiers, "Add Tinkers Modifiers (Smashing and Crooked").getBoolean(); //Steelworks - ALLOW_TSTEELWORKS_MELTING = config.get(categorySteelworks, ALLOW_TSTEELWORKS_MELTING_KEY, ALLOW_TSTEELWORKS_MELTING, "Allow Dusts etc to be melted in the High Oven").getBoolean(); + allowSteelworksMelting = config.get(categorySteelworks, allowSteelworksMeltingKey, allowSteelworksMelting, "Allow Dusts etc to be melted in the High Oven").getBoolean(); //Thermal Expansion - ALLOW_THERMAL_EXPANSION_HEAT_REGISTRY = config.get(categoryThermalExpansion, ALLOW_THERMAL_EXPANSION_HEAT_REGISTRY_KEY, ALLOW_THERMAL_EXPANSION_HEAT_REGISTRY, "Add Thermal Expansion Items and Fluids as heat sources for Crucible etc").getBoolean(); - ALLOW_THERMAL_EXPANSION_HIVE_REGISTRY = config.get(categoryThermalExpansion, ALLOW_THERMAL_EXPANSION_HIVE_REGISTRY_KEY, ALLOW_THERMAL_EXPANSION_HIVE_REGISTRY, "Add Thermal Expansion Hive Recipes").getBoolean(); + allowThermalExpansionHeat = config.get(categoryThermalExpansion, allowThermalExpansionHeatKey, allowThermalExpansionHeat, "Add Thermal Expansion Items and Fluids as heat sources for Crucible etc").getBoolean(); + allowThermalExpansionHive = config.get(categoryThermalExpansion, allowThermalExpansionHiveKey, allowThermalExpansionHive, "Add Thermal Expansion Hive Recipes").getBoolean(); //RotaryCraft (NA) - ALLOW_STRONGLY_COMPRESSED_STONE = config.get(categoryRotaryCraft, ALLOW_STRONGLY_COMPRESSED_STONE_KEY, ALLOW_STRONGLY_COMPRESSED_STONE, "Enable Strongly Compressed Stone").getBoolean(); + allowStronglyCompressedStone = config.get(categoryRotaryCraft, allowStronglyCompressedStoneKey, allowStronglyCompressedStone, "Enable Strongly Compressed Stone").getBoolean(); //Metallurgy - ALLOW_METALLURGY_ORES = config.get(categoryMetallurgy, ALLOW_METALLURGY_ORES_KEY, ALLOW_METALLURGY_ORES, "Enable Metallurgy Ores from Sifting").getBoolean(); + allowMetallurgyOres = config.get(categoryMetallurgy, allowMetallurgyOresKey, allowMetallurgyOres, "Enable Metallurgy Ores from Sifting").getBoolean(); } } diff --git a/src/main/java/ExAstris/ExAstrisBlock.java b/src/main/java/ExAstris/ExAstrisBlock.java index 2be8d76..345758b 100644 --- a/src/main/java/ExAstris/ExAstrisBlock.java +++ b/src/main/java/ExAstris/ExAstrisBlock.java @@ -80,7 +80,7 @@ public static void registerBlocks() EndCake = new BlockEndCake(); GameRegistry.registerBlock(EndCake, ItemBlockEndCake.class, BlockData.ENDCAKE_KEY); - if(Loader.isModLoaded("TConstruct") && ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE) + if(Loader.isModLoaded("TConstruct") && ModData.allowAddTConstructNetherOre) { cobaltOreBlock = new BlockOre("Cobalt"); GameRegistry.registerBlock(cobaltOreBlock, ItemBlockOre.class, "CobaltOreBlock"); @@ -90,7 +90,7 @@ public static void registerBlocks() } - if(Loader.isModLoaded("RotaryCraft") && ModData.ALLOW_STRONGLY_COMPRESSED_STONE) + if(Loader.isModLoaded("RotaryCraft") && ModData.allowStronglyCompressedStone) { StronglyCompressedStone = new BlockStronglyCompressedStone(); GameRegistry.registerBlock(StronglyCompressedStone, ItemBlockStronglyCompressedStone.class, BlockData.STRONGLY_COMPRESSED_STONE_KEY); @@ -103,7 +103,7 @@ public static void registerBlocks() } - if(Loader.isModLoaded("Metallurgy") && ModData.ALLOW_METALLURGY_ORES) + if(Loader.isModLoaded("Metallurgy") && ModData.allowMetallurgyOres) { eximiteOreBlock = new BlockOre("Eximite"); GameRegistry.registerBlock(eximiteOreBlock, ItemBlockOre.class, "EximiteOreBlock"); diff --git a/src/main/java/ExAstris/ExAstrisItem.java b/src/main/java/ExAstris/ExAstrisItem.java index 16cc9f1..e651137 100644 --- a/src/main/java/ExAstris/ExAstrisItem.java +++ b/src/main/java/ExAstris/ExAstrisItem.java @@ -77,12 +77,12 @@ public static void registerItems() } - if(Loader.isModLoaded("AWWayofTime") && ModData.ALLOW_UNCHARGED_NETHERSTAR){ + if(Loader.isModLoaded("AWWayofTime") && ModData.allowUnchargedNetherstar){ UnchargedNetherStar = new ItemUnchargedNetherStar(); GameRegistry.registerItem(UnchargedNetherStar, ItemData.UNCHARGED_NETHERSTAR_UNLOCALIZED_NAME); } - if(Loader.isModLoaded("TConstruct") && ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE) + if(Loader.isModLoaded("TConstruct") && ModData.allowAddTConstructNetherOre) { cobaltOreItem = new ItemOre("Cobalt"); GameRegistry.registerItem(cobaltOreItem, "CobaltOreItem"); @@ -91,7 +91,7 @@ public static void registerItems() GameRegistry.registerItem(arditeOreItem, "ArditeOreItem"); } - if(Loader.isModLoaded("Metallurgy") && ModData.ALLOW_METALLURGY_ORES) + if(Loader.isModLoaded("Metallurgy") && ModData.allowMetallurgyOres) { eximiteOreItem = new ItemOre("Eximite"); GameRegistry.registerItem(eximiteOreItem, "EximiteOreItem"); @@ -145,7 +145,7 @@ public static void registerItems() GameRegistry.registerItem(vulcaniteOreItem, "VulcaniteOreItem"); GameRegistry.registerItem(sanguiniteOreItem, "SanguiniteOreItem"); } - if (ModData.ALLOW_SIEVE_AUTOMATIC) + if (ModData.allowSieveAutomatic) { sieveUpgradeItem = new ItemSieveUpgrade(); GameRegistry.registerItem(sieveUpgradeItem, "SieveUpgradeItem"); diff --git a/src/main/java/ExAstris/ExAstrisRecipe.java b/src/main/java/ExAstris/ExAstrisRecipe.java index ffb869d..1988f10 100644 --- a/src/main/java/ExAstris/ExAstrisRecipe.java +++ b/src/main/java/ExAstris/ExAstrisRecipe.java @@ -18,12 +18,12 @@ public class ExAstrisRecipe { public static void registerFurnaceRecipes() { - if(Loader.isModLoaded("TConstruct") && ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE) + if(Loader.isModLoaded("TConstruct") && ModData.allowAddTConstructNetherOre) { RegistryFactory.FurnaceOreRegistryFactory(ExAstrisBlock.cobaltOreBlock,new ItemStack(GameRegistry.findItem("TConstruct", "materials"), 1, 3)); RegistryFactory.FurnaceOreRegistryFactory(ExAstrisBlock.arditeOreBlock,new ItemStack(GameRegistry.findItem("TConstruct", "materials"), 1, 4)); } - if(Loader.isModLoaded("Metallurgy") && ModData.ALLOW_METALLURGY_ORES) + if(Loader.isModLoaded("Metallurgy") && ModData.allowMetallurgyOres) { RegistryFactory.FurnaceOreRegistryFactory(ExAstrisBlock.eximiteOreBlock,new ItemStack(GameRegistry.findItem("Metallurgy", "eximite.ingot"), 1, 0)); RegistryFactory.FurnaceOreRegistryFactory(ExAstrisBlock.meutoiteOreBlock,new ItemStack(GameRegistry.findItem("Metallurgy", "meutoite.ingot"), 1, 0)); @@ -54,7 +54,7 @@ public static void registerFurnaceRecipes() } public static void registerCraftingRecipes() { - if(Loader.isModLoaded("RedstoneArsenal") && ModData.ALLOW_HAMMER_RF){ + if(Loader.isModLoaded("RedstoneArsenal") && ModData.allowHammerRF){ GameRegistry.addRecipe(new ItemStack(ExAstrisItem.HammerRF, 1, 0), " x ", " yx", @@ -63,7 +63,7 @@ public static void registerCraftingRecipes() 'y', new ItemStack(GameRegistry.findItem("RedstoneArsenal", "material"), 1, 193)); } if(Loader.isModLoaded("ThermalExpansion")){ - if(ModData.ALLOW_SIEVE_AUTOMATIC) + if(ModData.allowSieveAutomatic) { GameRegistry.addRecipe(new ItemStack(ExAstrisBlock.SieveAutomatic, 1, 0), "aba", @@ -76,7 +76,7 @@ public static void registerCraftingRecipes() } - if(Loader.isModLoaded("Thaumcraft") && ModData.ALLOW_DOLL_FREEZING && ModData.ALLOW_BARREL_THAUMIUM){ + if(Loader.isModLoaded("Thaumcraft") && ModData.allowDollFreezing && ModData.allowThaumiumbarrel){ GameRegistry.addRecipe(new ItemStack(ExAstrisItem.DollFreezing, 1, 0), "aba", @@ -103,7 +103,7 @@ public static void registerCraftingRecipes() 'f', Items.diamond_sword); } - if(ModData.ALLOW_ENDCAKE) + if(ModData.allowEndCake) { GameRegistry.addRecipe(new ItemStack(ExAstrisBlock.EndCake, 1, 0), "aaa", @@ -114,12 +114,12 @@ public static void registerCraftingRecipes() 'c', Items.golden_apple); } - if(Loader.isModLoaded("TConstruct") && ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE) + if(Loader.isModLoaded("TConstruct") && ModData.allowAddTConstructNetherOre) { OreRecipeFactory(ExAstrisBlock.cobaltOreBlock,ExAstrisItem.cobaltOreItem); OreRecipeFactory(ExAstrisBlock.arditeOreBlock,ExAstrisItem.arditeOreItem); } - if(Loader.isModLoaded("RotaryCraft") && ModData.ALLOW_STRONGLY_COMPRESSED_STONE) + if(Loader.isModLoaded("RotaryCraft") && ModData.allowStronglyCompressedStone) { GameRegistry.addRecipe(new ItemStack(ExAstrisBlock.StronglyCompressedStone, 1, 0), "aaa", @@ -142,7 +142,7 @@ public static void registerCraftingRecipes() "aaa", 'a', new ItemStack(ExAstrisBlock.StronglyCompressedStone, 1, 2)); } - if(Loader.isModLoaded("Metallurgy") && ModData.ALLOW_METALLURGY_ORES) + if(Loader.isModLoaded("Metallurgy") && ModData.allowMetallurgyOres) { OreRecipeFactory(ExAstrisBlock.eximiteOreBlock,ExAstrisItem.eximiteOreItem); OreRecipeFactory(ExAstrisBlock.meutoiteOreBlock,ExAstrisItem.meutoiteOreItem);