EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-01 13:14:44 +02:00
Code Issues Projects Releases Wiki Activity

Wire up party config pt 4

Browse Source
This commit is contained in:
nossr50
2019-03-17 04:24:32 -07:00
parent 8a6ed2f076
commit 80df1dd4bd
13 changed files with 36 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@ import com.gmail.nossr50.config.hocon.playerleveling.ConfigLeveling;
import com.gmail.nossr50.config.hocon.scoreboard.ConfigScoreboard;
import com.gmail.nossr50.config.hocon.superabilities.ConfigSuperAbilities;
import com.gmail.nossr50.config.hocon.worldblacklist.ConfigWorldBlacklist;
import com.gmail.nossr50.config.party.ItemWeightConfig;
import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
import com.gmail.nossr50.config.treasure.ExcavationTreasureConfig;
import com.gmail.nossr50.config.treasure.FishingTreasureConfig;
@ -114,7 +113,6 @@ public final class ConfigManager {
private CoreSkillsConfig coreSkillsConfig;
private SoundConfig soundConfig;
private RankConfig rankConfig;
private ItemWeightConfig itemWeightConfig;
private RepairConfig repairConfig;
private SalvageConfig salvageConfig;
@ -190,8 +188,6 @@ public final class ConfigManager {
rankConfig = new RankConfig();
itemWeightConfig = new ItemWeightConfig();
repairConfig = new RepairConfig();
salvageConfig = new SalvageConfig();
@ -356,10 +352,6 @@ public final class ConfigManager {
return experienceConfig;
}
public ItemWeightConfig getItemWeightConfig() {
return itemWeightConfig;
}
public ExperienceMapManager getExperienceMapManager() {
return experienceMapManager;
}

47
src/main/java/com/gmail/nossr50/config/MainConfig.java
View File

@ -446,30 +446,10 @@ public class MainConfig extends ConfigValidated {
return getBooleanValue(GENERAL, SHOW_PROFILE_LOADED);
}
public boolean getDonateMessageEnabled() {
return getBooleanValue(COMMANDS, MCMMO, DONATE_MESSAGE);
}
public int getSaveInterval() {
return getIntValue(GENERAL, SAVE_INTERVAL);
}
public String getPartyChatPrefix() {
return getStringValue(COMMANDS, PARTYCHAT, CHAT_PREFIX_FORMAT);
}
public boolean getPartyChatColorLeaderName() {
return getBooleanValue(COMMANDS, PARTYCHAT, GOLD_LEADER_NAME);
}
public boolean getPartyDisplayNames() {
return getBooleanValue(COMMANDS, PARTYCHAT, USE_DISPLAY_NAMES);
}
public String getPartyChatPrefixAlly() {
return getStringValue(COMMANDS, PARTYCHAT, CHAT_PREFIX_FORMAT + ALLY);
}
public String getAdminChatPrefix() {
return getStringValue(COMMANDS, ADMINCHAT, CHAT_PREFIX_FORMAT);
}
@ -694,33 +674,6 @@ public class MainConfig extends ConfigValidated {
return getBooleanValue(PARTICLES, LARGE_FIREWORKS);
}
/* PARTY SETTINGS */
/* Party Teleport Settings */
public int getPTPCommandCooldown() {
return getIntValue(COMMANDS, PTP, COOLDOWN);
}
public int getPTPCommandWarmup() {
return getIntValue(COMMANDS, PTP, WARMUP);
}
public int getPTPCommandRecentlyHurtCooldown() {
return getIntValue(COMMANDS, PTP, RECENTLY_HURT + COOLDOWN);
}
public int getPTPCommandTimeout() {
return getIntValue(COMMANDS, PTP, REQUEST_TIMEOUT);
}
public boolean getPTPCommandConfirmRequired() {
return getBooleanValue(COMMANDS, PTP, ACCEPT_REQUIRED);
}
public boolean getPTPCommandWorldPermissions() {
return getBooleanValue(COMMANDS, PTP, WORLD_BASED_PERMISSIONS);
}
/* Inspect command distance */
public double getInspectDistance() {
return getDoubleValue(COMMANDS, INSPECT1, MAX_DISTANCE);

8
src/main/java/com/gmail/nossr50/config/hocon/party/ConfigParty.java
View File

@ -39,6 +39,10 @@ public class ConfigParty {
return partyGeneral.isPartySizeCapped();
}
public ConfigSectionPartyTeleportCommand getPTP() {
return partyCommands.getPartyTeleportCommand();
}
public ConfigSectionPartyCleanup getPartyCleanup() {
return partyCleanup;
}
@ -63,6 +67,10 @@ public class ConfigParty {
return partyItemShare;
}
public ConfigSectionPartyCommands getPartyCommands() {
return partyCommands;
}
public String getPartyChatPrefixFormat() {
return partyChat.getPartyChatPrefixFormat();
}

82
src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java
View File

@ -1,82 +0,0 @@
package com.gmail.nossr50.config.party;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.ConfigConstants;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.StringUtils;
import ninja.leaping.configurate.objectmapping.ObjectMappingException;
import org.bukkit.Material;
import java.util.HashSet;
public class ItemWeightConfig extends Config {
public static final String ITEM_WEIGHTS = "Item_Weights";
public static final String DEFAULT = "Default";
public static final String PARTY_SHAREABLES = "Party_Shareables";
public static final String MISC_ITEMS = "Misc_Items";
public ItemWeightConfig() {
//super(McmmoCore.getDataFolderPath().getAbsoluteFile(), "itemweights.yml");
super("itemweights", mcMMO.p.getDataFolder().getAbsoluteFile(), ConfigConstants.RELATIVE_PATH_CONFIG_DIR, true, true, true, false);
}
/**
* This grabs an instance of this config class from the Config Manager
* This method is deprecated and will be removed in the future
* @see mcMMO#getConfigManager()
* @return the instance of this config
* @deprecated Please use mcMMO.getConfigManager() to grab a specific config instead
*/
@Deprecated
public static ItemWeightConfig getInstance() {
return mcMMO.getConfigManager().getItemWeightConfig();
}
@Override
public void unload() {
//do nothing
}
/**
* The version of this config
*
* @return
*/
@Override
public double getConfigVersion() {
return 1;
}
/*public static ItemWeightConfig getInstance() {
if (instance == null) {
instance = new ItemWeightConfig();
}
return instance;
}*/
public int getItemWeight(Material material) {
String[] keyPath = {ITEM_WEIGHTS, StringUtils.getPrettyItemString(material).replace(" ", "_")};
if(hasNode(keyPath))
return getIntValue(keyPath);
else
return getIntValue(ITEM_WEIGHTS, DEFAULT);
}
public HashSet<Material> getMiscItems() {
HashSet<Material> miscItems = new HashSet<Material>();
try {
for (String item : getListFromNode(PARTY_SHAREABLES, MISC_ITEMS)) {
Material material = Material.getMaterial(item.toUpperCase());
if (material != null) {
miscItems.add(material);
}
}
} catch (ObjectMappingException e) {
e.printStackTrace();
}
return miscItems;
}
}