upstream/ForestryMC
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForestryMC.git synced 2026-11-15 17:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #536 Add additional Flower Configs for each type

Browse Source 
Migrate Apiculture config #507
This commit is contained in:
mezz committed 2015-06-20 23:57:33 -07:00
1 parent 8ef193c8a5
commit 33b010a8fa
4 files changed
+239 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/forestry/plugins/PluginStorage.java
+9 -6
View File
@@ -84,6 +84,7 @@ import forestry.storage.proxy.ProxyStorage;
public class PluginStorage extends ForestryPlugin {
private static final List<ItemCrated> crates = new ArrayList<ItemCrated>();
private static final String CONFIG_CATEGORY = "backpacks";
@SidedProxy(clientSide = "forestry.storage.proxy.ClientProxyStorage", serverSide = "forestry.storage.proxy.ProxyStorage")
public static ProxyStorage proxy;
@@ -145,18 +146,22 @@ public class PluginStorage extends ForestryPlugin {
@Override
public void postInit() {
File configFile = new File(Forestry.instance.getConfigFolder(), "backpacks.cfg");
final String oldConfig = CONFIG_CATEGORY + ".conf";
final String newConfig = CONFIG_CATEGORY + ".cfg";
File configFile = new File(Forestry.instance.getConfigFolder(), newConfig);
if (!configFile.exists()) {
setDefaultsForConfig();
}
File oldConfigFile = new File(Forestry.instance.getConfigFolder(), "backpacks.conf");
File oldConfigFile = new File(Forestry.instance.getConfigFolder(), oldConfig);
if (oldConfigFile.exists()) {
loadOldConfig();
File oldConfigFileRenamed = new File(Forestry.instance.getConfigFolder(), "backpacks.conf.old");
final String oldConfigRenamed = CONFIG_CATEGORY + ".conf.old";
File oldConfigFileRenamed = new File(Forestry.instance.getConfigFolder(), oldConfigRenamed);
if (oldConfigFile.renameTo(oldConfigFileRenamed)) {
Proxies.log.info("Migrated backpack settings to the new file 'backpacks.cfg' and renamed 'backpacks.config' to 'backpacks.conf.old'.");
Proxies.log.info("Migrated " + CONFIG_CATEGORY + " settings to the new file '" + newConfig + "' and renamed '" + oldConfig + "' to '" + oldConfigRenamed + "'.");
}
}
@@ -208,8 +213,6 @@ public class PluginStorage extends ForestryPlugin {
final forestry.core.config.Configuration config = new forestry.core.config.Configuration();
final String CONFIG_CATEGORY = "backpacks";
forestry.core.config.Property backpackConf = config.get("backpacks.miner.items", CONFIG_CATEGORY, "");
backpackConf.comment = "add additional blocks and items for the miner's backpack here in the format modid:name:meta. separate blocks and items using ';'. wildcard for metadata: '*'";
old_parseBackpackItems(backpackConf.value, BackpackManager.definitions.get("miner"));