diff options
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_ClientPreference.java | 14 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/GT_Config.java | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ClientPreference.java b/src/main/java/gregtech/api/util/GT_ClientPreference.java index 8df4ef8b05..3ea2730a0c 100644 --- a/src/main/java/gregtech/api/util/GT_ClientPreference.java +++ b/src/main/java/gregtech/api/util/GT_ClientPreference.java @@ -1,5 +1,8 @@ package gregtech.api.util; +import gregtech.common.config.client.ConfigPreference; +import gregtech.common.config.client.ConfigWaila; + public class GT_ClientPreference { private final boolean mSingleBlockInitialFilter; @@ -15,12 +18,11 @@ public class GT_ClientPreference { this.wailaAverageNS = wailaAverageNS; } - public GT_ClientPreference(GT_Config aClientDataFile) { - this.mSingleBlockInitialFilter = aClientDataFile.get("preference", "mSingleBlockInitialFilter", false); - this.mSingleBlockInitialMultiStack = aClientDataFile - .get("preference", "mSingleBlockInitialAllowMultiStack", false); - this.mInputBusInitialFilter = aClientDataFile.get("preference", "mInputBusInitialFilter", true); - this.wailaAverageNS = aClientDataFile.get("waila", "WailaAverageNS", false); + public GT_ClientPreference() { + this.mSingleBlockInitialFilter = ConfigPreference.singleBlockInitialFilter; + this.mSingleBlockInitialMultiStack = ConfigPreference.singleBlockInitialAllowMultiStack; + this.mInputBusInitialFilter = ConfigPreference.inputBusInitialFilter; + this.wailaAverageNS = ConfigWaila.wailaAverageNS; } public boolean isSingleBlockInitialFilterEnabled() { diff --git a/src/main/java/gregtech/api/util/GT_Config.java b/src/main/java/gregtech/api/util/GT_Config.java index dc56def68f..e1157febb4 100644 --- a/src/main/java/gregtech/api/util/GT_Config.java +++ b/src/main/java/gregtech/api/util/GT_Config.java @@ -14,6 +14,8 @@ public class GT_Config implements Runnable { public static boolean troll = false; public static Configuration sConfigFileIDs; + public static Configuration cleanroomFile; + public static Configuration undergroundFluidsFile; public final Configuration mConfig; public GT_Config(Configuration aConfig) { @@ -38,7 +40,7 @@ public class GT_Config implements Runnable { aName.replaceAll("\\|", "."), aDefault); int rResult = tProperty.getInt(aDefault); - if (!tProperty.wasRead() && shouldSave()) sConfigFileIDs.save(); + sConfigFileIDs.save(); return rResult; } |