Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2024-12-04 14:03:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve backpack style loading readability

Browse Source
This commit is contained in:
GeorgH93 2021-07-18 20:31:09 +02:00
parent 95bd2a2710
commit 4143aa6dbe
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/BackpacksConfig.java
View File

@ -92,7 +92,7 @@ public void loadData()
backpackStylesMap.clear();
buttonConfigMap.clear();
controlLayoutsMap.clear();
loadItemConfigs();
loadBackpackStyles();
loadButtonConfigs();
ButtonConfig btConf = buttonConfigMap.get(getConfigE().getString("Defaults.BlockedSlots", "Blocked"));
if(btConf != null)
@ -108,26 +108,9 @@ public void loadData()
defaultControlLayout = getConfigE().getString("Defaults.ControlLayout", "None");
if(!controlLayoutsMap.containsKey(defaultControlLayout))
{
getLogger().warning("Default control layout '" + defaultControlLayout + "' is not defined! Disabling controls by default.");
controlLayoutsMap.put(defaultControlLayout, new ButtonConfig[0]);
}
if(backpackStylesMap.isEmpty())
{
logger.warning("There musst be at least one item defined to use the items feature!");
allowItemShortcut = false;
return;
}
validShortcutStyles = backpackStylesMap.keySet();
if(!backpackStylesMap.containsKey(MagicValues.BACKPACK_STYLE_NAME_DEFAULT))
{
String defaultBackpackItemName = getString("Defaults.BackpackItem", "unknown");
if(!backpackStylesMap.containsKey(defaultBackpackItemName))
{
String tmp = validShortcutStyles.iterator().next();
logger.warning("Unknown default backpack item '" + defaultBackpackItemName + "'. Using '" + tmp + "' instead.");
defaultBackpackItemName = tmp;
}
backpackStylesMap.put(MagicValues.BACKPACK_STYLE_NAME_DEFAULT, new ItemConfig(MagicValues.BACKPACK_STYLE_NAME_DEFAULT, backpackStylesMap.get(defaultBackpackItemName)));
}
}
private void loadControlLayouts()
@ -175,8 +158,9 @@ private void loadButtonConfigs()
}
private void loadItemConfigs()
private void loadBackpackStyles()
{
backpackStylesMap.clear();
getYamlE().getKeysFiltered("Items\\.[^.]*\\.Material").forEach(materialKey -> {
final String key = materialKey.substring(0, materialKey.length() - ".Material".length());
if(!getConfigE().getBoolean(key + ".Enabled", true)) return;
@ -187,6 +171,26 @@ private void loadItemConfigs()
backpackStylesMap.put(itemConfig.getName(), itemConfig);
}
});
if(backpackStylesMap.isEmpty())
{
logger.warning("There musst be at least one item defined to use the items feature!");
allowItemShortcut = false;
}
else
{
validShortcutStyles = backpackStylesMap.keySet();
if(!backpackStylesMap.containsKey(MagicValues.BACKPACK_STYLE_NAME_DEFAULT))
{
String defaultBackpackItemName = getString("Defaults.BackpackItem", "unknown");
if(!backpackStylesMap.containsKey(defaultBackpackItemName))
{
String tmp = validShortcutStyles.iterator().next();
logger.warning("Unknown default backpack item '" + defaultBackpackItemName + "'. Using '" + tmp + "' instead.");
defaultBackpackItemName = tmp;
}
backpackStylesMap.put(MagicValues.BACKPACK_STYLE_NAME_DEFAULT, new ItemConfig(MagicValues.BACKPACK_STYLE_NAME_DEFAULT, backpackStylesMap.get(defaultBackpackItemName)));
}
}
}
private @NotNull String translateItemText(@NotNull String text)