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

Refactor Config class

Browse Source
This commit is contained in:
GeorgH93 2021-05-21 19:45:04 +02:00
parent 7536994e50
commit ca5262bc5b
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Enums.ShrinkApproach;
import at.pcgamingfreaks.Version;
import at.pcgamingfreaks.YamlFileManager;
import at.pcgamingfreaks.YamlFileUpdateMethod;
import org.bukkit.*;
import org.bukkit.plugin.java.JavaPlugin;
@ -38,22 +39,23 @@
import java.io.FileNotFoundException;
import java.util.*;
import java.util.stream.Collectors;
public class Config extends Configuration implements DatabaseConnectionConfiguration, IUnCacheStrategyConfig
{
private static final int CONFIG_VERSION = 36, UPGRADE_THRESHOLD = CONFIG_VERSION, PRE_V2_VERSION = 20;
private static final int CONFIG_VERSION = 36, PRE_V2_VERSION = 20;
public Config(JavaPlugin plugin)
public Config(final @NotNull JavaPlugin plugin)
{
super(plugin, CONFIG_VERSION, UPGRADE_THRESHOLD);
super(plugin, new Version(CONFIG_VERSION));
languageKey = "Language.Language";
languageUpdateKey = "Language.UpdateMode";
}
@Override
protected void doUpdate()
protected @Nullable YamlFileUpdateMethod getYamlUpdateMode()
{
// Nothing to update yet
return YamlFileUpdateMethod.UPGRADE;
}
@Override
@ -244,7 +246,7 @@ public boolean isCommandCooldownAddOnJoinEnabled()
public Collection<GameMode> getAllowedGameModes()
{
Collection<GameMode> gameModes = new HashSet<>();
for(String string : getConfigE().getStringList("AllowedGameModes", new LinkedList<>()))
for(String string : getConfigE().getStringList("AllowedGameModes", new ArrayList<>(0)))
{
GameMode gm = null;
try
@ -329,23 +331,17 @@ public boolean isItemFilterEnabled()
public Collection<MinecraftMaterial> getItemFilterMaterials()
{
if(!isItemFilterEnabledNoShulker()) return new LinkedList<>();
List<String> stringMaterialList = getConfigE().getStringList("ItemFilter.Materials", new LinkedList<>());
if(!isItemFilterEnabledNoShulker()) return new ArrayList<>(0);
List<String> stringMaterialList = getConfigE().getStringList("ItemFilter.Materials", new ArrayList<>(0));
if(isItemFilterModeWhitelist()) stringMaterialList.add("air");
Collection<MinecraftMaterial> blacklist = new LinkedList<>();
for(String item : stringMaterialList)
{
MinecraftMaterial mat = MinecraftMaterial.fromInput(item);
if(mat != null) blacklist.add(mat);
}
return blacklist;
return stringMaterialList.stream().map(MinecraftMaterial::fromInput).filter(Objects::nonNull).collect(Collectors.toList());
}
public Set<String> getItemFilterNames()
{
if(!isItemFilterEnabledNoShulker()) return new HashSet<>();
Set<String> names = new HashSet<>();
getConfigE().getStringList("ItemFilter.Names", new LinkedList<>()).forEach(name -> names.add(ChatColor.translateAlternateColorCodes('&', name)));
getConfigE().getStringList("ItemFilter.Names", new ArrayList<>(0)).forEach(name -> names.add(ChatColor.translateAlternateColorCodes('&', name)));
return names;
}
@ -353,7 +349,7 @@ public Set<String> getItemFilterLore()
{
if(!isItemFilterEnabledNoShulker()) return new HashSet<>();
Set<String> loreSet = new HashSet<>();
getConfigE().getStringList("ItemFilter.Lore", new LinkedList<>()).forEach(lore -> loreSet.add(ChatColor.translateAlternateColorCodes('&', lore)));
getConfigE().getStringList("ItemFilter.Lore", new ArrayList<>(0)).forEach(lore -> loreSet.add(ChatColor.translateAlternateColorCodes('&', lore)));
return loreSet;
}