From 999dd58ae538db5569b6b2b77a2ad3bc52db2062 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Tue, 9 Sep 2014 00:15:48 -0400 Subject: [PATCH] Config respects storage upgrade multipliers --- .../assets/storagedrawers/lang/en_US.lang | 6 ++++ .../block/tile/TileEntityDrawers.java | 5 +++- .../storagedrawers/config/ConfigManager.java | 29 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/resources/assets/storagedrawers/lang/en_US.lang b/resources/assets/storagedrawers/lang/en_US.lang index 054a634..dc88fe0 100644 --- a/resources/assets/storagedrawers/lang/en_US.lang +++ b/resources/assets/storagedrawers/lang/en_US.lang @@ -61,6 +61,12 @@ storageDrawers.config.blocks.halfDrawers4=Compact Drawers 2x2 storageDrawers.config.upgrades=Upgrade Settings storageDrawers.config.upgrades.tooltip=Configure individual storage upgrades. +storageDrawers.config.upgrades.level2Mult=Storage Multiplier (II) +storageDrawers.config.upgrades.level3Mult=Storage Multiplier (III) +storageDrawers.config.upgrades.level4Mult=Storage Multiplier (IV) +storageDrawers.config.upgrades.level5Mult=Storage Multiplier (V) +storageDrawers.config.upgrades.level6Mult=Storage Multiplier (VI) + storageDrawers.config.prop.itemRenderType=Item Render Type storageDrawers.config.prop.itemRenderType.tooltip=Render items in 3D or flat. storageDrawers.config.prop.enabled=Enabled diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index 4430a33..740e609 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -1,5 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; @@ -95,7 +97,8 @@ public class TileEntityDrawers extends TileEntity implements ISidedInventory } public int stackCapacity () { - return level * drawerCapacity; + ConfigManager config = StorageDrawers.config; + return config.getStorageUpgradeMultiplier(level) * drawerCapacity; } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java b/src/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java index 09ee18c..69f2e8c 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java +++ b/src/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java @@ -50,9 +50,18 @@ public class ConfigManager } } + private class ConfigCache { + public int level2Mult; + public int level3Mult; + public int level4Mult; + public int level5Mult; + public int level6Mult; + } + private static final String LANG_PREFIX = "storageDrawers.config."; private final Configuration config; + private final ConfigCache cache; public final List sections = new ArrayList(); public final ConfigSection sectionGeneral = new ConfigSection(sections, "general", "general"); @@ -69,8 +78,11 @@ public class ConfigManager private Property itemRenderType; + + public ConfigManager (File file) { config = new Configuration(file); + cache = new ConfigCache(); for (ConfigSection section : sections) section.getCategory(); @@ -99,6 +111,12 @@ public class ConfigManager config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "enabled", true).setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "baseStorage", 2).setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); + cache.level2Mult = config.get(sectionUpgrades.getQualifiedName(), "level2Mult", 2).setLanguageKey(LANG_PREFIX + "upgrades.level2Mult").setRequiresWorldRestart(true).getInt(); + cache.level3Mult = config.get(sectionUpgrades.getQualifiedName(), "level3Mult", 3).setLanguageKey(LANG_PREFIX + "upgrades.level3Mult").setRequiresWorldRestart(true).getInt(); + cache.level4Mult = config.get(sectionUpgrades.getQualifiedName(), "level4Mult", 5).setLanguageKey(LANG_PREFIX + "upgrades.level4Mult").setRequiresWorldRestart(true).getInt(); + cache.level5Mult = config.get(sectionUpgrades.getQualifiedName(), "level5Mult", 8).setLanguageKey(LANG_PREFIX + "upgrades.level5Mult").setRequiresWorldRestart(true).getInt(); + cache.level6Mult = config.get(sectionUpgrades.getQualifiedName(), "level6Mult", 13).setLanguageKey(LANG_PREFIX + "upgrades.level6Mult").setRequiresWorldRestart(true).getInt(); + if (config.hasChanged()) config.save(); } @@ -128,4 +146,15 @@ public class ConfigManager ConfigSection section = blockSectionsMap.get(blockName); return section.getCategory().get("baseStorage").getInt(); } + + public int getStorageUpgradeMultiplier (int level) { + switch (level) { + case 2: return cache.level2Mult; + case 3: return cache.level3Mult; + case 4: return cache.level4Mult; + case 5: return cache.level5Mult; + case 6: return cache.level6Mult; + default: return 1; + } + } }