Upstream/Brewery
1
0
Fork 1
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2024-12-01 13:03:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

change loadLore() to a more generic loadQualityStringList()

Browse Source
This commit is contained in:
Sebi 2020-05-08 12:17:58 +02:00
parent 5cc7116aee
commit d3da0dbe14
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/dre/brewery/recipe/BCauldronRecipe.java
View File

@ -79,7 +79,7 @@ public class BCauldronRecipe {
} }
List<Tuple<Integer,String>> lore = BRecipe.loadLore(cfg, id + ".lore"); List<Tuple<Integer,String>> lore = BRecipe.loadQualityStringList(cfg, id + ".lore");
if (lore != null && !lore.isEmpty()) { if (lore != null && !lore.isEmpty()) {
recipe.lore = lore.stream().map(Tuple::second).collect(Collectors.toList()); recipe.lore = lore.stream().map(Tuple::second).collect(Collectors.toList());
} }

13
src/com/dre/brewery/recipe/BRecipe.java
View File

@ -127,7 +127,7 @@ public class BRecipe {
return null; return null;
} }
recipe.lore = loadLore(configSectionRecipes, recipeId + ".lore"); recipe.lore = loadQualityStringList(configSectionRecipes, recipeId + ".lore");
recipe.servercmds = BUtil.loadCfgStringList(configSectionRecipes, recipeId + ".servercommands"); recipe.servercmds = BUtil.loadCfgStringList(configSectionRecipes, recipeId + ".servercommands");
recipe.playercmds = BUtil.loadCfgStringList(configSectionRecipes, recipeId + ".playercommands"); recipe.playercmds = BUtil.loadCfgStringList(configSectionRecipes, recipeId + ".playercommands");
@ -307,11 +307,14 @@ public class BRecipe {
return ingredients; return ingredients;
} }
/**
* Load a list of strings from a ConfigurationSection and parse preceded pluses.
*/
@Nullable @Nullable
public static List<Tuple<Integer, String>> loadLore(ConfigurationSection cfg, String path) { public static List<Tuple<Integer, String>> loadQualityStringList(ConfigurationSection cfg, String path) {
List<String> load = BUtil.loadCfgStringList(cfg, path); List<String> load = BUtil.loadCfgStringList(cfg, path);
if (load != null) { if (load != null) {
List<Tuple<Integer, String>> lore = new ArrayList<>(load.size()); List<Tuple<Integer, String>> list = new ArrayList<>(load.size());
for (String line : load) { for (String line : load) {
line = P.p.color(line); line = P.p.color(line);
int plus = 0; int plus = 0;
@ -331,9 +334,9 @@ public class BRecipe {
if (!line.startsWith("§")) { if (!line.startsWith("§")) {
line = "§9" + line; line = "§9" + line;
} }
lore.add(new Tuple<>(plus, line)); list.add(new Tuple<>(plus, line));
} }
return lore; return list;
} }
return null; return null;
} }