Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2025-02-26 03:21:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup Config.java

Browse Source
This commit is contained in:
GeorgH93 2021-07-25 11:50:22 +02:00
parent 6acf33cca1
commit 0bba99f1da
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java
View File

@ -43,6 +43,7 @@
import java.io.FileNotFoundException;
import java.util.*;
import java.util.logging.Level;
import java.util.stream.Collectors;
public class Config extends Configuration implements DatabaseConnectionConfiguration, IUnCacheStrategyConfig, ILanguageConfiguration
@ -171,7 +172,7 @@ public boolean getUseUUIDSeparators()
public String getBPTitleOther()
{
return ChatColor.translateAlternateColorCodes('&', getConfigE().getString("BackpackTitleOther", "{OwnerName} Backpack").replaceAll("%", "%%").replaceAll("\\{OwnerName}", "%s"));
return ChatColor.translateAlternateColorCodes('&', getConfigE().getString("BackpackTitleOther", "{OwnerName} Backpack").replace("%", "%%").replace("{OwnerName}", "%s"));
}
public String getBPTitle()
@ -228,7 +229,10 @@ public String getUpdateChannel()
{
return channel;
}
else logger.info("Unknown update Channel: " + channel);
else
{
logger.log(Level.INFO, "Unknown update Channel: {0}", channel);
}
return null;
}
@ -291,9 +295,9 @@ public Collection<GameMode> getAllowedGameModes()
gameModes.add(gm);
}
}
if(gameModes.size() < 1)
if(gameModes.isEmpty())
{
logger.info("No game-mode's allowed, allowing: " + GameMode.SURVIVAL.name());
logger.log(Level.INFO, "No game-mode's allowed, allowing: {0}", GameMode.SURVIVAL);
gameModes.add(GameMode.SURVIVAL);
}
return gameModes;
@ -332,14 +336,19 @@ public boolean isShulkerboxesDisable()
return MCVersion.isNewerOrEqualThan(MCVersion.MC_1_11) && getConfigE().getBoolean("Shulkerboxes.DisableShulkerboxes", false);
}
private String getShulkerboxesExisting()
{
return getConfigE().getString("Shulkerboxes.Existing", "Ignore");
}
public boolean isShulkerboxesExistingDropEnabled()
{
return getConfigE().getString("Shulkerboxes.Existing", "Ignore").equalsIgnoreCase("Destroy");
return getShulkerboxesExisting().equalsIgnoreCase("Destroy");
}
public boolean isShulkerboxesExistingDestroyEnabled()
{
return getConfigE().getString("Shulkerboxes.Existing", "Ignore").equalsIgnoreCase("Destroy") || getConfigE().getString("Shulkerboxes.Existing", "Ignore").equalsIgnoreCase("Remove");
return getShulkerboxesExisting().equalsIgnoreCase("Destroy") || getShulkerboxesExisting().equalsIgnoreCase("Remove");
}
//endregion
@ -488,12 +497,18 @@ public boolean isItemShortcutPlayerDisableItemEnabled()
public @Nullable Sound getOpenSound()
{
return getSound("OpenSound", MCVersion.isNewerOrEqualThan(MCVersion.MC_1_11) ? "BLOCK_SHULKER_BOX_OPEN" : (MCVersion.isNewerOrEqualThan(MCVersion.MC_1_9_2) ? "BLOCK_CHEST_OPEN" : "CHEST_OPEN"));
String defaultSound = "CHEST_OPEN";
if (MCVersion.isNewerOrEqualThan(MCVersion.MC_1_11)) defaultSound = "BLOCK_SHULKER_BOX_OPEN";
else if (MCVersion.isNewerOrEqualThan(MCVersion.MC_1_9_2)) defaultSound = "BLOCK_CHEST_OPEN";
return getSound("OpenSound", defaultSound);
}
public @Nullable Sound getCloseSound()
{
return getSound("CloseSound", MCVersion.isNewerOrEqualThan(MCVersion.MC_1_11) ? "BLOCK_SHULKER_BOX_CLOSE" : (MCVersion.isNewerOrEqualThan(MCVersion.MC_1_9_2) ? "BLOCK_CHEST_CLOSE" : "CHEST_CLOSE"));
String defaultSound = "CHEST_CLOSE";
if (MCVersion.isNewerOrEqualThan(MCVersion.MC_1_11)) defaultSound = "BLOCK_SHULKER_BOX_CLOSE";
else if (MCVersion.isNewerOrEqualThan(MCVersion.MC_1_9_2)) defaultSound = "BLOCK_CHEST_CLOSE";
return getSound("CloseSound", defaultSound);
}
public @Nullable Sound getAutoCollectSound()