diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 8629576a..4c2b3079 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -504,3 +504,46 @@ enderio.gui.conduit.redstone.color=Color enderio.gui.conduit.fluid.autoExtract=Auto Extract enderio.gui.conduit.fluid.filter=Filter + + +//Configuration +enderio.config.title=Ender IO Configuration + +enderio.config.power=Power Settings +enderio.config.power.tooltip=So many numbers to change... + +enderio.config.recipe=Recipe Settings +enderio.config.recipe.tooltip=Config ALL the things! + +enderio.config.item=Item Enabling +enderio.config.item.tooltip=If you don't like some of my amazing items :( + +enderio.config.efficiency=Efficiency Settings +enderio.config.efficiency.tooltip=Where do the numbers end? + +enderio.config.personal=Personal Settings +enderio.config.personal.tooltip=I won't tell anyone, I promise. + +enderio.config.anchor=Anchor Settings +enderio.config.anchor.tooltip=Anchors away! + +enderio.config.staff=Staff Settings +enderio.config.staff.tooltip=Be careful with that thing, you'll teleport your face off. + +enderio.config.darksteel=Dark Steel +enderio.config.darksteel.tooltip=It's not just regular steel, it's §odark§r§e steel. + +enderio.config.farm=Farm Settings +enderio.config.farm.tooltip="The commune is for life!" + +enderio.config.aesthetic=Aesthetic Settings +enderio.config.aesthetic.tooltip=Oooh, ahhh, pretty. + +enderio.config.advanced=Advanced Settings +enderio.config.advanced.tooltip=For those who can't have enough configs. + +enderio.config.magnet=Magnet Settings +enderio.config.magnet.tooltip=How do they work? + +enderio.config.spawner=PoweredSpawner Settings +enderio.config.spawner.tooltip=I ran out of witty tooltips. \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 695903dd..3235945d 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -1,30 +1,61 @@ package crazypants.enderio.config; import java.io.File; +import java.util.ArrayList; +import java.util.List; import net.minecraftforge.common.config.Configuration; +import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.EnderIO; import crazypants.enderio.Log; import crazypants.vecmath.VecmathUtil; public final class Config { + + public static class Section { + public final String name; + public final String lang; + + public Section(String name, String lang) { + this.name = name; + this.lang = lang; + register(); + } + + private void register() { + sections.add(this); + } + + public String lc() { + return name.toLowerCase(); + } + } + + public static final List
sections; + + static { + sections = new ArrayList
(); + } public static Configuration config; - public static final String sectionPower = "Power Settings"; - public static final String sectionRecipe = "Recipe Settings"; - public static final String sectionItems = "Item Enabling"; - public static final String sectionEfficiency = "Efficiency Settings"; - public static final String sectionPersonal = "Personal Settings"; - public static final String sectionAnchor = "Anchor Settings"; - public static final String sectionStaff = "Staff Settings"; - public static final String sectionDarkSteel = "Dark Steel"; - public static final String sectionFarm = "Farm Settings"; - public static final String sectionAesthetic = "Aesthetic Settings"; - public static final String sectionAdvanced = "Advanced Settings"; - public static final String sectionMagnet = "Magnet Settings"; - public static final String sectionSpawner = "PoweredSpawner Settings"; + public static final Section sectionPower = new Section("Power Settings", "power"); + public static final Section sectionRecipe = new Section("Recipe Settings", "recipe"); + public static final Section sectionItems = new Section("Item Enabling", "item"); + public static final Section sectionEfficiency = new Section("Efficiency Settings", "efficiency"); + public static final Section sectionPersonal = new Section("Personal Settings", "personal"); + public static final Section sectionAnchor = new Section("Anchor Settings", "anchor"); + public static final Section sectionStaff = new Section("Staff Settings", "staff"); + public static final Section sectionDarkSteel = new Section("Dark Steel", "darksteel"); + public static final Section sectionFarm = new Section("Farm Settings", "farm"); + public static final Section sectionAesthetic = new Section("Aesthetic Settings", "aesthetic"); + public static final Section sectionAdvanced = new Section("Advanced Settings", "advanced"); + public static final Section sectionMagnet = new Section("Magnet Settings", "magnet"); + public static final Section sectionSpawner = new Section("PoweredSpawner Settings", "spawner"); + static int BID = 700; static int IID = 8524; @@ -182,6 +213,8 @@ public final class Config { public static int powerSpawnerAddSpawnerCost = 30; public static void load(FMLPreInitializationEvent event) { + + FMLCommonHandler.instance().bus().register(new Config()); configDirectory = new File(event.getModConfigurationDirectory(), EnderIO.MODID.toLowerCase()); if(!configDirectory.exists()) { configDirectory.mkdir(); @@ -192,8 +225,7 @@ public final class Config { syncConfig(); } - public static void syncConfig() - { + public static void syncConfig() { try { Config.processConfig(config); } catch (Exception e) { @@ -204,93 +236,101 @@ public final class Config { } } } + + @SubscribeEvent + public void onConfigChanged(ConfigChangedEvent event) { + if (event.modID.equals(EnderIO.MODID)) { + Log.info("Updating config..."); + syncConfig(); + } + } public static void processConfig(Configuration config) { - useRfAsDefault = config.get(sectionPower, "displayPowerAsRedstoneFlux", useRfAsDefault, "If true, all power is displayed in RF, otherwise MJ is used.") + useRfAsDefault = config.get(sectionPower.name, "displayPowerAsRedstoneFlux", useRfAsDefault, "If true, all power is displayed in RF, otherwise MJ is used.") .getBoolean(useRfAsDefault); - capacitorBankMaxIoMJ = config.get(sectionPower, "capacitorBankMaxIoMJ", capacitorBankMaxIoMJ, "The maximum IO for a single capacitor in MJ/t") + capacitorBankMaxIoMJ = config.get(sectionPower.name, "capacitorBankMaxIoMJ", capacitorBankMaxIoMJ, "The maximum IO for a single capacitor in MJ/t") .getInt(capacitorBankMaxIoMJ); - capacitorBankMaxStorageMJ = config.get(sectionPower, "capacitorBankMaxStorageMJ", capacitorBankMaxStorageMJ, + capacitorBankMaxStorageMJ = config.get(sectionPower.name, "capacitorBankMaxStorageMJ", capacitorBankMaxStorageMJ, "The maximum storage for a single capacitor in MJ") .getInt(capacitorBankMaxStorageMJ); - useHardRecipes = config.get(sectionRecipe, "useHardRecipes", useHardRecipes, "When enabled machines cost significantly more.") + useHardRecipes = config.get(sectionRecipe.name, "useHardRecipes", useHardRecipes, "When enabled machines cost significantly more.") .getBoolean(useHardRecipes); - useSteelInChassi = config.get(sectionRecipe, "useSteelInChassi", useSteelInChassi, "When enabled machine chassis will require steel instead of iron.") + useSteelInChassi = config.get(sectionRecipe.name, "useSteelInChassi", useSteelInChassi, "When enabled machine chassis will require steel instead of iron.") .getBoolean(useSteelInChassi); - numConduitsPerRecipe = config.get(sectionRecipe, "numConduitsPerRecipe", numConduitsPerRecipe, + numConduitsPerRecipe = config.get(sectionRecipe.name, "numConduitsPerRecipe", numConduitsPerRecipe, "The number of conduits crafted per recipe.").getInt(numConduitsPerRecipe); - photovoltaicCellEnabled = config.get(sectionItems, "photovoltaicCellEnabled", photovoltaicCellEnabled, + photovoltaicCellEnabled = config.get(sectionItems.name, "photovoltaicCellEnabled", photovoltaicCellEnabled, "If set to false: Photovoltaic Cells will not be craftable.") .getBoolean(photovoltaicCellEnabled); - maxPhotovoltaicOutput = config.get(sectionPower, "maxPhotovoltaicOutput", maxPhotovoltaicOutput, + maxPhotovoltaicOutput = config.get(sectionPower.name, "maxPhotovoltaicOutput", maxPhotovoltaicOutput, "Maximum output in MJ/t of the Photovoltaic Panels.").getDouble(maxPhotovoltaicOutput); - maxPhotovoltaicAdvancedOutput = config.get(sectionPower, "maxPhotovoltaicAdvancedOutput", maxPhotovoltaicAdvancedOutput, + maxPhotovoltaicAdvancedOutput = config.get(sectionPower.name, "maxPhotovoltaicAdvancedOutput", maxPhotovoltaicAdvancedOutput, "Maximum output in MJ/t of the Advanced Photovoltaic Panels.").getDouble(maxPhotovoltaicAdvancedOutput); - useAlternateBinderRecipe = config.get(sectionRecipe, "useAlternateBinderRecipe", false, "Create conduit binder in crafting table instead of furnace") + useAlternateBinderRecipe = config.get(sectionRecipe.name, "useAlternateBinderRecipe", false, "Create conduit binder in crafting table instead of furnace") .getBoolean(useAlternateBinderRecipe); - conduitScale = config.get(sectionAesthetic, "conduitScale", DEFAULT_CONDUIT_SCALE, + conduitScale = config.get(sectionAesthetic.name, "conduitScale", DEFAULT_CONDUIT_SCALE, "Valid values are between 0-1, smallest conduits at 0, largest at 1.\n" + "In SMP, all clients must be using the same value as the server.").getDouble(DEFAULT_CONDUIT_SCALE); conduitScale = VecmathUtil.clamp(conduitScale, 0, 1); - fluidConduitExtractRate = config.get(sectionEfficiency, "fluidConduitExtractRate", fluidConduitExtractRate, + fluidConduitExtractRate = config.get(sectionEfficiency.name, "fluidConduitExtractRate", fluidConduitExtractRate, "Number of millibuckects per tick extracted by a fluid conduits auto extracting").getInt(fluidConduitExtractRate); - fluidConduitMaxIoRate = config.get(sectionEfficiency, "fluidConduitMaxIoRate", fluidConduitMaxIoRate, + fluidConduitMaxIoRate = config.get(sectionEfficiency.name, "fluidConduitMaxIoRate", fluidConduitMaxIoRate, "Number of millibuckects per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate); - advancedFluidConduitExtractRate = config.get(sectionEfficiency, "advancedFluidConduitExtractRate", advancedFluidConduitExtractRate, + advancedFluidConduitExtractRate = config.get(sectionEfficiency.name, "advancedFluidConduitExtractRate", advancedFluidConduitExtractRate, "Number of millibuckects per tick extracted by pressurised fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate); - advancedFluidConduitMaxIoRate = config.get(sectionEfficiency, "advancedFluidConduitMaxIoRate", advancedFluidConduitMaxIoRate, + advancedFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "advancedFluidConduitMaxIoRate", advancedFluidConduitMaxIoRate, "Number of millibuckects per tick that can pass through a single connection to an pressurised fluid conduit.").getInt(advancedFluidConduitMaxIoRate); - enderFluidConduitExtractRate = config.get(sectionEfficiency, "enderFluidConduitExtractRate", enderFluidConduitExtractRate, + enderFluidConduitExtractRate = config.get(sectionEfficiency.name, "enderFluidConduitExtractRate", enderFluidConduitExtractRate, "Number of millibuckects per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate); - enderFluidConduitMaxIoRate = config.get(sectionEfficiency, "enderFluidConduitMaxIoRate", enderFluidConduitMaxIoRate, + enderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "enderFluidConduitMaxIoRate", enderFluidConduitMaxIoRate, "Number of millibuckects per tick that can pass through a single connection to an ender fluid conduit.").getInt(enderFluidConduitMaxIoRate); - useAlternateTesseractModel = config.get(sectionAesthetic, "useAlternateTransceiverModel", useAlternateTesseractModel, + useAlternateTesseractModel = config.get(sectionAesthetic.name, "useAlternateTransceiverModel", useAlternateTesseractModel, "Use TheKazador's alternatice model for the Dimensional Transceiver") .getBoolean(false); - transceiverEnergyLoss = config.get(sectionPower, "transceiverEnergyLoss", transceiverEnergyLoss, + transceiverEnergyLoss = config.get(sectionPower.name, "transceiverEnergyLoss", transceiverEnergyLoss, "Amount of energy lost when transfered by Dimensional Transceiver; 0 is no loss, 1 is 100% loss").getDouble(transceiverEnergyLoss); - transceiverUpkeepCost = config.get(sectionPower, "transceiverUpkeepCost", transceiverUpkeepCost, + transceiverUpkeepCost = config.get(sectionPower.name, "transceiverUpkeepCost", transceiverUpkeepCost, "Number of MJ/t required to keep a Dimensional Transceiver connection open").getDouble(transceiverUpkeepCost); - transceiverMaxIO = config.get(sectionPower, "transceiverMaxIO", transceiverMaxIO, + transceiverMaxIO = config.get(sectionPower.name, "transceiverMaxIO", transceiverMaxIO, "Maximum MJ/t sent and recieved by a Dimensional Transceiver per tick. Input and output limits are not cumulative").getInt(transceiverMaxIO); - transceiverBucketTransmissionCost = config.get(sectionEfficiency, "transceiverBucketTransmissionCost", transceiverBucketTransmissionCost, + transceiverBucketTransmissionCost = config.get(sectionEfficiency.name, "transceiverBucketTransmissionCost", transceiverBucketTransmissionCost, "The cost in MJ of transporting a bucket of fluid via a Dimensional Transceiver.").getDouble(transceiverBucketTransmissionCost); - vatPowerUserPerTick = (float) config.get(sectionPower, "vatPowerUserPerTick", vatPowerUserPerTick, + vatPowerUserPerTick = (float) config.get(sectionPower.name, "vatPowerUserPerTick", vatPowerUserPerTick, "Power use (MJ/t) used by the vat.").getDouble(vatPowerUserPerTick); detailedPowerTrackingEnabled = config .get( - sectionAdvanced, + sectionAdvanced.name, "perInterfacePowerTrackingEnabled", detailedPowerTrackingEnabled, "Enable per tick sampling on individual power inputs and outputs. This allows slightly more detailed messages from the MJ Reader but has a negative impact on server performance.") .getBoolean(detailedPowerTrackingEnabled); - useSneakMouseWheelYetaWrench = config.get(sectionPersonal, "useSneakMouseWheelYetaWrench", useSneakMouseWheelYetaWrench, + useSneakMouseWheelYetaWrench = config.get(sectionPersonal.name, "useSneakMouseWheelYetaWrench", useSneakMouseWheelYetaWrench, "If true, shift-mouse wheel will change the conduit display mode when the YetaWrench is eqipped.") .getBoolean(useSneakMouseWheelYetaWrench); - useSneakRightClickYetaWrench = config.get(sectionPersonal, "useSneakRightClickYetaWrench", useSneakRightClickYetaWrench, + useSneakRightClickYetaWrench = config.get(sectionPersonal.name, "useSneakRightClickYetaWrench", useSneakRightClickYetaWrench, "If true, shift-clicking the YetaWrench on a null or non wrenchable object will change the conduit display mode.") .getBoolean(useSneakRightClickYetaWrench); - itemConduitUsePhyscialDistance = config.get(sectionEfficiency, "itemConduitUsePhyscialDistance", itemConduitUsePhyscialDistance, "If true, " + + itemConduitUsePhyscialDistance = config.get(sectionEfficiency.name, "itemConduitUsePhyscialDistance", itemConduitUsePhyscialDistance, "If true, " + "'line of sight' distance rather than conduit path distance is used to calculate priorities.") .getBoolean(itemConduitUsePhyscialDistance); @@ -299,215 +339,215 @@ public final class Config { useSneakMouseWheelYetaWrench = true; } - travelAnchorEnabled = config.get(sectionItems, "travelAnchorEnabled", travelAnchorEnabled, + travelAnchorEnabled = config.get(sectionItems.name, "travelAnchorEnabled", travelAnchorEnabled, "When set to false: the travel anchor will not be craftable.").getBoolean(travelAnchorEnabled); - travelAnchorMaxDistance = config.get(sectionAnchor, "travelAnchorMaxDistance", travelAnchorMaxDistance, + travelAnchorMaxDistance = config.get(sectionAnchor.name, "travelAnchorMaxDistance", travelAnchorMaxDistance, "Maximum number of blocks that can be traveled from one travel anchor to another.").getInt(travelAnchorMaxDistance); - travelStaffMaxDistance = config.get(sectionStaff, "travelStaffMaxDistance", travelStaffMaxDistance, + travelStaffMaxDistance = config.get(sectionStaff.name, "travelStaffMaxDistance", travelStaffMaxDistance, "Maximum number of blocks that can be traveled using the Staff of the Traveling.").getInt(travelStaffMaxDistance); - travelStaffPowerPerBlockRF = (float) config.get(sectionStaff, "travelStaffPowerPerBlockRF", travelStaffPowerPerBlockRF, + travelStaffPowerPerBlockRF = (float) config.get(sectionStaff.name, "travelStaffPowerPerBlockRF", travelStaffPowerPerBlockRF, "Number of MJ required per block travelled using the Staff of the Traveling.").getDouble(travelStaffPowerPerBlockRF); - travelStaffMaxBlinkDistance = config.get(sectionStaff, "travelStaffMaxBlinkDistance", travelStaffMaxBlinkDistance, + travelStaffMaxBlinkDistance = config.get(sectionStaff.name, "travelStaffMaxBlinkDistance", travelStaffMaxBlinkDistance, "Max number of blocks teleported when shift clicking the staff.").getInt(travelStaffMaxBlinkDistance); - travelStaffBlinkPauseTicks = config.get(sectionStaff, "travelStaffBlinkPauseTicks", travelStaffBlinkPauseTicks, + travelStaffBlinkPauseTicks = config.get(sectionStaff.name, "travelStaffBlinkPauseTicks", travelStaffBlinkPauseTicks, "Minimum number of ticks between 'blinks'. Values of 10 or less allow a limited sort of flight.").getInt(travelStaffBlinkPauseTicks); - travelStaffEnabled = config.get(sectionItems, "travelStaffEnabled", travelAnchorEnabled, + travelStaffEnabled = config.get(sectionItems.name, "travelStaffEnabled", travelAnchorEnabled, "If set to false: the travel staff will not be craftable.").getBoolean(travelStaffEnabled); - travelStaffBlinkEnabled = config.get(sectionItems, "travelStaffBlinkEnabled", travelStaffBlinkEnabled, + travelStaffBlinkEnabled = config.get(sectionItems.name, "travelStaffBlinkEnabled", travelStaffBlinkEnabled, "If set to false: the travel staff can not be used to shift-right click teleport, or blink.").getBoolean(travelStaffBlinkEnabled); - travelStaffBlinkThroughSolidBlocksEnabled = config.get(sectionItems, "travelStaffBlinkThroughSolidBlocksEnabled", + travelStaffBlinkThroughSolidBlocksEnabled = config.get(sectionItems.name, "travelStaffBlinkThroughSolidBlocksEnabled", travelStaffBlinkThroughSolidBlocksEnabled, "If set to false: the travel staff can be used to blink through any block.").getBoolean(travelStaffBlinkThroughSolidBlocksEnabled); travelStaffBlinkThroughClearBlocksEnabled = config - .get(sectionItems, "travelStaffBlinkThroughClearBlocksEnabled", travelStaffBlinkThroughClearBlocksEnabled, + .get(sectionItems.name, "travelStaffBlinkThroughClearBlocksEnabled", travelStaffBlinkThroughClearBlocksEnabled, "If travelStaffBlinkThroughSolidBlocksEnabled is set to false and this is true: the travel " + "staff can only be used to blink through transparent or partial blocks (e.g. torches). " + "If both are false: only air blocks may be teleported through.") .getBoolean(travelStaffBlinkThroughClearBlocksEnabled); - enderIoRange = config.get(sectionEfficiency, "enderIoRange", enderIoRange, + enderIoRange = config.get(sectionEfficiency.name, "enderIoRange", enderIoRange, "Range accessable (in blocks) when using the Ender IO.").getInt(enderIoRange); - enderIoMeAccessEnabled = config.get(sectionPersonal, "enderIoMeAccessEnabled", enderIoMeAccessEnabled, + enderIoMeAccessEnabled = config.get(sectionPersonal.name, "enderIoMeAccessEnabled", enderIoMeAccessEnabled, "If false: you will not be able to access a ME acess or crafting terminal using the Ender IO.").getBoolean(enderIoMeAccessEnabled); - updateLightingWhenHidingFacades = config.get(sectionEfficiency, "updateLightingWhenHidingFacades", updateLightingWhenHidingFacades, + updateLightingWhenHidingFacades = config.get(sectionEfficiency.name, "updateLightingWhenHidingFacades", updateLightingWhenHidingFacades, "When true: correct lighting is recalculated (client side) for conduit bundles when transitioning to" + " from being hidden behind a facade. This produces " + "better quality rendering but can result in frame stutters when switching to/from a wrench.") .getBoolean(updateLightingWhenHidingFacades); - darkSteelPowerStorageBase = config.get(sectionDarkSteel, "darkSteelPowerStorageBase", darkSteelPowerStorageBase, + darkSteelPowerStorageBase = config.get(sectionDarkSteel.name, "darkSteelPowerStorageBase", darkSteelPowerStorageBase, "Base amount of power stored by dark steel items.").getInt(darkSteelPowerStorageBase); - darkSteelPowerStorageLevelOne = config.get(sectionDarkSteel, "darkSteelPowerStorageLevelOne", darkSteelPowerStorageLevelOne, + darkSteelPowerStorageLevelOne = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelOne", darkSteelPowerStorageLevelOne, "Amount of power stored by dark steel items with a level 1 upgrade.").getInt(darkSteelPowerStorageLevelOne); - darkSteelPowerStorageLevelTwo = config.get(sectionDarkSteel, "darkSteelPowerStorageLevelTwo", darkSteelPowerStorageLevelTwo, + darkSteelPowerStorageLevelTwo = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelTwo", darkSteelPowerStorageLevelTwo, "Amount of power stored by dark steel items with a level 2 upgrade.").getInt(darkSteelPowerStorageLevelTwo); - darkSteelPowerStorageLevelThree = config.get(sectionDarkSteel, "darkSteelPowerStorageLevelThree", darkSteelPowerStorageLevelThree, + darkSteelPowerStorageLevelThree = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelThree", darkSteelPowerStorageLevelThree, "Amount of power stored by dark steel items with a level 3 upgrade.").getInt(darkSteelPowerStorageLevelThree); - darkSteelUpgradeVibrantCost = config.get(sectionDarkSteel, "darkSteelUpgradeVibrantCost", darkSteelUpgradeVibrantCost, + darkSteelUpgradeVibrantCost = config.get(sectionDarkSteel.name, "darkSteelUpgradeVibrantCost", darkSteelUpgradeVibrantCost, "Number of levels required for the 'Vibrant' upgrade.").getInt(darkSteelUpgradeVibrantCost); - darkSteelUpgradePowerOneCost = config.get(sectionDarkSteel, "darkSteelUpgradePowerOneCost", darkSteelUpgradePowerOneCost, + darkSteelUpgradePowerOneCost = config.get(sectionDarkSteel.name, "darkSteelUpgradePowerOneCost", darkSteelUpgradePowerOneCost, "Number of levels required for the 'Vibrant' upgrade.").getInt(darkSteelUpgradePowerOneCost); - darkSteelUpgradePowerTwoCost = config.get(sectionDarkSteel, "darkSteelUpgradePowerTwoCost", darkSteelUpgradePowerTwoCost, + darkSteelUpgradePowerTwoCost = config.get(sectionDarkSteel.name, "darkSteelUpgradePowerTwoCost", darkSteelUpgradePowerTwoCost, "Number of levels required for the 'Vibrant' upgrade.").getInt(darkSteelUpgradePowerTwoCost); - darkSteelUpgradePowerThreeCost = config.get(sectionDarkSteel, "darkSteelUpgradePowerThreeCost", darkSteelUpgradePowerThreeCost, + darkSteelUpgradePowerThreeCost = config.get(sectionDarkSteel.name, "darkSteelUpgradePowerThreeCost", darkSteelUpgradePowerThreeCost, "Number of levels required for the 'Vibrant' upgrade.").getInt(darkSteelUpgradePowerThreeCost); - darkSteelSpeedOneWalkModifier = (float) config.get(sectionDarkSteel, "darkSteelSpeedOneWalkModifier", darkSteelSpeedOneWalkModifier, + darkSteelSpeedOneWalkModifier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedOneWalkModifier", darkSteelSpeedOneWalkModifier, "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedOneWalkModifier); - darkSteelSpeedTwoWalkMultiplier = (float) config.get(sectionDarkSteel, "darkSteelSpeedTwoWalkMultiplier", darkSteelSpeedTwoWalkMultiplier, + darkSteelSpeedTwoWalkMultiplier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedTwoWalkMultiplier", darkSteelSpeedTwoWalkMultiplier, "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedTwoWalkMultiplier); - darkSteelSpeedThreeWalkMultiplier = (float) config.get(sectionDarkSteel, "darkSteelSpeedThreeWalkMultiplier", darkSteelSpeedThreeWalkMultiplier, + darkSteelSpeedThreeWalkMultiplier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedThreeWalkMultiplier", darkSteelSpeedThreeWalkMultiplier, "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedThreeWalkMultiplier); - darkSteelSpeedOneSprintModifier = (float) config.get(sectionDarkSteel, "darkSteelSpeedOneSprintModifier", darkSteelSpeedOneSprintModifier, + darkSteelSpeedOneSprintModifier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedOneSprintModifier", darkSteelSpeedOneSprintModifier, "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedOneSprintModifier); - darkSteelSpeedTwoSprintMultiplier = (float) config.get(sectionDarkSteel, "darkSteelSpeedTwoSprintMultiplier", darkSteelSpeedTwoSprintMultiplier, + darkSteelSpeedTwoSprintMultiplier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedTwoSprintMultiplier", darkSteelSpeedTwoSprintMultiplier, "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedTwoSprintMultiplier); - darkSteelSpeedThreeSprintMultiplier = (float) config.get(sectionDarkSteel, "darkSteelSpeedThreeSprintMultiplier", darkSteelSpeedThreeSprintMultiplier, + darkSteelSpeedThreeSprintMultiplier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedThreeSprintMultiplier", darkSteelSpeedThreeSprintMultiplier, "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedThreeSprintMultiplier); - darkSteelBootsJumpModifier = config.get(sectionDarkSteel, "darkSteelBootsJumpModifier", darkSteelBootsJumpModifier, + darkSteelBootsJumpModifier = config.get(sectionDarkSteel.name, "darkSteelBootsJumpModifier", darkSteelBootsJumpModifier, "Jump height modifier applied when jumping with Dark Steel Boots equipped").getDouble(darkSteelBootsJumpModifier); - darkSteelPowerStorageBase = config.get(sectionDarkSteel, "darkSteelPowerStorage", darkSteelPowerStorageBase, + darkSteelPowerStorageBase = config.get(sectionDarkSteel.name, "darkSteelPowerStorage", darkSteelPowerStorageBase, "Amount of power stored (RF) per crystal in the armor items recipe.").getInt(darkSteelPowerStorageBase); - darkSteelWalkPowerCost = config.get(sectionDarkSteel, "darkSteelWalkPowerCost", darkSteelWalkPowerCost, + darkSteelWalkPowerCost = config.get(sectionDarkSteel.name, "darkSteelWalkPowerCost", darkSteelWalkPowerCost, "Amount of power stored (RF) per block walked when wearing the dark steel boots.").getInt(darkSteelWalkPowerCost); - darkSteelSprintPowerCost = config.get(sectionDarkSteel, "darkSteelSprintPowerCost", darkSteelWalkPowerCost, + darkSteelSprintPowerCost = config.get(sectionDarkSteel.name, "darkSteelSprintPowerCost", darkSteelWalkPowerCost, "Amount of power stored (RF) per block walked when wearing the dark stell boots.").getInt(darkSteelSprintPowerCost); - darkSteelDrainPowerFromInventory = config.get(sectionDarkSteel, "darkSteelDrainPowerFromInventory", darkSteelDrainPowerFromInventory, + darkSteelDrainPowerFromInventory = config.get(sectionDarkSteel.name, "darkSteelDrainPowerFromInventory", darkSteelDrainPowerFromInventory, "If true, dark steel armor will drain power stored (RF) in power containers in the players invenotry.").getBoolean(darkSteelDrainPowerFromInventory); - darkSteelBootsJumpPowerCost = config.get(sectionDarkSteel, "darkSteelBootsJumpPowerCost", darkSteelBootsJumpPowerCost, + darkSteelBootsJumpPowerCost = config.get(sectionDarkSteel.name, "darkSteelBootsJumpPowerCost", darkSteelBootsJumpPowerCost, "Base amount of power used per jump (RF) dark steel boots. The second jump in a 'double jump' uses 2x this etc").getInt(darkSteelBootsJumpPowerCost); - darkSteelSwordSkullChance = (float) config.get(sectionDarkSteel, "darkSteelSwordSkullChance", darkSteelSwordSkullChance, + darkSteelSwordSkullChance = (float) config.get(sectionDarkSteel.name, "darkSteelSwordSkullChance", darkSteelSwordSkullChance, "The base chance that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( darkSteelSwordSkullChance); - darkSteelSwordSkullLootingModifier = (float) config.get(sectionDarkSteel, "darkSteelSwordSkullLootingModifier", darkSteelSwordSkullLootingModifier, + darkSteelSwordSkullLootingModifier = (float) config.get(sectionDarkSteel.name, "darkSteelSwordSkullLootingModifier", darkSteelSwordSkullLootingModifier, "The chance per looting level that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( darkSteelSwordSkullLootingModifier); - darkSteelSwordWitherSkullChance = (float) config.get(sectionDarkSteel, "darkSteelSwordWitherSkullChance", darkSteelSwordWitherSkullChance, + darkSteelSwordWitherSkullChance = (float) config.get(sectionDarkSteel.name, "darkSteelSwordWitherSkullChance", darkSteelSwordWitherSkullChance, "The base chance that a wither skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( darkSteelSwordWitherSkullChance); - darkSteelSwordWitherSkullLootingModifier = (float) config.get(sectionDarkSteel, "darkSteelSwordWitherSkullLootingModifie", + darkSteelSwordWitherSkullLootingModifier = (float) config.get(sectionDarkSteel.name, "darkSteelSwordWitherSkullLootingModifie", darkSteelSwordWitherSkullLootingModifier, "The chance per looting level that a wither skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( darkSteelSwordWitherSkullLootingModifier); - vanillaSwordSkullLootingModifier = (float) config.get(sectionPersonal, "vanillaSwordSkullLootingModifier", vanillaSwordSkullLootingModifier, + vanillaSwordSkullLootingModifier = (float) config.get(sectionPersonal.name, "vanillaSwordSkullLootingModifier", vanillaSwordSkullLootingModifier, "The chance per looting level that a skull will be dropped when using a non-dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( vanillaSwordSkullLootingModifier); - darkSteelSwordPowerUsePerHit = config.get(sectionDarkSteel, "darkSteelSwordPowerUsePerHit", darkSteelSwordPowerUsePerHit, + darkSteelSwordPowerUsePerHit = config.get(sectionDarkSteel.name, "darkSteelSwordPowerUsePerHit", darkSteelSwordPowerUsePerHit, "The amount of power (RF) used per hit.").getInt(darkSteelSwordPowerUsePerHit); - darkSteelSwordEnderPearlDropChance = config.get(sectionDarkSteel, "darkSteelSwordEnderPearlDropChance", darkSteelSwordEnderPearlDropChance, + darkSteelSwordEnderPearlDropChance = config.get(sectionDarkSteel.name, "darkSteelSwordEnderPearlDropChance", darkSteelSwordEnderPearlDropChance, "The chance that an ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( darkSteelSwordEnderPearlDropChance); - darkSteelSwordEnderPearlDropChancePerLooting = config.get(sectionDarkSteel, "darkSteelSwordEnderPearlDropChancePerLooting", + darkSteelSwordEnderPearlDropChancePerLooting = config.get(sectionDarkSteel.name, "darkSteelSwordEnderPearlDropChancePerLooting", darkSteelSwordEnderPearlDropChancePerLooting, "The chance for each looting level that an additional ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance)") .getDouble( darkSteelSwordEnderPearlDropChancePerLooting); - darkSteelPickPowerUseObsidian = config.get(sectionDarkSteel, "darkSteelPickPowerUseObsidian", darkSteelPickPowerUseObsidian, + darkSteelPickPowerUseObsidian = config.get(sectionDarkSteel.name, "darkSteelPickPowerUseObsidian", darkSteelPickPowerUseObsidian, "The amount of power (RF) used to break an obsidian block.").getInt(darkSteelPickPowerUseObsidian); - darkSteelPickEffeciencyObsidian = config.get(sectionDarkSteel, "darkSteelPickEffeciencyObsidian", darkSteelPickEffeciencyObsidian, + darkSteelPickEffeciencyObsidian = config.get(sectionDarkSteel.name, "darkSteelPickEffeciencyObsidian", darkSteelPickEffeciencyObsidian, "The effeciency when breaking obsidian with a powered Dark Pickaxe.").getInt(darkSteelPickEffeciencyObsidian); - darkSteelPickPowerUsePerDamagePoint = config.get(sectionDarkSteel, "darkSteelPickPowerUsePerDamagePoint", darkSteelPickPowerUsePerDamagePoint, + darkSteelPickPowerUsePerDamagePoint = config.get(sectionDarkSteel.name, "darkSteelPickPowerUsePerDamagePoint", darkSteelPickPowerUsePerDamagePoint, "Power use (RF) per damage/durability point avoided.").getInt(darkSteelPickPowerUsePerDamagePoint); - darkSteelPickEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel, "darkSteelPickEffeciencyBoostWhenPowered", + darkSteelPickEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelPickEffeciencyBoostWhenPowered", darkSteelPickEffeciencyBoostWhenPowered, "The increase in effciency when powered.").getDouble(darkSteelPickEffeciencyBoostWhenPowered); - darkSteelAxePowerUsePerDamagePoint = config.get(sectionDarkSteel, "darkSteelAxePowerUsePerDamagePoint", darkSteelAxePowerUsePerDamagePoint, + darkSteelAxePowerUsePerDamagePoint = config.get(sectionDarkSteel.name, "darkSteelAxePowerUsePerDamagePoint", darkSteelAxePowerUsePerDamagePoint, "Power use (RF) per damage/durability point avoided.").getInt(darkSteelAxePowerUsePerDamagePoint); - darkSteelAxePowerUsePerDamagePointMultiHarvest = config.get(sectionDarkSteel, "darkSteelPickAxeUsePerDamagePointMultiHarvest", + darkSteelAxePowerUsePerDamagePointMultiHarvest = config.get(sectionDarkSteel.name, "darkSteelPickAxeUsePerDamagePointMultiHarvest", darkSteelAxePowerUsePerDamagePointMultiHarvest, "Power use (RF) per damage/durability point avoided when shift-harvesting multiple logs").getInt(darkSteelAxePowerUsePerDamagePointMultiHarvest); - darkSteelAxeSpeedPenaltyMultiHarvest = (float) config.get(sectionDarkSteel, "darkSteelAxeSpeedPenaltyMultiHarvest", darkSteelAxeSpeedPenaltyMultiHarvest, + darkSteelAxeSpeedPenaltyMultiHarvest = (float) config.get(sectionDarkSteel.name, "darkSteelAxeSpeedPenaltyMultiHarvest", darkSteelAxeSpeedPenaltyMultiHarvest, "How much slower shift-harvesting logs is.").getDouble(darkSteelAxeSpeedPenaltyMultiHarvest); - darkSteelAxeEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel, "darkSteelAxeEffeciencyBoostWhenPowered", + darkSteelAxeEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelAxeEffeciencyBoostWhenPowered", darkSteelAxeEffeciencyBoostWhenPowered, "The increase in effciency when powered.").getDouble(darkSteelAxeEffeciencyBoostWhenPowered); - hootchPowerPerCycle = config.get(sectionPower, "hootchPowerPerCycle", hootchPowerPerCycle, + hootchPowerPerCycle = config.get(sectionPower.name, "hootchPowerPerCycle", hootchPowerPerCycle, "The amount of power generated per BC engine cycle. Examples: BC Oil = 3, BC Fuel = 6").getInt(hootchPowerPerCycle); - hootchPowerTotalBurnTime = config.get(sectionPower, "hootchPowerTotalBurnTime", hootchPowerTotalBurnTime, + hootchPowerTotalBurnTime = config.get(sectionPower.name, "hootchPowerTotalBurnTime", hootchPowerTotalBurnTime, "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(hootchPowerTotalBurnTime); - rocketFuelPowerPerCycle = config.get(sectionPower, "rocketFuelPowerPerCycle", rocketFuelPowerPerCycle, + rocketFuelPowerPerCycle = config.get(sectionPower.name, "rocketFuelPowerPerCycle", rocketFuelPowerPerCycle, "The amount of power generated per BC engine cycle. Examples: BC Oil = 3, BC Fuel = 6").getInt(rocketFuelPowerPerCycle); - rocketFuelPowerTotalBurnTime = config.get(sectionPower, "rocketFuelPowerTotalBurnTime", rocketFuelPowerTotalBurnTime, + rocketFuelPowerTotalBurnTime = config.get(sectionPower.name, "rocketFuelPowerTotalBurnTime", rocketFuelPowerTotalBurnTime, "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(rocketFuelPowerTotalBurnTime); - fireWaterPowerPerCycle = config.get(sectionPower, "fireWaterPowerPerCycle", fireWaterPowerPerCycle, + fireWaterPowerPerCycle = config.get(sectionPower.name, "fireWaterPowerPerCycle", fireWaterPowerPerCycle, "The amount of power generated per BC engine cycle. Examples: BC Oil = 3, BC Fuel = 6").getInt(fireWaterPowerPerCycle); - fireWaterPowerTotalBurnTime = config.get(sectionPower, "fireWaterPowerTotalBurnTime", fireWaterPowerTotalBurnTime, + fireWaterPowerTotalBurnTime = config.get(sectionPower.name, "fireWaterPowerTotalBurnTime", fireWaterPowerTotalBurnTime, "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(fireWaterPowerTotalBurnTime); - zombieGeneratorMjPerTick = config.get(sectionPower, "zombieGeneratorMjPerTick", zombieGeneratorMjPerTick, + zombieGeneratorMjPerTick = config.get(sectionPower.name, "zombieGeneratorMjPerTick", zombieGeneratorMjPerTick, "The amount of power generated per tick.").getDouble(zombieGeneratorMjPerTick); - zombieGeneratorTicksPerBucketFuel = config.get(sectionPower, "zombieGeneratorTicksPerMbFuel", zombieGeneratorTicksPerBucketFuel, + zombieGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "zombieGeneratorTicksPerMbFuel", zombieGeneratorTicksPerBucketFuel, "The number of ticks one bucket of fuel lasts.").getInt(zombieGeneratorTicksPerBucketFuel); - addFuelTooltipsToAllFluidContainers = config.get(sectionPersonal, "addFuelTooltipsToAllFluidContainers", addFuelTooltipsToAllFluidContainers, + addFuelTooltipsToAllFluidContainers = config.get(sectionPersonal.name, "addFuelTooltipsToAllFluidContainers", addFuelTooltipsToAllFluidContainers, "If true, the MJ/t and burn time of the fuel will be displayed in all tooltips for fluid containers with fuel.").getBoolean( addFuelTooltipsToAllFluidContainers); - addDurabilityTootip = config.get(sectionPersonal, "addDurabilityTootip", addFuelTooltipsToAllFluidContainers, + addDurabilityTootip = config.get(sectionPersonal.name, "addDurabilityTootip", addFuelTooltipsToAllFluidContainers, "If true, adds durability tooltips to tools and armor").getBoolean( addDurabilityTootip); - addFurnaceFuelTootip = config.get(sectionPersonal, "addFurnaceFuelTootip", addFuelTooltipsToAllFluidContainers, + addFurnaceFuelTootip = config.get(sectionPersonal.name, "addFurnaceFuelTootip", addFuelTooltipsToAllFluidContainers, "If true, adds burn duration tooltips to furnace fuels").getBoolean(addFurnaceFuelTootip); - farmContinuousEnergyUse = (float) config.get(sectionFarm, "farmContinuousEnergyUse", farmContinuousEnergyUse, + farmContinuousEnergyUse = (float) config.get(sectionFarm.name, "farmContinuousEnergyUse", farmContinuousEnergyUse, "The amount of power used by a farm per tick ").getDouble(farmContinuousEnergyUse); - farmActionEnergyUse = (float) config.get(sectionFarm, "farmActionEnergyUse", farmActionEnergyUse, + farmActionEnergyUse = (float) config.get(sectionFarm.name, "farmActionEnergyUse", farmActionEnergyUse, "The amount of power used by a farm per action (eg plant, till, harvest) ").getDouble(farmActionEnergyUse); - farmDefaultSize = config.get(sectionFarm, "farmDefaultSize", farmDefaultSize, + farmDefaultSize = config.get(sectionFarm.name, "farmDefaultSize", farmDefaultSize, "The number of blocks a farm will extend from its center").getInt(farmDefaultSize); - farmAxeDamageOnLeafBreak = config.get(sectionFarm, "farmAxeDamageOnLeafBreak", farmAxeDamageOnLeafBreak, + farmAxeDamageOnLeafBreak = config.get(sectionFarm.name, "farmAxeDamageOnLeafBreak", farmAxeDamageOnLeafBreak, "Should axes in a farm take damage when breaking leaves?").getBoolean(farmAxeDamageOnLeafBreak); - farmToolTakeDamageChance = (float) config.get(sectionFarm, "farmToolTakeDamageChance", farmToolTakeDamageChance, + farmToolTakeDamageChance = (float) config.get(sectionFarm.name, "farmToolTakeDamageChance", farmToolTakeDamageChance, "The chance that a tool in the farm will take damage.").getDouble(farmToolTakeDamageChance); - combustionGeneratorUseOpaqueModel = config.get(sectionAesthetic, "combustionGeneratorUseOpaqueModel", combustionGeneratorUseOpaqueModel, + combustionGeneratorUseOpaqueModel = config.get(sectionAesthetic.name, "combustionGeneratorUseOpaqueModel", combustionGeneratorUseOpaqueModel, "If set to true: fluid will not be shown in combustion generator tanks. Improves FPS. ").getBoolean(combustionGeneratorUseOpaqueModel); - magnetPowerUsePerSecondRF = config.get(sectionMagnet, "magnetPowerUsePerTickRF", magnetPowerUsePerSecondRF, + magnetPowerUsePerSecondRF = config.get(sectionMagnet.name, "magnetPowerUsePerTickRF", magnetPowerUsePerSecondRF, "The amount of RF power used per tick when the magnet is active").getInt(magnetPowerUsePerSecondRF); - magnetPowerCapacityRF = config.get(sectionMagnet, "magnetPowerCapacityRF", magnetPowerCapacityRF, + magnetPowerCapacityRF = config.get(sectionMagnet.name, "magnetPowerCapacityRF", magnetPowerCapacityRF, "Amount of RF power stored in a fully charged magnet").getInt(magnetPowerCapacityRF); - magnetRange = config.get(sectionMagnet, "magnetRange", magnetRange, + magnetRange = config.get(sectionMagnet.name, "magnetRange", magnetRange, "Range of the magnet in blocks.").getInt(magnetRange); - useCombustionGenModel = config.get(sectionAesthetic, "useCombustionGenModel", useCombustionGenModel, + useCombustionGenModel = config.get(sectionAesthetic.name, "useCombustionGenModel", useCombustionGenModel, "If set to true: WIP Combustion Generator model will be used").getBoolean(useCombustionGenModel); crafterMjPerCraft = config.get("AutoCrafter Settings", "crafterMjPerCraft", crafterMjPerCraft, "MJ used per autocrafted recipe").getInt(crafterMjPerCraft); - poweredSpawnerMinDelayTicks = config.get(sectionSpawner, "poweredSpawnerMinDelayTicks", poweredSpawnerMinDelayTicks, + poweredSpawnerMinDelayTicks = config.get(sectionSpawner.name, "poweredSpawnerMinDelayTicks", poweredSpawnerMinDelayTicks, "Min tick delay between spawns for a non-upgraded spawner").getInt(poweredSpawnerMinDelayTicks); - poweredSpawnerMaxDelayTicks = config.get(sectionSpawner, "poweredSpawnerMaxDelayTicks", poweredSpawnerMaxDelayTicks, + poweredSpawnerMaxDelayTicks = config.get(sectionSpawner.name, "poweredSpawnerMaxDelayTicks", poweredSpawnerMaxDelayTicks, "Min tick delay between spawns for a non-upgraded spawner").getInt(poweredSpawnerMaxDelayTicks); - poweredSpawnerLevelOnePowerPerTick = (float)config.get(sectionSpawner, "poweredSpawnerLevelOnePowerPerTick", poweredSpawnerLevelOnePowerPerTick, + poweredSpawnerLevelOnePowerPerTick = (float)config.get(sectionSpawner.name, "poweredSpawnerLevelOnePowerPerTick", poweredSpawnerLevelOnePowerPerTick, "MJ per tick for a level 1 (non-upgraded) spawner").getDouble(poweredSpawnerLevelOnePowerPerTick); - poweredSpawnerLevelTwoPowerPerTick = (float)config.get(sectionSpawner, "poweredSpawnerLevelTwoPowerPerTick", poweredSpawnerLevelTwoPowerPerTick, + poweredSpawnerLevelTwoPowerPerTick = (float)config.get(sectionSpawner.name, "poweredSpawnerLevelTwoPowerPerTick", poweredSpawnerLevelTwoPowerPerTick, "MJ per tick for a level 2 spawner").getDouble(poweredSpawnerLevelTwoPowerPerTick); - poweredSpawnerLevelThreePowerPerTick = (float)config.get(sectionSpawner, "poweredSpawnerLevelThreePowerPerTick", poweredSpawnerLevelThreePowerPerTick, + poweredSpawnerLevelThreePowerPerTick = (float)config.get(sectionSpawner.name, "poweredSpawnerLevelThreePowerPerTick", poweredSpawnerLevelThreePowerPerTick, "MJ per tick for a level 3 spawner").getDouble(poweredSpawnerLevelThreePowerPerTick); - poweredSpawnerMaxPlayerDistance = config.get(sectionSpawner, "poweredSpawnerMaxPlayerDistance", poweredSpawnerMaxPlayerDistance, + poweredSpawnerMaxPlayerDistance = config.get(sectionSpawner.name, "poweredSpawnerMaxPlayerDistance", poweredSpawnerMaxPlayerDistance, "Max distance of the closest player for the spawner to be active. A zero value will remove the player check").getInt(poweredSpawnerMaxPlayerDistance); - poweredSpawnerUseVanillaSpawChecks = config.get(sectionSpawner, "poweredSpawnerUseVanillaSpawChecks", poweredSpawnerUseVanillaSpawChecks, + poweredSpawnerUseVanillaSpawChecks = config.get(sectionSpawner.name, "poweredSpawnerUseVanillaSpawChecks", poweredSpawnerUseVanillaSpawChecks, "If true, regular spawn checks such as lighting level and dimension will be made before spawning mobs").getBoolean(poweredSpawnerUseVanillaSpawChecks); - brokenSpawnerDropChance = (float)config.get(sectionSpawner, "brokenSpawnerDropChance", brokenSpawnerDropChance, + brokenSpawnerDropChance = (float)config.get(sectionSpawner.name, "brokenSpawnerDropChance", brokenSpawnerDropChance, "The chance a brokne spawner will be dropped when a spawner is broken. 1 = 100% chance, 0 = 0% chance").getDouble(brokenSpawnerDropChance); - powerSpawnerAddSpawnerCost = config.get(sectionSpawner, "powerSpawnerAddSpawnerCost", powerSpawnerAddSpawnerCost, + powerSpawnerAddSpawnerCost = config.get(sectionSpawner.name, "powerSpawnerAddSpawnerCost", powerSpawnerAddSpawnerCost, "The number of levels it costs to add a broken spawner").getInt(powerSpawnerAddSpawnerCost); } diff --git a/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java b/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java index 66113536..d34c4fa8 100644 --- a/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java +++ b/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java @@ -1,26 +1,36 @@ package crazypants.enderio.config; +import static crazypants.enderio.config.Config.*; + import java.util.ArrayList; import java.util.List; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.resources.I18n; +import net.minecraftforge.common.config.ConfigCategory; +import net.minecraftforge.common.config.ConfigElement; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.IConfigElement; import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config.Section; +import crazypants.util.Lang; +@SuppressWarnings({ "rawtypes" }) public class GuiConfigFactoryEIO extends GuiConfig { public GuiConfigFactoryEIO(GuiScreen parentScreen) { - super(parentScreen, getConfigElements(parentScreen), EnderIO.MODID, false, false, I18n.format("EIO.config.title")); + super(parentScreen, getConfigElements(parentScreen), EnderIO.MODID, false, false, Lang.localize("config.title", true)); } private static List getConfigElements(GuiScreen parent) { List list = new ArrayList(); + String prefix = Lang.prefix + "config."; + + for (Section section : Config.sections) { + list.add(new ConfigElement(config.getCategory(section.lc()).setLanguageKey(prefix + section.lang))); + } + return list; } - - // Help me bspkrs, you're my only hope. } diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmersComune.java b/src/main/java/crazypants/enderio/machine/farm/FarmersCommune.java similarity index 84% rename from src/main/java/crazypants/enderio/machine/farm/FarmersComune.java rename to src/main/java/crazypants/enderio/machine/farm/FarmersCommune.java index d8daa92a..0f5910ab 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmersComune.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmersCommune.java @@ -7,16 +7,16 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import crazypants.util.BlockCoord; -public class FarmersComune implements IFarmerJoe { +public class FarmersCommune implements IFarmerJoe { - public static FarmersComune instance = new FarmersComune(); + public static FarmersCommune instance = new FarmersCommune(); - public static void joinComune(IFarmerJoe joe) { + public static void joinCommune(IFarmerJoe joe) { instance.farmers.add(joe); } - public static void leaveComune(IFarmerJoe joe) { - throw new UnsupportedOperationException("As if this would be implemented. The comune is for life!"); + public static void leaveCommune(IFarmerJoe joe) { + throw new UnsupportedOperationException("As if this would be implemented. The commune is for life!"); } private List farmers = new ArrayList(); diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java b/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java index fb4fe136..8a207665 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java @@ -11,14 +11,14 @@ public final class FarmersRegistry { public static void addFarmers() { //vanilla - FarmersComune.instance.joinComune(new SeedFarmer(Blocks.potatoes, new ItemStack(Items.potato))); - FarmersComune.instance.joinComune(new SeedFarmer(Blocks.wheat, new ItemStack(Items.wheat_seeds))); - FarmersComune.instance.joinComune(new SeedFarmer(Blocks.carrots, new ItemStack(Items.carrot))); - FarmersComune.instance.joinComune(new NetherWartFarmer()); - FarmersComune.instance.joinComune(new StemFarmer(Blocks.reeds, new ItemStack(Items.reeds))); - FarmersComune.instance.joinComune(new StemFarmer(Blocks.cactus, new ItemStack(Blocks.cactus))); - FarmersComune.instance.joinComune(new TreeFarmer(Blocks.sapling, Blocks.log)); - FarmersComune.instance.joinComune(new TreeFarmer(Blocks.sapling, Blocks.log2)); + FarmersCommune.instance.joinCommune(new SeedFarmer(Blocks.potatoes, new ItemStack(Items.potato))); + FarmersCommune.instance.joinCommune(new SeedFarmer(Blocks.wheat, new ItemStack(Items.wheat_seeds))); + FarmersCommune.instance.joinCommune(new SeedFarmer(Blocks.carrots, new ItemStack(Items.carrot))); + FarmersCommune.instance.joinCommune(new NetherWartFarmer()); + FarmersCommune.instance.joinCommune(new StemFarmer(Blocks.reeds, new ItemStack(Items.reeds))); + FarmersCommune.instance.joinCommune(new StemFarmer(Blocks.cactus, new ItemStack(Blocks.cactus))); + FarmersCommune.instance.joinCommune(new TreeFarmer(Blocks.sapling, Blocks.log)); + FarmersCommune.instance.joinCommune(new TreeFarmer(Blocks.sapling, Blocks.log2)); addExtraUtilities(); addNutura(); @@ -45,7 +45,7 @@ public final class FarmersRegistry { if(cropBlock != null) { Item seedItem = GameRegistry.findItem(mod, itemName); if(seedItem != null) { - FarmersComune.instance.joinComune(new PickableFarmer(cropBlock, new ItemStack(seedItem))); + FarmersCommune.instance.joinCommune(new PickableFarmer(cropBlock, new ItemStack(seedItem))); } } } @@ -55,7 +55,7 @@ public final class FarmersRegistry { if(cropBlock != null) { Item seedItem = GameRegistry.findItem(mod, itemName); if(seedItem != null) { - FarmersComune.instance.joinComune(new SeedFarmer(cropBlock, new ItemStack(seedItem))); + FarmersCommune.instance.joinCommune(new SeedFarmer(cropBlock, new ItemStack(seedItem))); } } } @@ -71,7 +71,7 @@ public final class FarmersRegistry { for (int i = 0; i < 2; i++) { PickableFarmer farmer = new NaturaBerryFarmer(cropBlock, i, 12 + i, new ItemStack(seedItem, 1, 8 + i)); farmer.setRequiresFarmland(false); - FarmersComune.instance.joinComune(farmer); + FarmersCommune.instance.joinCommune(farmer); } } } @@ -84,7 +84,7 @@ public final class FarmersRegistry { for (int i = 0; i < 4; i++) { PickableFarmer farmer = new NaturaBerryFarmer(cropBlock, i, 12 + i, new ItemStack(seedItem, 1, 8 + i)); farmer.setRequiresFarmland(false); - FarmersComune.instance.joinComune(farmer); + FarmersCommune.instance.joinCommune(farmer); } } } @@ -100,9 +100,9 @@ public final class FarmersRegistry { Item seedItem = GameRegistry.findItem(mod, "barley.seed"); if(seedItem != null) { //barley - FarmersComune.instance.joinComune(new SeedFarmer(cropBlock, 3, new ItemStack(seedItem))); + FarmersCommune.instance.joinCommune(new SeedFarmer(cropBlock, 3, new ItemStack(seedItem))); // cotton - FarmersComune.instance.joinComune(new PickableFarmer(cropBlock, 4, 8, new ItemStack(seedItem, 1, 1))); + FarmersCommune.instance.joinCommune(new PickableFarmer(cropBlock, 4, 8, new ItemStack(seedItem, 1, 1))); } } @@ -114,7 +114,7 @@ public final class FarmersRegistry { for (int i = 0; i < 4; i++) { PickableFarmer farmer = new NaturaBerryFarmer(cropBlock, i, 12 + i, new ItemStack(seedItem, 1, 12 + i)); farmer.setRequiresFarmland(false); - FarmersComune.instance.joinComune(farmer); + FarmersCommune.instance.joinCommune(farmer); } } } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index a7f50c3c..b96a6530 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -217,7 +217,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt (Util.isType(stack, ItemAxe.class) && !hasAxe()) || (getTool(stack.getItem().getClass()) == null && getLooting(stack) > 0); } - return FarmersComune.instance.canPlant(stack); + return FarmersCommune.instance.canPlant(stack); } @Override @@ -254,11 +254,11 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt if(isOpen(bc)) { - FarmersComune.instance.prepareBlock(this, bc, block, meta); + FarmersCommune.instance.prepareBlock(this, bc, block, meta); block = worldObj.getBlock(bc.x, bc.y, bc.z); } if(!isOpen(bc) && hasPower()) { - IHarvestResult harvest = FarmersComune.instance.harvestBlock(this, bc, block, meta); + IHarvestResult harvest = FarmersCommune.instance.harvestBlock(this, bc, block, meta); if(harvest != null) { if(harvest.getDrops() != null) { PacketFarmAction pkt = new PacketFarmAction(harvest.getHarvestedBlocks()); diff --git a/src/main/java/crazypants/util/Lang.java b/src/main/java/crazypants/util/Lang.java index 1f903a39..f24332b6 100644 --- a/src/main/java/crazypants/util/Lang.java +++ b/src/main/java/crazypants/util/Lang.java @@ -3,6 +3,8 @@ package crazypants.util; import net.minecraft.util.StatCollector; public class Lang { + + public static final String prefix = "enderio."; public static String localize(String s) { return localize(s, true); @@ -10,7 +12,7 @@ public class Lang { public static String localize(String s, boolean appendEIO) { if(appendEIO) { - s = "enderio." + s; + s = prefix + s; } return StatCollector.translateToLocal(s); }