From e96cbac35c1921c997fab77080ce0132e8e61fa0 Mon Sep 17 00:00:00 2001 From: SenseiKiwi Date: Wed, 12 Jun 2013 22:49:45 -0400 Subject: [PATCH] Changed property variable names, minor bug fix Changed the names of property variables in DimDoorsConfig to follow better variable naming conventions. Removed a duplicate config.save() call. Noticed that crafting Stabilized Rift Signatures can't be disabled in the config file, will be adding that option in the next commit. General note: we need a better way of handling item configuration. Metaprogramming in Java would be a godsend. --- .../mod_pocketDim/DimDoorsConfig.java | 370 ++++++++---------- 1 file changed, 173 insertions(+), 197 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java b/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java index 8aa493c..beaa4e8 100644 --- a/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java +++ b/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java @@ -10,238 +10,214 @@ public class DimDoorsConfig /** * BlockIDs */ - - public static Property chaosDoor; - public static Property dimDoor; - public static Property exitDoor; - public static Property dimHatch; - public static Property transientDoor; - - public static Property blockFabric; - public static Property blockRift; - - + public static Property UnstableDoorID; + public static Property DimensionalDoorID; + public static Property WarpDoorID; + public static Property TransTrapdoorID; + public static Property TransientDoorID; + + public static Property FabricBlockID; + public static Property RiftBlockID; + /** * WorldGenBlockIDs */ - - public static Property blockLimbo; - public static Property blockFabricPerm; - - + public static Property LimboBlockID; + public static Property PermaFabricBlockID; + + /** * ItemIDs */ - - public static Property itemRiftBlade; - public static Property itemRiftSignature; - public static Property itemRiftRemover; - public static Property itemStableFabric; - public static Property itemStabilizedRiftSignature; - - public static Property itemDimDoor; - public static Property itemChaosDoor; - public static Property itemExitDoor; - - + + public static Property RiftBladeItemID; + public static Property RiftSignatureItemID; + public static Property RiftRemoverItemID; + public static Property StableFabricItemID; + public static Property StabilizedRiftSignatureItemID; + + public static Property DimensionalDoorItemID; + public static Property UnstableDoorItemID; + public static Property WarpDoorItemID; + /** * Other IDs */ - - public static Property limboBiomeID; - public static Property pocketBiomeID; - public static Property limboDimID; - public static Property limboProviderID; - public static Property pocketProviderID; - public static Property doorRenderID; - public static Property monolithID; - + public static Property LimboBiomeID; + public static Property PocketBiomeID; + public static Property LimboDimensionID; + public static Property limboProviderID; + public static Property PocketProviderID; + public static Property DoorRenderEntityID; + public static Property MonolithEntityID; + /** * CraftingFlags */ - public static Property bCraftDimDoor; - public static Property bCraftExitDoor; - public static Property bCraftRiftSig; - public static Property bCraftRiftRemover; - public static Property bCraftUnstableDoor; - public static Property bCraftRiftBlade; - public static Property bCraftDimHatch; - public static Property bCraftChaosDoor; + public static Property CraftingDimensionaDoorAllowed; + public static Property CraftingWarpDoorAllowed; + public static Property CraftingRiftSignatureAllowed; + public static Property CraftingRiftRemoverAllowed; + public static Property CraftingUnstableDoorAllowed; + public static Property CraftingRiftBladeAllowed; + public static Property CraftingTransTrapdoorAllowed; + public static Property CraftingStabilizedRiftSignatureAllowed; /** * OtherFlags */ - public static Property bWorldGenRifts; - public static Property bRiftSpread; - public static Property bRiftGreif; - public static Property bRiftsSpawnEndermen; - public static Property bLimboActive; - public static Property bHardcoreLimbo; - public static Property bLimboReturnInventory; - public static Property bEnableDoorRender; - public static Property bTNFREAKINGT; - - + + public static Property WorldRiftGenerationEnabled; + public static Property RiftSpreadEnabled; + public static Property RiftGriefingEnabled; + public static Property RiftsSpawnEndermenEnabled; + public static Property LimboEnabled; + public static Property LimboRespawningEnabled; + public static Property LimboReturnsInventoryEnabled; + public static Property DoorRenderingEnabled; + public static Property TNFREAKINGT_Enabled; + /** * Other */ - - public static Property HOWMUCHTNT; - public static Property riftSpreadModifier; - public static Property limboReturnRange; - - + public static Property NonTntRatio; + public static Property RiftSpreadModifier; + public static Property LimboReturnRange; + public static void loadConfig(File configFile) { Configuration config = new Configuration(configFile); - + config.load(); - - config.load(); - - bCraftDimHatch = config.get("Crafting control", "bCraftDimHatch", true); - - bCraftDimDoor = config.get("Crafting control", "bCraftDimDoor", true); - - bCraftRiftBlade = config.get("Crafting control", "bCraftRiftBlade", true); - - bCraftRiftRemover = config.get("Crafting control", "bCraftRiftRemover", true); - - bCraftRiftSig = config.get("Crafting control", "bCraftRiftSig", true); - - bCraftChaosDoor = config.get("Crafting control", "bCraftChaosDoor", true); - - bCraftExitDoor = config.get("Crafting control", "bCraftExitDoor", true); - - - - bHardcoreLimbo = config.get(Configuration.CATEGORY_GENERAL, "bHardcoreLimbo", false); - bHardcoreLimbo.comment = "True causes the player to respawn in limbo if they die in limbo"; - - - bTNFREAKINGT = config.get("Configuration.CATEGORY_GENERAL", "EXPLOSIONS!!???!!!?!?!!", false); - - bRiftGreif = config.get(Configuration.CATEGORY_GENERAL, "bRiftGreif", true); - bRiftGreif.comment = "toggles whether rifts eat blocks around them or not"; - - bEnableDoorRender = config.get(Configuration.CATEGORY_GENERAL, "bEnableDoorRender", true); - - bLimboReturnInventory = config.get(Configuration.CATEGORY_GENERAL, "bLimboReturnInventory", true); - bLimboReturnInventory.comment="Toggles whether or not your inventory is returned upon dying and respawning in limbo"; - - HOWMUCHTNT=config.get(Configuration.CATEGORY_GENERAL, "HOWMUCHTNT", 25); - HOWMUCHTNT.comment="Chance that a block will not be TNT. must be greater than 1. Explosions!?!?? must be set to true, and you figure out what it does. "; - - monolithID=config.get(Configuration.CATEGORY_GENERAL, "monolithID", 125); + CraftingDimensionaDoorAllowed = config.get("Crafting control", "bCraftDimDoor", true); + CraftingWarpDoorAllowed = config.get("Crafting control", "bCraftExitDoor", true); + CraftingUnstableDoorAllowed = config.get("Crafting control", "bCraftChaosDoor", true); + CraftingTransTrapdoorAllowed = config.get("Crafting control", "bCraftDimHatch", true); + CraftingRiftSignatureAllowed = config.get("Crafting control", "bCraftRiftSig", true); + CraftingRiftRemoverAllowed = config.get("Crafting control", "bCraftRiftRemover", true); + CraftingStabilizedRiftSignatureAllowed = config.get("Crafting control", "bCraftStabilizedRiftSig", true); + CraftingRiftBladeAllowed = config.get("Crafting control", "bCraftRiftBlade", true); - - // dimRailID = config.getBlock("Dimensional Rail", 1980).getInt(); + LimboRespawningEnabled = config.get(Configuration.CATEGORY_GENERAL, "bHardcoreLimbo", false); + LimboRespawningEnabled.comment = "True causes the player to respawn in limbo if they die in limbo"; - chaosDoor = config.getBlock("Chaos Door", 1978); - dimDoor = config.getBlock("Dimensional Door", 1970); - dimHatch = config.getBlock("Transdimensional Trapdoor", 1971); - blockFabric=config.getBlock("Fabric of Reality", 1973); - exitDoor = config.getBlock("Warp Door", 1975); - blockRift = config.getBlock("Rift", 1977); - transientDoor = config.getBlock("transientDoorID", 1979); + TNFREAKINGT_Enabled = config.get("Configuration.CATEGORY_GENERAL", "EXPLOSIONS!!???!!!?!?!!", false); - itemStabilizedRiftSignature=config.getItem("Stabilized Rift Signature", 5677); - itemRiftBlade=config.getItem("Rift Blade", 5676); - itemChaosDoor=config.getItem("Chaos Door", 5673); - itemRiftRemover=config.getItem("Rift Remover", 5671); - itemStableFabric=config.getItem("Stable Fabric", 5672); - itemExitDoor=config.getItem("Warp Door Item", 5673); - itemDimDoor=config.getItem("Dimensional Door Item", 5674); - itemRiftSignature=config.getItem("Rift Signature Item", 5675); - - bLimboActive=config.get(Configuration.CATEGORY_GENERAL, "bLimboActive", true); - - + RiftGriefingEnabled = config.get(Configuration.CATEGORY_GENERAL, "bRiftGreif", true); + RiftGriefingEnabled.comment = "toggles whether rifts eat blocks around them or not"; - blockLimbo=config.get("Worldgen Block IDs - must be less than 256", "blockLimbo", 217); - blockFabricPerm=config.get("Worldgen Block IDs - must be less than 256", "blockFabricPerm", 220); - - - limboDimID=config.get(Configuration.CATEGORY_GENERAL, "limboDimID", -23); - doorRenderID=config.get(Configuration.CATEGORY_GENERAL, "doorRenderID", 89); + DoorRenderingEnabled = config.get(Configuration.CATEGORY_GENERAL, "bEnableDoorRender", true); - limboReturnRange=config.get(Configuration.CATEGORY_GENERAL, "limboReturnRange", 500); - limboReturnRange.comment = "The farthest possible distance that limbo can send you upon return to the overworld."; - - pocketProviderID=config.get(Configuration.CATEGORY_GENERAL, "pocketProviderID", 24); - - limboProviderID=config.get(Configuration.CATEGORY_GENERAL, "limboProvider ID", 13); + LimboReturnsInventoryEnabled = config.get(Configuration.CATEGORY_GENERAL, "bLimboReturnInventory", true); + LimboReturnsInventoryEnabled.comment="Toggles whether or not your inventory is returned upon dying and respawning in limbo"; + + NonTntRatio=config.get(Configuration.CATEGORY_GENERAL, "HOWMUCHTNT", 25); + NonTntRatio.comment="Chance that a block will not be TNT. must be greater than 1. Explosions!?!?? must be set to true, and you figure out what it does. "; + + MonolithEntityID=config.get(Configuration.CATEGORY_GENERAL, "monolithID", 125); + + UnstableDoorID = config.getBlock("Chaos Door", 1978); + DimensionalDoorID = config.getBlock("Dimensional Door", 1970); + TransTrapdoorID = config.getBlock("Transdimensional Trapdoor", 1971); + FabricBlockID=config.getBlock("Fabric of Reality", 1973); + WarpDoorID = config.getBlock("Warp Door", 1975); + RiftBlockID = config.getBlock("Rift", 1977); + TransientDoorID = config.getBlock("transientDoorID", 1979); + + StabilizedRiftSignatureItemID=config.getItem("Stabilized Rift Signature", 5677); + RiftBladeItemID=config.getItem("Rift Blade", 5676); + UnstableDoorItemID=config.getItem("Chaos Door", 5673); + RiftRemoverItemID=config.getItem("Rift Remover", 5671); + StableFabricItemID=config.getItem("Stable Fabric", 5672); + WarpDoorItemID=config.getItem("Warp Door Item", 5673); + DimensionalDoorItemID=config.getItem("Dimensional Door Item", 5674); + RiftSignatureItemID=config.getItem("Rift Signature Item", 5675); + + LimboEnabled=config.get(Configuration.CATEGORY_GENERAL, "bLimboActive", true); + + + + LimboBlockID=config.get("Worldgen Block IDs - must be less than 256", "blockLimbo", 217); + PermaFabricBlockID=config.get("Worldgen Block IDs - must be less than 256", "blockFabricPerm", 220); + + + LimboDimensionID=config.get(Configuration.CATEGORY_GENERAL, "limboDimID", -23); + DoorRenderEntityID=config.get(Configuration.CATEGORY_GENERAL, "doorRenderID", 89); + + LimboReturnRange=config.get(Configuration.CATEGORY_GENERAL, "limboReturnRange", 500); + LimboReturnRange.comment = "The farthest possible distance that limbo can send you upon return to the overworld."; + + PocketProviderID=config.get(Configuration.CATEGORY_GENERAL, "pocketProviderID", 24); + + limboProviderID=config.get(Configuration.CATEGORY_GENERAL, "limboProvider ID", 13); + + + + WorldRiftGenerationEnabled = config.get(Configuration.CATEGORY_GENERAL, "bWorldGenRifts", true); + WorldRiftGenerationEnabled.comment = "Toggles the natrual generation of dungeon rifts in other dimensions"; + + LimboEnabled = config.get(Configuration.CATEGORY_GENERAL, "bLimboActive", true); + LimboEnabled.comment="Toggles if dying in a pocket dim respawns the player in limbo"; + + RiftSpreadModifier = config.get(Configuration.CATEGORY_GENERAL, "riftSpreadModifier", 3); + RiftSpreadModifier.comment = "How many times a rift can spread- 0 prevents rifts from spreading at all. I dont recommend putting it highter than 5, because its rather exponential. "; + + LimboBiomeID=config.get(Configuration.CATEGORY_GENERAL, "limboBiomeID", 251); + PocketBiomeID=config.get(Configuration.CATEGORY_GENERAL, "pocketBiomeID", 250); - - - bWorldGenRifts = config.get(Configuration.CATEGORY_GENERAL, "bWorldGenRifts", true); - bWorldGenRifts.comment = "Toggles the natrual generation of dungeon rifts in other dimensions"; - - bLimboActive = config.get(Configuration.CATEGORY_GENERAL, "bLimboActive", true); - bLimboActive.comment="Toggles if dying in a pocket dim respawns the player in limbo"; - riftSpreadModifier = config.get(Configuration.CATEGORY_GENERAL, "riftSpreadModifier", 3); - riftSpreadModifier.comment = "How many times a rift can spread- 0 prevents rifts from spreading at all. I dont recommend putting it highter than 5, because its rather exponential. "; - - limboBiomeID=config.get(Configuration.CATEGORY_GENERAL, "limboBiomeID", 251); - pocketBiomeID=config.get(Configuration.CATEGORY_GENERAL, "pocketBiomeID", 250); - - - config.save(); - - config.save(); - - mod_pocketDim.blockDimWallID=blockFabric.getInt(); - mod_pocketDim.blockDimWallPermID=blockFabricPerm.getInt(); - mod_pocketDim.blockLimboID=blockLimbo.getInt(); - mod_pocketDim.blockRiftID=blockLimbo.getInt(); - mod_pocketDim.dimDoorID=dimDoor.getInt(); - mod_pocketDim.chaosDoorID=chaosDoor.getInt(); - mod_pocketDim.transientDoorID=transientDoor.getInt(); - mod_pocketDim.dimHatchID=dimHatch.getInt(); - mod_pocketDim.ExitDoorID=exitDoor.getInt(); - mod_pocketDim.blockRiftID=blockRift.getInt(); - mod_pocketDim.DoorRenderID=doorRenderID.getInt(); - mod_pocketDim.hardcoreLimbo=bHardcoreLimbo.getBoolean(false); - mod_pocketDim.enableDimTrapDoor=bCraftDimHatch.getBoolean(true); - mod_pocketDim.enableDoorOpenGL=bEnableDoorRender.getBoolean(true); - mod_pocketDim.enableIronDimDoor=bCraftDimDoor.getBoolean(true); - mod_pocketDim.enableRiftBlade=bCraftRiftBlade.getBoolean(true); - mod_pocketDim.enableRiftRemover=bCraftRiftBlade.getBoolean(true); - mod_pocketDim.enableRiftSignature=bCraftRiftSig.getBoolean(true); - mod_pocketDim.enableUnstableDoor=bCraftRiftSig.getBoolean(true); - mod_pocketDim.enableWoodenDimDoor=bCraftExitDoor.getBoolean(true); - mod_pocketDim.itemChaosDoorID=itemChaosDoor.getInt(); - mod_pocketDim.itemDimDoorID=itemDimDoor.getInt(); - mod_pocketDim.itemExitDoorID=itemExitDoor.getInt(); - mod_pocketDim.itemLinkSignatureID=itemRiftSignature.getInt(); - mod_pocketDim.itemRiftBladeID=itemRiftBlade.getInt(); - mod_pocketDim.itemRiftRemoverID=itemRiftRemover.getInt(); - mod_pocketDim.itemStabilizedLinkSignatureID=itemStabilizedRiftSignature.getInt(); - mod_pocketDim.itemStableFabricID=itemStableFabric.getInt(); - mod_pocketDim.obeliskID=monolithID.getInt(); - mod_pocketDim.limboBiomeID=limboBiomeID.getInt(); - mod_pocketDim.pocketBiomeID=pocketBiomeID.getInt(); - mod_pocketDim.providerID=pocketProviderID.getInt(); + + mod_pocketDim.blockDimWallID=FabricBlockID.getInt(); + mod_pocketDim.blockDimWallPermID=PermaFabricBlockID.getInt(); + mod_pocketDim.blockLimboID=LimboBlockID.getInt(); + mod_pocketDim.blockRiftID=LimboBlockID.getInt(); + mod_pocketDim.dimDoorID=DimensionalDoorID.getInt(); + mod_pocketDim.chaosDoorID=UnstableDoorID.getInt(); + mod_pocketDim.transientDoorID=TransientDoorID.getInt(); + mod_pocketDim.dimHatchID=TransTrapdoorID.getInt(); + mod_pocketDim.ExitDoorID=WarpDoorID.getInt(); + mod_pocketDim.blockRiftID=RiftBlockID.getInt(); + mod_pocketDim.DoorRenderID=DoorRenderEntityID.getInt(); + mod_pocketDim.hardcoreLimbo=LimboRespawningEnabled.getBoolean(false); + mod_pocketDim.enableDimTrapDoor=CraftingTransTrapdoorAllowed.getBoolean(true); + mod_pocketDim.enableDoorOpenGL=DoorRenderingEnabled.getBoolean(true); + mod_pocketDim.enableIronDimDoor=CraftingDimensionaDoorAllowed.getBoolean(true); + mod_pocketDim.enableRiftBlade=CraftingRiftBladeAllowed.getBoolean(true); + mod_pocketDim.enableRiftRemover=CraftingRiftBladeAllowed.getBoolean(true); + mod_pocketDim.enableRiftSignature=CraftingRiftSignatureAllowed.getBoolean(true); + mod_pocketDim.enableUnstableDoor=CraftingRiftSignatureAllowed.getBoolean(true); + mod_pocketDim.enableWoodenDimDoor=CraftingWarpDoorAllowed.getBoolean(true); + mod_pocketDim.itemChaosDoorID=UnstableDoorItemID.getInt(); + mod_pocketDim.itemDimDoorID=DimensionalDoorItemID.getInt(); + mod_pocketDim.itemExitDoorID=WarpDoorItemID.getInt(); + mod_pocketDim.itemLinkSignatureID=RiftSignatureItemID.getInt(); + mod_pocketDim.itemRiftBladeID=RiftBladeItemID.getInt(); + mod_pocketDim.itemRiftRemoverID=RiftRemoverItemID.getInt(); + mod_pocketDim.itemStabilizedLinkSignatureID=StabilizedRiftSignatureItemID.getInt(); + mod_pocketDim.itemStableFabricID=StableFabricItemID.getInt(); + mod_pocketDim.obeliskID=MonolithEntityID.getInt(); + mod_pocketDim.limboBiomeID=LimboBiomeID.getInt(); + mod_pocketDim.pocketBiomeID=PocketBiomeID.getInt(); + mod_pocketDim.providerID=PocketProviderID.getInt(); mod_pocketDim.limboProviderID=limboProviderID.getInt(); - mod_pocketDim.limboExitRange=limboReturnRange.getInt(); - mod_pocketDim.TNFREAKINGT=bTNFREAKINGT.getBoolean(false); - mod_pocketDim.riftsInWorldGen=bWorldGenRifts.getBoolean(true); - mod_pocketDim.riftSpreadFactor=riftSpreadModifier.getInt(); - mod_pocketDim.returnInventory=bLimboReturnInventory.getBoolean(true); - mod_pocketDim.HOW_MUCH_TNT=HOWMUCHTNT.getInt(); - mod_pocketDim.limboDimID = limboDimID.getInt(); - mod_pocketDim.isLimboActive= bLimboActive.getBoolean(true); - - -} - - - + mod_pocketDim.limboExitRange=LimboReturnRange.getInt(); + mod_pocketDim.TNFREAKINGT=TNFREAKINGT_Enabled.getBoolean(false); + mod_pocketDim.riftsInWorldGen=WorldRiftGenerationEnabled.getBoolean(true); + mod_pocketDim.riftSpreadFactor=RiftSpreadModifier.getInt(); + mod_pocketDim.returnInventory=LimboReturnsInventoryEnabled.getBoolean(true); + mod_pocketDim.HOW_MUCH_TNT=NonTntRatio.getInt(); + mod_pocketDim.limboDimID = LimboDimensionID.getInt(); + mod_pocketDim.isLimboActive= LimboEnabled.getBoolean(true); + + + } + + + } \ No newline at end of file