EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 06:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Removing dead symbols from ConfigManager

Browse Source
This commit is contained in:
nossr50 2019-09-20 15:54:38 -07:00
parent 7c0d1f4e0a
commit 396926d970
3 changed files with 71 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
src/main/java/com/gmail/nossr50/config/ConfigConstants.java
View File

@ -40,72 +40,72 @@ public class ConfigConstants {
EXAMPLE_BLACKLIST_WORLDS_LIST_DEFAULT.add(EXAMPLE_BLACKLIST_WORLDS[2]);
}
/**
* Return the data folder for mcMMO
*
* @return the File for the data folder used by mcMMO
*/
public static File getDataFolder() {
return pluginRef.getDataFolder();
}
public static File getConfigFolder() {
return new File(getDataFolder(), FOLDER_NAME_CONFIG);
}
public static File getDefaultsFolder() {
return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_DEFAULTS);
}
public static File getDefaultsConfigFolder() {
return new File(getDefaultsFolder().getAbsolutePath(), FOLDER_NAME_CONFIG);
}
public static File getDefaultsSkillFolder() {
return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS);
}
public static File getDefaultsXPFolder() {
return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE);
}
public static File getConfigSkillFolder() {
return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS);
}
public static File getConfigXPFolder() {
return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE);
}
/**
* Creates all directories used by mcMMO config files
*/
public static void makeAllConfigDirectories() {
/* CONFIG DIRECTORY */
if (!getConfigFolder().exists())
getConfigFolder().mkdirs();
/* DEFAULT DIRECTORIES */
if (!getDefaultsFolder().exists())
getDefaultsFolder().mkdirs();
if (!getDefaultsConfigFolder().exists())
getDefaultsConfigFolder().mkdirs();
if (!getDefaultsSkillFolder().exists())
getDefaultsSkillFolder().mkdirs();
if (!getDefaultsXPFolder().exists())
getDefaultsXPFolder().mkdirs();
/* CONFIG SUBDIRECTORIES */
if (!getConfigSkillFolder().exists())
getConfigSkillFolder().mkdirs();
if (!getConfigXPFolder().exists())
getConfigXPFolder().mkdirs();
}
// /**
// * Return the data folder for mcMMO
// *
// * @return the File for the data folder used by mcMMO
// */
// public static File getDataFolder() {
// return pluginRef.getDataFolder();
// }
//
// public static File getConfigFolder() {
// return new File(getDataFolder(), FOLDER_NAME_CONFIG);
// }
//
// public static File getDefaultsFolder() {
// return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_DEFAULTS);
// }
//
// public static File getDefaultsConfigFolder() {
// return new File(getDefaultsFolder().getAbsolutePath(), FOLDER_NAME_CONFIG);
// }
//
// public static File getDefaultsSkillFolder() {
// return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS);
// }
//
// public static File getDefaultsXPFolder() {
// return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE);
// }
//
// public static File getConfigSkillFolder() {
// return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS);
// }
//
// public static File getConfigXPFolder() {
// return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE);
// }
//
// /**
// * Creates all directories used by mcMMO config files
// */
// public static void makeAllConfigDirectories() {
// /* CONFIG DIRECTORY */
//
// if (!getConfigFolder().exists())
// getConfigFolder().mkdirs();
//
// /* DEFAULT DIRECTORIES */
//
// if (!getDefaultsFolder().exists())
// getDefaultsFolder().mkdirs();
//
// if (!getDefaultsConfigFolder().exists())
// getDefaultsConfigFolder().mkdirs();
//
// if (!getDefaultsSkillFolder().exists())
// getDefaultsSkillFolder().mkdirs();
//
// if (!getDefaultsXPFolder().exists())
// getDefaultsXPFolder().mkdirs();
//
// /* CONFIG SUBDIRECTORIES */
//
// if (!getConfigSkillFolder().exists())
// getConfigSkillFolder().mkdirs();
//
// if (!getConfigXPFolder().exists())
// getConfigXPFolder().mkdirs();
// }
}

35
src/main/java/com/gmail/nossr50/config/ConfigManager.java
View File

@ -47,9 +47,6 @@ import com.gmail.nossr50.config.hocon.sound.ConfigSound;
import com.gmail.nossr50.config.hocon.sound.SoundSetting;
import com.gmail.nossr50.config.hocon.superabilities.ConfigSuperAbilities;
import com.gmail.nossr50.config.hocon.worldblacklist.ConfigWorldBlacklist;
import com.gmail.nossr50.config.treasure.ExcavationTreasureConfig;
import com.gmail.nossr50.config.treasure.FishingTreasureConfig;
import com.gmail.nossr50.config.treasure.HerbalismTreasureConfig;
import com.gmail.nossr50.datatypes.experience.CustomXPPerk;
import com.gmail.nossr50.datatypes.experience.FormulaType;
import com.gmail.nossr50.datatypes.items.ItemMatch;
@ -140,18 +137,6 @@ public final class ConfigManager {
//Data
private SerializedConfigLoader<ConfigPartyData> partyData;
//YAML CONFIGS
private MainConfig mainConfig;
private FishingTreasureConfig fishingTreasureConfig;
private ExcavationTreasureConfig excavationTreasureConfig;
private HerbalismTreasureConfig herbalismTreasureConfig;
private AdvancedConfig advancedConfig;
/* CONFIG ERRORS */
private ArrayList<String> configErrors; //Collect errors to whine about to server admins
public ConfigManager(mcMMO pluginRef) {
this.pluginRef = pluginRef;
userFiles = new ArrayList<>();
@ -341,26 +326,6 @@ public final class ConfigManager {
return userFiles;
}
public MainConfig getMainConfig() {
return mainConfig;
}
public FishingTreasureConfig getFishingTreasureConfig() {
return fishingTreasureConfig;
}
public ExcavationTreasureConfig getExcavationTreasureConfig() {
return excavationTreasureConfig;
}
public HerbalismTreasureConfig getHerbalismTreasureConfig() {
return herbalismTreasureConfig;
}
public AdvancedConfig getAdvancedConfig() {
return advancedConfig;
}
public ConfigCoreSkills getConfigCoreSkills() {
return configCoreSkills.getConfig();
}

3
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -197,6 +197,9 @@ public class FishingManager extends SkillManager {
public double getShakeChance() {
return AdvancedConfig.getInstance().getShakeChance(getLootTier());
}
public double getShakeChance() {
return pluginRef.getConfigManager().getFishingTreasureConfig().getShakeChance(getLootTier());
}
public int getInnerPeaceMultiplier() {
return pluginRef.getConfigManager().getConfigFishing().getVanillaXPMultInnerPeace(pluginRef.getRankTools().getRank(getPlayer(), SubSkillType.FISHING_INNER_PEACE));