Sonar Cloud code smell clean up (#278)
This commit is contained in:
tastybento
GitHub
parent
a493c12f6e
commit
0cdb15403b
|
|
@ -36,8 +36,8 @@ import world.bentobox.level.config.BlockConfig;
|
|||
import world.bentobox.level.config.ConfigSettings;
|
||||
import world.bentobox.level.listeners.IslandActivitiesListeners;
|
||||
import world.bentobox.level.listeners.JoinLeaveListener;
|
||||
import world.bentobox.level.objects.IslandLevels;
|
||||
import world.bentobox.level.listeners.MigrationListener;
|
||||
import world.bentobox.level.objects.IslandLevels;
|
||||
import world.bentobox.level.objects.LevelsData;
|
||||
import world.bentobox.level.objects.TopTenData;
|
||||
import world.bentobox.level.requests.LevelRequestHandler;
|
||||
|
|
@ -176,20 +176,14 @@ public class Level extends Addon {
|
|||
{
|
||||
this.visitHook = (VisitAddon) addon;
|
||||
this.log("Level Addon hooked into Visit addon.");
|
||||
}, () ->
|
||||
{
|
||||
this.visitHook = null;
|
||||
});
|
||||
}, () -> this.visitHook = null);
|
||||
|
||||
// Try to find Warps addon and if it does not exist, display a warning
|
||||
this.getAddonByName("Warps").ifPresentOrElse(addon ->
|
||||
{
|
||||
this.warpHook = (Warp) addon;
|
||||
this.log("Level Addon hooked into Warps addon.");
|
||||
}, () ->
|
||||
{
|
||||
this.warpHook = null;
|
||||
});
|
||||
}, () -> this.warpHook = null);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -478,7 +472,7 @@ public class Level extends Addon {
|
|||
* @param playerUUID - the target island member's UUID
|
||||
* @deprecated Do not use this anymore. Use getManager().calculateLevel(playerUUID, island)
|
||||
*/
|
||||
@Deprecated
|
||||
@Deprecated(since="2.3.0", forRemoval=true)
|
||||
public void calculateIslandLevel(World world, @Nullable User user, @NonNull UUID playerUUID) {
|
||||
Island island = getIslands().getIsland(world, playerUUID);
|
||||
if (island != null) getManager().calculateLevel(playerUUID, island);
|
||||
|
|
@ -490,7 +484,7 @@ public class Level extends Addon {
|
|||
* @return LevelsData object or null if not found. Only island levels are set!
|
||||
* @deprecated Do not use this anymore. Use {@link #getIslandLevel(World, UUID)}
|
||||
*/
|
||||
@Deprecated
|
||||
@Deprecated(since="2.3.0", forRemoval=true)
|
||||
public LevelsData getLevelsData(UUID targetPlayer) {
|
||||
LevelsData ld = new LevelsData(targetPlayer);
|
||||
getPlugin().getAddonsManager().getGameModeAddons().stream()
|
||||
|
|
|
|||
|
|
@ -152,8 +152,6 @@ public class LevelsManager {
|
|||
addon.getPipeliner().addIsland(island).thenAccept(r -> {
|
||||
// Results are irrelevant because the island is unowned or deleted, or IslandLevelCalcEvent is cancelled
|
||||
if (r == null || fireIslandLevelCalcEvent(targetPlayer, island, r)) {
|
||||
System.out.println("results are null or event canceled");
|
||||
|
||||
result.complete(null);
|
||||
}
|
||||
// Save result
|
||||
|
|
@ -337,7 +335,7 @@ public class LevelsManager {
|
|||
.filter(e -> addon.getIslands().isOwner(world, e.getKey()))
|
||||
.filter(l -> l.getValue() > 0)
|
||||
.sorted(Collections.reverseOrder(Map.Entry.comparingByValue()));
|
||||
return stream.takeWhile(x -> !x.getKey().equals(uuid)).map(Map.Entry::getKey).collect(Collectors.toList()).size() + 1;
|
||||
return (int) (stream.takeWhile(x -> !x.getKey().equals(uuid)).map(Map.Entry::getKey).count() + 1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -363,10 +361,7 @@ public class LevelsManager {
|
|||
addon.getIslands().getIslandById(il.getUniqueId()).ifPresent(i -> this.addToTopTen(i, il.getLevel()));
|
||||
}
|
||||
});
|
||||
topTenLists.keySet().forEach(w -> {
|
||||
addon.log("Generated rankings for " + w.getName());
|
||||
});
|
||||
|
||||
topTenLists.keySet().forEach(w -> addon.log("Generated rankings for " + w.getName()));
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
package world.bentobox.level.calculators;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
|
@ -65,9 +65,10 @@ public class IslandLevelCalculator {
|
|||
* @param str - equation to evaluate
|
||||
* @return value of equation
|
||||
*/
|
||||
private static double eval(final String str) {
|
||||
private static double eval(final String str) throws IOException {
|
||||
return new Object() {
|
||||
int pos = -1, ch;
|
||||
int pos = -1;
|
||||
int ch;
|
||||
|
||||
boolean eat(int charToEat) {
|
||||
while (ch == ' ') nextChar();
|
||||
|
|
@ -82,10 +83,10 @@ public class IslandLevelCalculator {
|
|||
ch = (++pos < str.length()) ? str.charAt(pos) : -1;
|
||||
}
|
||||
|
||||
double parse() {
|
||||
double parse() throws IOException {
|
||||
nextChar();
|
||||
double x = parseExpression();
|
||||
if (pos < str.length()) throw new RuntimeException("Unexpected: " + (char)ch);
|
||||
if (pos < str.length()) throw new IOException("Unexpected: " + (char)ch);
|
||||
return x;
|
||||
}
|
||||
|
||||
|
|
@ -95,7 +96,7 @@ public class IslandLevelCalculator {
|
|||
// factor = `+` factor | `-` factor | `(` expression `)`
|
||||
// | number | functionName factor | factor `^` factor
|
||||
|
||||
double parseExpression() {
|
||||
double parseExpression() throws IOException {
|
||||
double x = parseTerm();
|
||||
for (;;) {
|
||||
if (eat('+')) x += parseTerm(); // addition
|
||||
|
|
@ -104,7 +105,7 @@ public class IslandLevelCalculator {
|
|||
}
|
||||
}
|
||||
|
||||
double parseFactor() {
|
||||
double parseFactor() throws IOException {
|
||||
if (eat('+')) return parseFactor(); // unary plus
|
||||
if (eat('-')) return -parseFactor(); // unary minus
|
||||
|
||||
|
|
@ -137,10 +138,10 @@ public class IslandLevelCalculator {
|
|||
x = Math.log(x);
|
||||
break;
|
||||
default:
|
||||
throw new RuntimeException("Unknown function: " + func);
|
||||
throw new IOException("Unknown function: " + func);
|
||||
}
|
||||
} else {
|
||||
throw new RuntimeException("Unexpected: " + (char)ch);
|
||||
throw new IOException("Unexpected: " + (char)ch);
|
||||
}
|
||||
|
||||
if (eat('^')) x = Math.pow(x, parseFactor()); // exponentiation
|
||||
|
|
@ -148,7 +149,7 @@ public class IslandLevelCalculator {
|
|||
return x;
|
||||
}
|
||||
|
||||
double parseTerm() {
|
||||
double parseTerm() throws IOException {
|
||||
double x = parseFactor();
|
||||
for (;;) {
|
||||
if (eat('*')) x *= parseFactor(); // multiplication
|
||||
|
|
@ -161,7 +162,7 @@ public class IslandLevelCalculator {
|
|||
private final Level addon;
|
||||
private final Queue<Pair<Integer, Integer>> chunksToCheck;
|
||||
private final Island island;
|
||||
private final HashMap<Material, Integer> limitCount;
|
||||
private final Map<Material, Integer> limitCount;
|
||||
private final CompletableFuture<Results> r;
|
||||
|
||||
|
||||
|
|
@ -190,7 +191,7 @@ public class IslandLevelCalculator {
|
|||
results = new Results();
|
||||
duration = System.currentTimeMillis();
|
||||
chunksToCheck = getChunksToScan(island);
|
||||
this.limitCount = new HashMap<>(addon.getBlockConfig().getBlockLimits());
|
||||
this.limitCount = new EnumMap<>(addon.getBlockConfig().getBlockLimits());
|
||||
// Get the initial island level
|
||||
results.initialLevel.set(addon.getInitialIslandLevel(island));
|
||||
// Set up the worlds
|
||||
|
|
@ -221,7 +222,15 @@ public class IslandLevelCalculator {
|
|||
private long calculateLevel(long blockAndDeathPoints) {
|
||||
String calcString = addon.getSettings().getLevelCalc();
|
||||
String withValues = calcString.replace("blocks", String.valueOf(blockAndDeathPoints)).replace("level_cost", String.valueOf(this.addon.getSettings().getLevelCost()));
|
||||
return (long)eval(withValues) - (addon.getSettings().isZeroNewIslandLevels() ? results.initialLevel.get() : 0);
|
||||
long evalWithValues;
|
||||
try {
|
||||
evalWithValues = (long)eval(withValues);
|
||||
return evalWithValues - (addon.getSettings().isZeroNewIslandLevels() ? results.initialLevel.get() : 0);
|
||||
|
||||
} catch (IOException e) {
|
||||
addon.getPlugin().logStacktrace(e);
|
||||
return 0L;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -424,7 +433,7 @@ public class IslandLevelCalculator {
|
|||
private void scanChests(Chunk chunk) {
|
||||
// Count blocks in chests
|
||||
for (BlockState bs : chunk.getTileEntities()) {
|
||||
if (bs instanceof Container) {
|
||||
if (bs instanceof Container container) {
|
||||
if (addon.isAdvChestEnabled()) {
|
||||
AdvancedChest<?,?> aChest = AdvancedChestsAPI.getChestManager().getAdvancedChest(bs.getLocation());
|
||||
if (aChest != null && aChest.getChestType().getName().equals("NORMAL")) {
|
||||
|
|
@ -437,7 +446,7 @@ public class IslandLevelCalculator {
|
|||
}
|
||||
}
|
||||
// Regular chest
|
||||
((Container)bs).getSnapshotInventory().forEach(this::countItemStack);
|
||||
container.getSnapshotInventory().forEach(this::countItemStack);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -513,7 +522,7 @@ public class IslandLevelCalculator {
|
|||
}
|
||||
// Hook for Wild Stackers (Blocks and Spawners Only) - this has to use the real chunk
|
||||
if (addon.isStackersEnabled() && (blockData.getMaterial().equals(Material.CAULDRON) || blockData.getMaterial().equals(Material.SPAWNER))) {
|
||||
stackedBlocks.add(new Location(cp.world, x + cp.chunkSnapshot.getX() * 16,y,z + cp.chunkSnapshot.getZ() * 16));
|
||||
stackedBlocks.add(new Location(cp.world, (double)x + cp.chunkSnapshot.getX() * 16, y, (double)z + cp.chunkSnapshot.getZ() * 16));
|
||||
}
|
||||
// Scan chests
|
||||
if (addon.getSettings().isIncludeChests() && CHESTS.contains(blockData.getMaterial())) {
|
||||
|
|
@ -564,21 +573,21 @@ public class IslandLevelCalculator {
|
|||
}
|
||||
|
||||
private Collection<String> sortedReport(int total, Multiset<Material> materialCount) {
|
||||
Collection<String> r = new ArrayList<>();
|
||||
Collection<String> result = new ArrayList<>();
|
||||
Iterable<Multiset.Entry<Material>> entriesSortedByCount = Multisets.copyHighestCountFirst(materialCount).entrySet();
|
||||
for (Entry<Material> en : entriesSortedByCount) {
|
||||
Material type = en.getElement();
|
||||
|
||||
int value = getValue(type);
|
||||
|
||||
r.add(type.toString() + ":"
|
||||
result.add(type.toString() + ":"
|
||||
+ String.format("%,d", en.getCount()) + " blocks x " + value + " = " + (value * en.getCount()));
|
||||
total += (value * en.getCount());
|
||||
|
||||
}
|
||||
r.add("Subtotal = " + total);
|
||||
r.add(LINE_BREAK);
|
||||
return r;
|
||||
result.add("Subtotal = " + total);
|
||||
result.add(LINE_BREAK);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -638,7 +647,7 @@ public class IslandLevelCalculator {
|
|||
|
||||
public void scanIsland(Pipeliner pipeliner) {
|
||||
// Scan the next chunk
|
||||
scanNextChunk().thenAccept(r -> {
|
||||
scanNextChunk().thenAccept(result -> {
|
||||
if (!Bukkit.isPrimaryThread()) {
|
||||
addon.getPlugin().logError("scanChunk not on Primary Thread!");
|
||||
}
|
||||
|
|
@ -653,7 +662,7 @@ public class IslandLevelCalculator {
|
|||
}
|
||||
return;
|
||||
}
|
||||
if (Boolean.TRUE.equals(r) && !pipeliner.getTask().isCancelled()) {
|
||||
if (Boolean.TRUE.equals(result) && !pipeliner.getTask().isCancelled()) {
|
||||
// scanNextChunk returns true if there are more chunks to scan
|
||||
scanIsland(pipeliner);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package world.bentobox.level.commands;
|
|||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import world.bentobox.bentobox.api.commands.CompositeCommand;
|
||||
import world.bentobox.bentobox.api.localization.TextVariables;
|
||||
|
|
@ -60,6 +59,6 @@ public class AdminTopRemoveCommand extends CompositeCommand {
|
|||
@Override
|
||||
public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
|
||||
return Optional.of(addon.getManager().getTopTen(getWorld(), Level.TEN).keySet().stream().map(addon.getPlayers()::getName)
|
||||
.filter(n -> !n.isEmpty()).collect(Collectors.toList()));
|
||||
.filter(n -> !n.isEmpty()).toList());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import world.bentobox.level.util.Utils;
|
|||
|
||||
public class IslandValueCommand extends CompositeCommand
|
||||
{
|
||||
private static final String MATERIAL = "[material]";
|
||||
private final Level addon;
|
||||
|
||||
|
||||
|
|
@ -45,7 +46,7 @@ public class IslandValueCommand extends CompositeCommand
|
|||
if (args.size() > 1)
|
||||
{
|
||||
this.showHelp(this, user);
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (args.isEmpty())
|
||||
|
|
@ -74,7 +75,7 @@ public class IslandValueCommand extends CompositeCommand
|
|||
{
|
||||
Utils.sendMessage(user,
|
||||
user.getTranslation(this.getWorld(), "level.conversations.unknown-item",
|
||||
"[material]", args.get(0)));
|
||||
MATERIAL, args.get(0)));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -100,7 +101,7 @@ public class IslandValueCommand extends CompositeCommand
|
|||
Utils.sendMessage(user,
|
||||
user.getTranslation(this.getWorld(), "level.conversations.value",
|
||||
"[value]", String.valueOf(value),
|
||||
"[material]", Utils.prettifyObject(material, user)));
|
||||
MATERIAL, Utils.prettifyObject(material, user)));
|
||||
|
||||
double underWater = this.addon.getSettings().getUnderWaterMultiplier();
|
||||
|
||||
|
|
@ -109,7 +110,7 @@ public class IslandValueCommand extends CompositeCommand
|
|||
Utils.sendMessage(user,
|
||||
user.getTranslation(this.getWorld(),"level.conversations.success-underwater",
|
||||
"[value]", (underWater * value) + ""),
|
||||
"[material]", Utils.prettifyObject(material, user));
|
||||
MATERIAL, Utils.prettifyObject(material, user));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -1,16 +1,23 @@
|
|||
package world.bentobox.level.panels;
|
||||
|
||||
|
||||
import com.google.common.base.Enums;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.EnumMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.event.inventory.ClickType;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import java.io.File;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.google.common.base.Enums;
|
||||
|
||||
import lv.id.bonne.panelutils.PanelUtils;
|
||||
import world.bentobox.bentobox.api.localization.TextVariables;
|
||||
import world.bentobox.bentobox.api.panels.PanelItem;
|
||||
import world.bentobox.bentobox.api.panels.TemplatedPanel;
|
||||
import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
|
||||
|
|
@ -18,7 +25,6 @@ import world.bentobox.bentobox.api.panels.builders.TemplatedPanelBuilder;
|
|||
import world.bentobox.bentobox.api.panels.reader.ItemTemplateRecord;
|
||||
import world.bentobox.bentobox.api.user.User;
|
||||
import world.bentobox.bentobox.database.objects.Island;
|
||||
import world.bentobox.bentobox.hooks.LangUtilsHook;
|
||||
import world.bentobox.bentobox.util.Pair;
|
||||
import world.bentobox.level.Level;
|
||||
import world.bentobox.level.objects.IslandLevels;
|
||||
|
|
@ -127,25 +133,19 @@ public class DetailsPanel
|
|||
materialCountMap.putAll(this.levelsData.getMdCount());
|
||||
|
||||
// Add underwater blocks.
|
||||
this.levelsData.getUwCount().forEach((material, count) -> {
|
||||
materialCountMap.put(material,
|
||||
materialCountMap.computeIfAbsent(material, key -> 0) + count);
|
||||
});
|
||||
this.levelsData.getUwCount().forEach((material, count) -> materialCountMap.put(material,
|
||||
materialCountMap.computeIfAbsent(material, key -> 0) + count));
|
||||
|
||||
materialCountMap.entrySet().stream().sorted((Map.Entry.comparingByKey())).
|
||||
forEachOrdered(entry ->
|
||||
this.materialCountList.add(new Pair<>(entry.getKey(), entry.getValue())));
|
||||
}
|
||||
case ABOVE_SEA_LEVEL -> {
|
||||
this.levelsData.getMdCount().entrySet().stream().sorted((Map.Entry.comparingByKey())).
|
||||
forEachOrdered(entry ->
|
||||
this.materialCountList.add(new Pair<>(entry.getKey(), entry.getValue())));
|
||||
}
|
||||
case UNDERWATER -> {
|
||||
this.levelsData.getUwCount().entrySet().stream().sorted((Map.Entry.comparingByKey())).
|
||||
forEachOrdered(entry ->
|
||||
this.materialCountList.add(new Pair<>(entry.getKey(), entry.getValue())));
|
||||
}
|
||||
case ABOVE_SEA_LEVEL -> this.levelsData.getMdCount().entrySet().stream().sorted((Map.Entry.comparingByKey()))
|
||||
.forEachOrdered(entry -> this.materialCountList.add(new Pair<>(entry.getKey(), entry.getValue())));
|
||||
|
||||
case UNDERWATER -> this.levelsData.getUwCount().entrySet().stream().sorted((Map.Entry.comparingByKey()))
|
||||
.forEachOrdered(entry -> this.materialCountList.add(new Pair<>(entry.getKey(), entry.getValue())));
|
||||
|
||||
case SPAWNER -> {
|
||||
int aboveWater = this.levelsData.getMdCount().getOrDefault(Material.SPAWNER, 0);
|
||||
int underWater = this.levelsData.getUwCount().getOrDefault(Material.SPAWNER, 0);
|
||||
|
|
@ -222,9 +222,9 @@ public class DetailsPanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Tab Button Type
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Tab Button Type
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -269,9 +269,8 @@ public class DetailsPanel
|
|||
{
|
||||
for (ItemTemplateRecord.ActionRecords action : activeActions)
|
||||
{
|
||||
if (clickType == action.clickType() || ClickType.UNKNOWN.equals(action.clickType()))
|
||||
{
|
||||
if ("VIEW".equalsIgnoreCase(action.actionType()))
|
||||
if ((clickType == action.clickType() || ClickType.UNKNOWN.equals(action.clickType()))
|
||||
&& "VIEW".equalsIgnoreCase(action.actionType()))
|
||||
{
|
||||
this.activeTab = tab;
|
||||
|
||||
|
|
@ -280,7 +279,6 @@ public class DetailsPanel
|
|||
this.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
|
|
@ -417,9 +415,9 @@ public class DetailsPanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Create common buttons
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Create common buttons
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -448,7 +446,7 @@ public class DetailsPanel
|
|||
{
|
||||
ItemStack clone = template.icon().clone();
|
||||
|
||||
if ((Boolean) template.dataMap().getOrDefault("indexing", false))
|
||||
if (Boolean.TRUE.equals(template.dataMap().getOrDefault("indexing", false)))
|
||||
{
|
||||
clone.setAmount(nextPageIndex);
|
||||
}
|
||||
|
|
@ -464,7 +462,7 @@ public class DetailsPanel
|
|||
if (template.description() != null)
|
||||
{
|
||||
builder.description(this.user.getTranslation(this.world, template.description(),
|
||||
"[number]", String.valueOf(nextPageIndex)));
|
||||
TextVariables.NUMBER, String.valueOf(nextPageIndex)));
|
||||
}
|
||||
|
||||
// Add ClickHandler
|
||||
|
|
@ -472,15 +470,13 @@ public class DetailsPanel
|
|||
{
|
||||
for (ItemTemplateRecord.ActionRecords action : template.actions())
|
||||
{
|
||||
if (clickType == action.clickType() || ClickType.UNKNOWN.equals(action.clickType()))
|
||||
{
|
||||
if ("NEXT".equalsIgnoreCase(action.actionType()))
|
||||
if ((clickType == action.clickType() || ClickType.UNKNOWN.equals(action.clickType())) &&
|
||||
"NEXT".equalsIgnoreCase(action.actionType()))
|
||||
{
|
||||
this.pageIndex++;
|
||||
this.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Always return true.
|
||||
return true;
|
||||
|
|
@ -528,7 +524,7 @@ public class DetailsPanel
|
|||
{
|
||||
ItemStack clone = template.icon().clone();
|
||||
|
||||
if ((Boolean) template.dataMap().getOrDefault("indexing", false))
|
||||
if (Boolean.TRUE.equals(template.dataMap().getOrDefault("indexing", false)))
|
||||
{
|
||||
clone.setAmount(previousPageIndex);
|
||||
}
|
||||
|
|
@ -544,7 +540,7 @@ public class DetailsPanel
|
|||
if (template.description() != null)
|
||||
{
|
||||
builder.description(this.user.getTranslation(this.world, template.description(),
|
||||
"[number]", String.valueOf(previousPageIndex)));
|
||||
TextVariables.NUMBER, String.valueOf(previousPageIndex)));
|
||||
}
|
||||
|
||||
// Add ClickHandler
|
||||
|
|
@ -552,15 +548,13 @@ public class DetailsPanel
|
|||
{
|
||||
for (ItemTemplateRecord.ActionRecords action : template.actions())
|
||||
{
|
||||
if (clickType == action.clickType() || ClickType.UNKNOWN.equals(action.clickType()))
|
||||
{
|
||||
if ("PREVIOUS".equalsIgnoreCase(action.actionType()))
|
||||
if ((clickType == action.clickType() || ClickType.UNKNOWN.equals(action.clickType()))
|
||||
&& "PREVIOUS".equalsIgnoreCase(action.actionType()))
|
||||
{
|
||||
this.pageIndex--;
|
||||
this.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Always return true.
|
||||
return true;
|
||||
|
|
@ -585,9 +579,9 @@ public class DetailsPanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Create Material Button
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Create Material Button
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -646,7 +640,7 @@ public class DetailsPanel
|
|||
if (template.title() != null)
|
||||
{
|
||||
builder.name(this.user.getTranslation(this.world, template.title(),
|
||||
"[number]", String.valueOf(materialCount.getValue()),
|
||||
TextVariables.NUMBER, String.valueOf(materialCount.getValue()),
|
||||
"[material]", Utils.prettifyObject(materialCount.getKey(), this.user)));
|
||||
}
|
||||
|
||||
|
|
@ -658,18 +652,18 @@ public class DetailsPanel
|
|||
|
||||
int blockValue = this.addon.getBlockConfig().getBlockValues().getOrDefault(materialCount.getKey(), 0);
|
||||
String value = blockValue > 0 ? this.user.getTranslationOrNothing(reference + "value",
|
||||
"[number]", String.valueOf(blockValue)) : "";
|
||||
TextVariables.NUMBER, String.valueOf(blockValue)) : "";
|
||||
|
||||
int blockLimit = this.addon.getBlockConfig().getBlockLimits().getOrDefault(materialCount.getKey(), 0);
|
||||
String limit = blockLimit > 0 ? this.user.getTranslationOrNothing(reference + "limit",
|
||||
"[number]", String.valueOf(blockLimit)) : "";
|
||||
TextVariables.NUMBER, String.valueOf(blockLimit)) : "";
|
||||
|
||||
String count = this.user.getTranslationOrNothing(reference + "count",
|
||||
"[number]", String.valueOf(materialCount.getValue()));
|
||||
TextVariables.NUMBER, String.valueOf(materialCount.getValue()));
|
||||
|
||||
long calculatedValue = (long) Math.min(blockLimit > 0 ? blockLimit : Integer.MAX_VALUE, materialCount.getValue()) * blockValue;
|
||||
String valueText = calculatedValue > 0 ? this.user.getTranslationOrNothing(reference + "calculated",
|
||||
"[number]", String.valueOf(calculatedValue)) : "";
|
||||
TextVariables.NUMBER, String.valueOf(calculatedValue)) : "";
|
||||
|
||||
if (template.description() != null)
|
||||
{
|
||||
|
|
@ -682,16 +676,16 @@ public class DetailsPanel
|
|||
"[count]", count).
|
||||
replaceAll("(?m)^[ \\t]*\\r?\\n", "").
|
||||
replaceAll("(?<!\\\\)\\|", "\n").
|
||||
replaceAll("\\\\\\|", "|"));
|
||||
replace("\\\\\\|", "|"));
|
||||
}
|
||||
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Other Methods
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Other Methods
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -710,9 +704,9 @@ public class DetailsPanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Enums
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Enums
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -759,9 +753,9 @@ public class DetailsPanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Variables
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Variables
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* This variable holds targeted island.
|
||||
|
|
|
|||
|
|
@ -6,14 +6,18 @@
|
|||
package world.bentobox.level.panels;
|
||||
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.event.inventory.ClickType;
|
||||
import java.io.File;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import world.bentobox.bentobox.api.addons.GameModeAddon;
|
||||
import world.bentobox.bentobox.api.localization.TextVariables;
|
||||
import world.bentobox.bentobox.api.panels.PanelItem;
|
||||
import world.bentobox.bentobox.api.panels.TemplatedPanel;
|
||||
import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
|
||||
|
|
@ -31,9 +35,11 @@ import world.bentobox.level.util.Utils;
|
|||
*/
|
||||
public class TopLevelPanel
|
||||
{
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Internal Constructor
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Internal Constructor
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -82,9 +88,9 @@ public class TopLevelPanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Methods
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Methods
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -100,8 +106,6 @@ public class TopLevelPanel
|
|||
return null;
|
||||
}
|
||||
|
||||
final String reference = "level.gui.buttons.island.";
|
||||
|
||||
PanelItemBuilder builder = new PanelItemBuilder();
|
||||
|
||||
if (template.icon() != null)
|
||||
|
|
@ -112,18 +116,18 @@ public class TopLevelPanel
|
|||
if (template.title() != null)
|
||||
{
|
||||
builder.name(this.user.getTranslation(this.world, template.title(),
|
||||
"[name]", String.valueOf(index)));
|
||||
TextVariables.NAME, String.valueOf(index)));
|
||||
}
|
||||
else
|
||||
{
|
||||
builder.name(this.user.getTranslation(this.world, reference,
|
||||
"[name]", String.valueOf(index)));
|
||||
builder.name(this.user.getTranslation(this.world, REFERENCE,
|
||||
TextVariables.NAME, String.valueOf(index)));
|
||||
}
|
||||
|
||||
if (template.description() != null)
|
||||
{
|
||||
builder.description(this.user.getTranslation(this.world, template.description(),
|
||||
"[number]", String.valueOf(index)));
|
||||
TextVariables.NUMBER, String.valueOf(index)));
|
||||
}
|
||||
|
||||
builder.amount(index != 0 ? (int) index : 1);
|
||||
|
|
@ -222,7 +226,7 @@ public class TopLevelPanel
|
|||
this.user.closeInventory();
|
||||
this.addon.getWarpHook().getWarpSignsManager().warpPlayer(this.world, this.user, island.getOwner());
|
||||
}
|
||||
case "VISIT" -> {
|
||||
case "VISIT" ->
|
||||
// The command call implementation solves necessity to check for all visits options,
|
||||
// like cool down, confirmation and preprocess in single go. Would it be better to write
|
||||
// all logic here?
|
||||
|
|
@ -239,12 +243,17 @@ public class TopLevelPanel
|
|||
this.user.performCommand(command.getTopLabel() + " " + mainCommand + " " + island.getOwner());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
case "VIEW" -> {
|
||||
this.user.closeInventory();
|
||||
// Open Detailed GUI.
|
||||
DetailsPanel.openPanel(this.addon, this.world, this.user);
|
||||
}
|
||||
// Catch default
|
||||
default -> {
|
||||
this.user.closeInventory();
|
||||
addon.logError("Unknown action type " + action.actionType().toUpperCase());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -282,17 +291,16 @@ public class TopLevelPanel
|
|||
ItemTemplateRecord template,
|
||||
Island island)
|
||||
{
|
||||
final String reference = "level.gui.buttons.island.";
|
||||
|
||||
// Get Island Name
|
||||
String nameText;
|
||||
|
||||
if (island.getName() == null || island.getName().isEmpty())
|
||||
{
|
||||
nameText = this.user.getTranslation(reference + "owners-island",
|
||||
"[player]",
|
||||
nameText = this.user.getTranslation(REFERENCE + "owners-island",
|
||||
PLAYER,
|
||||
island.getOwner() == null ?
|
||||
this.user.getTranslation(reference + "unknown") :
|
||||
this.user.getTranslation(REFERENCE + "unknown") :
|
||||
this.addon.getPlayers().getName(island.getOwner()));
|
||||
}
|
||||
else
|
||||
|
|
@ -304,11 +312,11 @@ public class TopLevelPanel
|
|||
if (template.title() != null && !template.title().isBlank())
|
||||
{
|
||||
builder.name(this.user.getTranslation(this.world, template.title(),
|
||||
"[name]", nameText));
|
||||
TextVariables.NAME, nameText));
|
||||
}
|
||||
else
|
||||
{
|
||||
builder.name(this.user.getTranslation(reference + "name", "[name]", nameText));
|
||||
builder.name(this.user.getTranslation(REFERENCE + "name", TextVariables.NAME, nameText));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -382,13 +390,11 @@ public class TopLevelPanel
|
|||
IslandTopRecord islandTopRecord,
|
||||
int index)
|
||||
{
|
||||
final String reference = "level.gui.buttons.island.";
|
||||
|
||||
// Get Owner Name
|
||||
String ownerText = this.user.getTranslation(reference + "owner",
|
||||
"[player]",
|
||||
String ownerText = this.user.getTranslation(REFERENCE + "owner",
|
||||
PLAYER,
|
||||
island.getOwner() == null ?
|
||||
this.user.getTranslation(reference + "unknown") :
|
||||
this.user.getTranslation(REFERENCE + "unknown") :
|
||||
this.addon.getPlayers().getName(island.getOwner()));
|
||||
|
||||
// Get Members Text
|
||||
|
|
@ -397,11 +403,11 @@ public class TopLevelPanel
|
|||
if (island.getMemberSet().size() > 1)
|
||||
{
|
||||
StringBuilder memberBuilder = new StringBuilder(
|
||||
this.user.getTranslationOrNothing(reference + "members-title"));
|
||||
this.user.getTranslationOrNothing(REFERENCE + "members-title"));
|
||||
|
||||
for (UUID uuid : island.getMemberSet())
|
||||
{
|
||||
User user = User.getInstance(uuid);
|
||||
User member = User.getInstance(uuid);
|
||||
|
||||
if (memberBuilder.length() > 0)
|
||||
{
|
||||
|
|
@ -409,8 +415,8 @@ public class TopLevelPanel
|
|||
}
|
||||
|
||||
memberBuilder.append(
|
||||
this.user.getTranslationOrNothing(reference + "member",
|
||||
"[player]", user.getName()));
|
||||
this.user.getTranslationOrNothing(REFERENCE + "member",
|
||||
PLAYER, member.getName()));
|
||||
}
|
||||
|
||||
memberText = memberBuilder.toString();
|
||||
|
|
@ -420,11 +426,11 @@ public class TopLevelPanel
|
|||
memberText = "";
|
||||
}
|
||||
|
||||
String placeText = this.user.getTranslation(reference + "place",
|
||||
"[number]", String.valueOf(index));
|
||||
String placeText = this.user.getTranslation(REFERENCE + "place",
|
||||
TextVariables.NUMBER, String.valueOf(index));
|
||||
|
||||
String levelText = this.user.getTranslation(reference + "level",
|
||||
"[number]", this.addon.getManager().formatLevel(islandTopRecord.level()));
|
||||
String levelText = this.user.getTranslation(REFERENCE + "level",
|
||||
TextVariables.NUMBER, this.addon.getManager().formatLevel(islandTopRecord.level()));
|
||||
|
||||
// Template specific description is always more important than custom one.
|
||||
if (template.description() != null && !template.description().isBlank())
|
||||
|
|
@ -436,12 +442,12 @@ public class TopLevelPanel
|
|||
"[place]", placeText).
|
||||
replaceAll("(?m)^[ \\t]*\\r?\\n", "").
|
||||
replaceAll("(?<!\\\\)\\|", "\n").
|
||||
replaceAll("\\\\\\|", "|"));
|
||||
replace("\\\\\\|", "|")); // Not a regex - replace is more efficient
|
||||
}
|
||||
else
|
||||
{
|
||||
// Now combine everything.
|
||||
String descriptionText = this.user.getTranslation(reference + "description",
|
||||
String descriptionText = this.user.getTranslation(REFERENCE + "description",
|
||||
"[owner]", ownerText,
|
||||
"[members]", memberText,
|
||||
"[level]", levelText,
|
||||
|
|
@ -450,7 +456,7 @@ public class TopLevelPanel
|
|||
builder.description(descriptionText.
|
||||
replaceAll("(?m)^[ \\t]*\\r?\\n", "").
|
||||
replaceAll("(?<!\\\\)\\|", "\n").
|
||||
replaceAll("\\\\\\|", "|"));
|
||||
replace("\\\\\\|", "|")); // Not a regex - replace is more efficient
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -473,9 +479,9 @@ public class TopLevelPanel
|
|||
int place = this.addon.getManager().getRank(this.world, this.user.getUniqueId());
|
||||
long level = this.addon.getIslandLevel(this.world, island.getOwner());
|
||||
|
||||
IslandTopRecord record = new IslandTopRecord(island, level);
|
||||
IslandTopRecord topRecord = new IslandTopRecord(island, level);
|
||||
|
||||
return this.createIslandIcon(template, record, place);
|
||||
return this.createIslandIcon(template, topRecord, place);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -493,11 +499,16 @@ public class TopLevelPanel
|
|||
new TopLevelPanel(addon, user, world, permissionPrefix).build();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Constants
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Record
|
||||
// ---------------------------------------------------------------------
|
||||
private static final String REFERENCE = "level.gui.buttons.island.";
|
||||
private static final String PLAYER = "[player]";
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Record
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* This record is used internally. It converts user -> level to island -> level.
|
||||
|
|
@ -505,9 +516,9 @@ public class TopLevelPanel
|
|||
private record IslandTopRecord(Island island, Long level) {}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Variables
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Variables
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* This variable allows to access addon object.
|
||||
|
|
|
|||
|
|
@ -1,25 +1,29 @@
|
|||
package world.bentobox.level.panels;
|
||||
|
||||
|
||||
import com.google.common.base.Enums;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.event.inventory.ClickType;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import java.io.File;
|
||||
import java.util.*;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.google.common.base.Enums;
|
||||
|
||||
import lv.id.bonne.panelutils.PanelUtils;
|
||||
import world.bentobox.bentobox.api.localization.TextVariables;
|
||||
import world.bentobox.bentobox.api.panels.PanelItem;
|
||||
import world.bentobox.bentobox.api.panels.TemplatedPanel;
|
||||
import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
|
||||
import world.bentobox.bentobox.api.panels.builders.TemplatedPanelBuilder;
|
||||
import world.bentobox.bentobox.api.panels.reader.ItemTemplateRecord;
|
||||
import world.bentobox.bentobox.api.user.User;
|
||||
import world.bentobox.bentobox.hooks.LangUtilsHook;
|
||||
import world.bentobox.bentobox.util.Pair;
|
||||
import world.bentobox.level.Level;
|
||||
import world.bentobox.level.util.ConversationUtils;
|
||||
import world.bentobox.level.util.Utils;
|
||||
|
|
@ -30,6 +34,7 @@ import world.bentobox.level.util.Utils;
|
|||
*/
|
||||
public class ValuePanel
|
||||
{
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Internal Constructor
|
||||
// ---------------------------------------------------------------------
|
||||
|
|
@ -86,7 +91,7 @@ public class ValuePanel
|
|||
|
||||
panelBuilder.registerTypeBuilder("NEXT", this::createNextButton);
|
||||
panelBuilder.registerTypeBuilder("PREVIOUS", this::createPreviousButton);
|
||||
panelBuilder.registerTypeBuilder("BLOCK", this::createMaterialButton);
|
||||
panelBuilder.registerTypeBuilder(BLOCK, this::createMaterialButton);
|
||||
|
||||
panelBuilder.registerTypeBuilder("FILTER", this::createFilterButton);
|
||||
panelBuilder.registerTypeBuilder("SEARCH", this::createSearchButton);
|
||||
|
|
@ -106,7 +111,7 @@ public class ValuePanel
|
|||
switch (this.activeFilter)
|
||||
{
|
||||
case VALUE_ASC ->
|
||||
{
|
||||
|
||||
sorter = (o1, o2) ->
|
||||
{
|
||||
if (o1.value().equals(o2.value()))
|
||||
|
|
@ -121,9 +126,9 @@ public class ValuePanel
|
|||
return Integer.compare(o1.value(), o2.value());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
case VALUE_DESC ->
|
||||
{
|
||||
|
||||
sorter = (o1, o2) ->
|
||||
{
|
||||
if (o1.value().equals(o2.value()))
|
||||
|
|
@ -138,9 +143,9 @@ public class ValuePanel
|
|||
return Integer.compare(o2.value(), o1.value());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
case NAME_DESC ->
|
||||
{
|
||||
|
||||
sorter = (o1, o2) ->
|
||||
{
|
||||
String o1Name = Utils.prettifyObject(o1.material(), this.user);
|
||||
|
|
@ -148,9 +153,9 @@ public class ValuePanel
|
|||
|
||||
return String.CASE_INSENSITIVE_ORDER.compare(o2Name, o1Name);
|
||||
};
|
||||
}
|
||||
|
||||
default ->
|
||||
{
|
||||
|
||||
sorter = (o1, o2) ->
|
||||
{
|
||||
String o1Name = Utils.prettifyObject(o1.material(), this.user);
|
||||
|
|
@ -158,7 +163,7 @@ public class ValuePanel
|
|||
|
||||
return String.CASE_INSENSITIVE_ORDER.compare(o1Name, o2Name);
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
this.materialRecordList.sort(sorter);
|
||||
|
|
@ -168,12 +173,12 @@ public class ValuePanel
|
|||
this.elementList = new ArrayList<>(this.materialRecordList.size());
|
||||
final String text = this.searchText.toLowerCase();
|
||||
|
||||
this.materialRecordList.forEach(record ->
|
||||
this.materialRecordList.forEach(rec ->
|
||||
{
|
||||
if (record.material.name().toLowerCase().contains(text) ||
|
||||
Utils.prettifyObject(record.material(), this.user).toLowerCase().contains(text))
|
||||
if (rec.material.name().toLowerCase().contains(text) ||
|
||||
Utils.prettifyObject(rec.material(), this.user).toLowerCase().contains(text))
|
||||
{
|
||||
this.elementList.add(record);
|
||||
this.elementList.add(rec);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -186,9 +191,9 @@ public class ValuePanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Tab Button Type
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Tab Button Type
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -394,9 +399,9 @@ public class ValuePanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Create common buttons
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Create common buttons
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -410,8 +415,8 @@ public class ValuePanel
|
|||
{
|
||||
long size = this.elementList.size();
|
||||
|
||||
if (size <= slot.amountMap().getOrDefault("BLOCK", 1) ||
|
||||
1.0 * size / slot.amountMap().getOrDefault("BLOCK", 1) <= this.pageIndex + 1)
|
||||
if (size <= slot.amountMap().getOrDefault(BLOCK, 1) ||
|
||||
1.0 * size / slot.amountMap().getOrDefault(BLOCK, 1) <= this.pageIndex + 1)
|
||||
{
|
||||
// There are no next elements
|
||||
return null;
|
||||
|
|
@ -425,7 +430,7 @@ public class ValuePanel
|
|||
{
|
||||
ItemStack clone = template.icon().clone();
|
||||
|
||||
if ((Boolean) template.dataMap().getOrDefault("indexing", false))
|
||||
if (Boolean.TRUE.equals(template.dataMap().getOrDefault("indexing", false)))
|
||||
{
|
||||
clone.setAmount(nextPageIndex);
|
||||
}
|
||||
|
|
@ -441,7 +446,7 @@ public class ValuePanel
|
|||
if (template.description() != null)
|
||||
{
|
||||
builder.description(this.user.getTranslation(this.world, template.description(),
|
||||
"[number]", String.valueOf(nextPageIndex)));
|
||||
TextVariables.NUMBER, String.valueOf(nextPageIndex)));
|
||||
}
|
||||
|
||||
// Add ClickHandler
|
||||
|
|
@ -449,15 +454,13 @@ public class ValuePanel
|
|||
{
|
||||
for (ItemTemplateRecord.ActionRecords action : template.actions())
|
||||
{
|
||||
if (clickType == action.clickType() || ClickType.UNKNOWN.equals(action.clickType()))
|
||||
{
|
||||
if ("NEXT".equalsIgnoreCase(action.actionType()))
|
||||
if ((clickType == action.clickType() || ClickType.UNKNOWN.equals(action.clickType()))
|
||||
&& "NEXT".equalsIgnoreCase(action.actionType()))
|
||||
{
|
||||
this.pageIndex++;
|
||||
this.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Always return true.
|
||||
return true;
|
||||
|
|
@ -505,7 +508,7 @@ public class ValuePanel
|
|||
{
|
||||
ItemStack clone = template.icon().clone();
|
||||
|
||||
if ((Boolean) template.dataMap().getOrDefault("indexing", false))
|
||||
if (Boolean.TRUE.equals(template.dataMap().getOrDefault("indexing", false)))
|
||||
{
|
||||
clone.setAmount(previousPageIndex);
|
||||
}
|
||||
|
|
@ -521,7 +524,7 @@ public class ValuePanel
|
|||
if (template.description() != null)
|
||||
{
|
||||
builder.description(this.user.getTranslation(this.world, template.description(),
|
||||
"[number]", String.valueOf(previousPageIndex)));
|
||||
TextVariables.NUMBER, String.valueOf(previousPageIndex)));
|
||||
}
|
||||
|
||||
// Add ClickHandler
|
||||
|
|
@ -529,15 +532,13 @@ public class ValuePanel
|
|||
{
|
||||
for (ItemTemplateRecord.ActionRecords action : template.actions())
|
||||
{
|
||||
if (clickType == action.clickType() || ClickType.UNKNOWN.equals(action.clickType()))
|
||||
{
|
||||
if ("PREVIOUS".equalsIgnoreCase(action.actionType()))
|
||||
if ((clickType == action.clickType() || ClickType.UNKNOWN.equals(action.clickType()))
|
||||
&& "PREVIOUS".equalsIgnoreCase(action.actionType()))
|
||||
{
|
||||
this.pageIndex--;
|
||||
this.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Always return true.
|
||||
return true;
|
||||
|
|
@ -562,9 +563,9 @@ public class ValuePanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Create Material Button
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Create Material Button
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -582,7 +583,7 @@ public class ValuePanel
|
|||
return null;
|
||||
}
|
||||
|
||||
int index = this.pageIndex * slot.amountMap().getOrDefault("BLOCK", 1) + slot.slot();
|
||||
int index = this.pageIndex * slot.amountMap().getOrDefault(BLOCK, 1) + slot.slot();
|
||||
|
||||
if (index >= this.elementList.size())
|
||||
{
|
||||
|
|
@ -633,14 +634,14 @@ public class ValuePanel
|
|||
"[id]", materialRecord.material().name());
|
||||
|
||||
String value = this.user.getTranslationOrNothing(reference + "value",
|
||||
"[number]", String.valueOf(materialRecord.value()));
|
||||
TextVariables.NUMBER, String.valueOf(materialRecord.value()));
|
||||
|
||||
String underWater;
|
||||
|
||||
if (this.addon.getSettings().getUnderWaterMultiplier() > 1.0)
|
||||
{
|
||||
underWater = this.user.getTranslationOrNothing(reference + "underwater",
|
||||
"[number]", String.valueOf(materialRecord.value() * this.addon.getSettings().getUnderWaterMultiplier()));
|
||||
TextVariables.NUMBER, String.valueOf(materialRecord.value() * this.addon.getSettings().getUnderWaterMultiplier()));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -648,7 +649,7 @@ public class ValuePanel
|
|||
}
|
||||
|
||||
String limit = materialRecord.limit() > 0 ? this.user.getTranslationOrNothing(reference + "limit",
|
||||
"[number]", String.valueOf(materialRecord.limit())) : "";
|
||||
TextVariables.NUMBER, String.valueOf(materialRecord.limit())) : "";
|
||||
|
||||
if (template.description() != null)
|
||||
{
|
||||
|
|
@ -660,11 +661,11 @@ public class ValuePanel
|
|||
"[limit]", limit).
|
||||
replaceAll("(?m)^[ \\t]*\\r?\\n", "").
|
||||
replaceAll("(?<!\\\\)\\|", "\n").
|
||||
replaceAll("\\\\\\|", "|"));
|
||||
replace("\\\\\\|", "|")); // Non regex
|
||||
}
|
||||
|
||||
builder.clickHandler((panel, user1, clickType, i) -> {
|
||||
System.out.println("Material: " + materialRecord.material());
|
||||
addon.log("Material: " + materialRecord.material());
|
||||
return true;
|
||||
});
|
||||
|
||||
|
|
@ -672,9 +673,9 @@ public class ValuePanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Other Methods
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Other Methods
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -693,9 +694,9 @@ public class ValuePanel
|
|||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Enums
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Enums
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -726,10 +727,15 @@ public class ValuePanel
|
|||
{
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Constants
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Variables
|
||||
// ---------------------------------------------------------------------
|
||||
private static final String BLOCK = "BLOCK";
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Variables
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* This variable allows to access addon object.
|
||||
|
|
|
|||
|
|
@ -7,10 +7,16 @@
|
|||
package world.bentobox.level.util;
|
||||
|
||||
|
||||
import org.bukkit.conversations.*;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import org.bukkit.conversations.ConversationAbandonedListener;
|
||||
import org.bukkit.conversations.ConversationContext;
|
||||
import org.bukkit.conversations.ConversationFactory;
|
||||
import org.bukkit.conversations.MessagePrompt;
|
||||
import org.bukkit.conversations.Prompt;
|
||||
import org.bukkit.conversations.StringPrompt;
|
||||
import org.eclipse.jdt.annotation.NonNull;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import world.bentobox.bentobox.BentoBox;
|
||||
import world.bentobox.bentobox.api.user.User;
|
||||
|
|
@ -18,10 +24,11 @@ import world.bentobox.bentobox.api.user.User;
|
|||
|
||||
public class ConversationUtils
|
||||
{
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Conversation API implementation
|
||||
// ---------------------------------------------------------------------
|
||||
// ---------------------------------------------------------------------
|
||||
// Section: Conversation API implementation
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
private ConversationUtils() {} // Private constructor as this is a utility class only with static methods
|
||||
|
||||
/**
|
||||
* This method will close opened gui and writes question in chat. After players answers on question in chat, message
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
package world.bentobox.level.util;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.permissions.PermissionAttachmentInfo;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import world.bentobox.bentobox.api.user.User;
|
||||
import world.bentobox.bentobox.hooks.LangUtilsHook;
|
||||
|
|
@ -18,6 +18,10 @@ import world.bentobox.bentobox.hooks.LangUtilsHook;
|
|||
|
||||
public class Utils
|
||||
{
|
||||
private static final String LEVEL_MATERIALS = "level.materials.";
|
||||
|
||||
private Utils() {} // Private constructor as this is a utility class only with static methods
|
||||
|
||||
/**
|
||||
* This method sends a message to the user with appended "prefix" text before message.
|
||||
* @param user User who receives message.
|
||||
|
|
@ -54,7 +58,7 @@ public class Utils
|
|||
List<String> permissions = user.getEffectivePermissions().stream().
|
||||
map(PermissionAttachmentInfo::getPermission).
|
||||
filter(permission -> permission.startsWith(permPrefix)).
|
||||
collect(Collectors.toList());
|
||||
toList();
|
||||
|
||||
for (String permission : permissions)
|
||||
{
|
||||
|
|
@ -154,7 +158,7 @@ public class Utils
|
|||
// materials:
|
||||
// [material]:
|
||||
// name: [name]
|
||||
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".name");
|
||||
String translation = user.getTranslationOrNothing(LEVEL_MATERIALS + object.name().toLowerCase() + ".name");
|
||||
|
||||
if (!translation.isEmpty())
|
||||
{
|
||||
|
|
@ -167,7 +171,7 @@ public class Utils
|
|||
// materials:
|
||||
// [material]: [name]
|
||||
|
||||
translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase());
|
||||
translation = user.getTranslationOrNothing(LEVEL_MATERIALS + object.name().toLowerCase());
|
||||
|
||||
if (!translation.isEmpty())
|
||||
{
|
||||
|
|
@ -211,7 +215,7 @@ public class Utils
|
|||
// materials:
|
||||
// [material]:
|
||||
// description: [text]
|
||||
String translation = user.getTranslationOrNothing("level.materials." + object.name().toLowerCase() + ".description");
|
||||
String translation = user.getTranslationOrNothing(LEVEL_MATERIALS + object.name().toLowerCase() + ".description");
|
||||
|
||||
if (!translation.isEmpty())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ public class LevelsManagerTest {
|
|||
// Default to uuid's being island owners
|
||||
when(im.isOwner(eq(world), any())).thenReturn(true);
|
||||
when(im.getOwner(any(), any(UUID.class))).thenAnswer(in -> in.getArgument(1, UUID.class));
|
||||
when(im.getIsland(eq(world), eq(uuid))).thenReturn(island);
|
||||
when(im.getIsland(world, uuid)).thenReturn(island);
|
||||
when(im.getIslandById(anyString())).thenReturn(Optional.of(island));
|
||||
|
||||
// Player
|
||||
|
|
@ -392,8 +392,8 @@ public class LevelsManagerTest {
|
|||
Bukkit.getScheduler();
|
||||
verify(scheduler).runTaskAsynchronously(eq(plugin), task.capture());
|
||||
task.getValue().run();
|
||||
verify(addon).log(eq("Generating rankings"));
|
||||
verify(addon).log(eq("Generated rankings for bskyblock-world"));
|
||||
verify(addon).log("Generating rankings");
|
||||
verify(addon).log("Generated rankings for bskyblock-world");
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ public class AdminTopRemoveCommandTest {
|
|||
@Test
|
||||
public void testCanExecuteWrongArgs() {
|
||||
assertFalse(atrc.canExecute(user, "delete", Collections.emptyList()));
|
||||
verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock"));
|
||||
verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -174,7 +174,7 @@ public class AdminTopRemoveCommandTest {
|
|||
public void testCanExecuteUnknown() {
|
||||
when(pm.getUser(anyString())).thenReturn(null);
|
||||
assertFalse(atrc.canExecute(user, "delete", Collections.singletonList("tastybento")));
|
||||
verify(user).sendMessage(eq("general.errors.unknown-player"), eq(TextVariables.NAME), eq("tastybento"));
|
||||
verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "tastybento");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -193,7 +193,7 @@ public class AdminTopRemoveCommandTest {
|
|||
testCanExecuteKnown();
|
||||
assertTrue(atrc.execute(user, "delete", Collections.singletonList("tastybento")));
|
||||
verify(manager).removeEntry(any(World.class), eq(uuid));
|
||||
verify(user).sendMessage(eq("general.success"));
|
||||
verify(user).sendMessage("general.success");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue