Upstream
/
Limits
mirror of https://github.com/BentoBoxWorld/Limits.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added chest/hopper placeholders, refactored getBlockCounts to be consistent, implemented getBlockCount

This commit is contained in:
JasonLiu2002 2021-07-29 01:38:45 -07:00
parent 4c5fdd6390
commit 21986d3f2d
5 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/world/bentobox/limits/Limits.java
View File

@ -3,6 +3,7 @@ package world.bentobox.limits;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.Material;
import org.bukkit.World;
import world.bentobox.bentobox.api.addons.Addon;
@ -48,6 +49,7 @@ public class Limits extends Addon {
// Register commands
gm.getAdminCommand().ifPresent(a -> new AdminCommand(this, a));
gm.getPlayerCommand().ifPresent(a -> new PlayerCommand(this, a));
registerPlaceholders(gm);
log("Limits will apply to " + gm.getDescription().getName());
}
);
@ -125,4 +127,29 @@ public class Limits extends Addon {
return joinListener;
}
private void registerPlaceholders(GameModeAddon gm) {
if (getPlugin().getPlaceholdersManager() == null) return;
// Hopper count
getPlugin().getPlaceholdersManager().registerPlaceholder(this,
gm.getDescription().getName().toLowerCase() + "_island_hopper_count",
user -> String.valueOf(getBlockLimitListener().getIsland(gm.getIslands().
getIsland(gm.getOverWorld(), user).getUniqueId()).getBlockCount(Material.HOPPER)));
// Hopper limit
getPlugin().getPlaceholdersManager().registerPlaceholder(this,
gm.getDescription().getName().toLowerCase() + "_island_hopper_limit",
user -> String.valueOf(getBlockLimitListener().getIsland(gm.getIslands().
getIsland(gm.getOverWorld(), user).getUniqueId()).getBlockLimit(Material.HOPPER)));
// Chest count
getPlugin().getPlaceholdersManager().registerPlaceholder(this,
gm.getDescription().getName().toLowerCase() + "_island_chest_count",
user -> String.valueOf(getBlockLimitListener().getIsland(gm.getIslands().
getIsland(gm.getOverWorld(), user).getUniqueId()).getBlockCount(Material.CHEST)));
// Chest limit
getPlugin().getPlaceholdersManager().registerPlaceholder(this,
gm.getDescription().getName().toLowerCase() + "_island_chest_limit",
user -> String.valueOf(getBlockLimitListener().getIsland(gm.getIslands().
getIsland(gm.getOverWorld(), user).getUniqueId()).getBlockLimit(Material.CHEST)));
}
}

2
src/main/java/world/bentobox/limits/commands/LimitTab.java
View File

@ -179,7 +179,7 @@ public class LimitTab implements Tab {
// Adjust icon
pib.icon(B2M.getOrDefault(en.getKey(), en.getKey()));
int count = ibc == null ? 0 : ibc.getBlockCount().getOrDefault(en.getKey(), 0);
int count = ibc == null ? 0 : ibc.getBlockCounts().getOrDefault(en.getKey(), 0);
String color = count >= en.getValue() ? user.getTranslation("island.limits.max-color") : user.getTranslation("island.limits.regular-color");
pib.description(color
+ user.getTranslation("island.limits.block-limit-syntax",

2
src/main/java/world/bentobox/limits/commands/LimitsCalc.java
View File

@ -143,7 +143,7 @@ public class LimitsCalc {
if (ibc == null) {
ibc = new IslandBlockCount();
}
ibc.setBlockCount(blockCount.entrySet().stream()
ibc.setBlockCounts(blockCount.entrySet().stream()
.collect(Collectors.toMap(
Map.Entry::getKey,
entry -> entry.getValue().get())));

2
src/main/java/world/bentobox/limits/listeners/BlockLimitsListener.java
View File

@ -85,7 +85,7 @@ public class BlockLimitsListener implements Listener {
handler.loadObjects().forEach(ibc -> {
// Clean up
if (addon.isCoveredGameMode(ibc.getGameMode())) {
ibc.getBlockCount().keySet().removeIf(DO_NOT_COUNT::contains);
ibc.getBlockCounts().keySet().removeIf(DO_NOT_COUNT::contains);
// Store
islandCountMap.put(ibc.getUniqueId(), ibc);
} else {

31
src/main/java/world/bentobox/limits/objects/IslandBlockCount.java
View File

@ -26,7 +26,7 @@ public class IslandBlockCount implements DataObject {
private String gameMode = "";
@Expose
private Map<Material, Integer> blockCount = new EnumMap<>(Material.class);
private Map<Material, Integer> blockCounts = new EnumMap<>(Material.class);
private boolean changed;
@ -74,24 +74,33 @@ public class IslandBlockCount implements DataObject {
/**
* @return the blockCount
*/
public Map<Material, Integer> getBlockCount() {
return blockCount;
public Map<Material, Integer> getBlockCounts() {
return blockCounts;
}
/**
* @param blockCount the blockCount to set
* @param blockCounts the blockCount to set
*/
public void setBlockCount(Map<Material, Integer> blockCount) {
this.blockCount = blockCount;
public void setBlockCounts(Map<Material, Integer> blockCounts) {
this.blockCounts = blockCounts;
setChanged();
}
/**
* Get the block count for this material for this island
* @param m - material
* @return count or -1 for unlimited
*/
public Integer getBlockCount(Material m) {
return blockCounts.getOrDefault(m, -1);
}
/**
* Add a material to the count
* @param material - material
*/
public void add(Material material) {
blockCount.merge(material, 1, Integer::sum);
blockCounts.merge(material, 1, Integer::sum);
setChanged();
}
@ -100,8 +109,8 @@ public class IslandBlockCount implements DataObject {
* @param material - material
*/
public void remove(Material material) {
blockCount.put(material, blockCount.getOrDefault(material, 0) - 1);
blockCount.values().removeIf(v -> v <= 0);
blockCounts.put(material, blockCounts.getOrDefault(material, 0) - 1);
blockCounts.values().removeIf(v -> v <= 0);
setChanged();
}
@ -112,7 +121,7 @@ public class IslandBlockCount implements DataObject {
* @return true if count is >= limit
*/
public boolean isAtLimit(Material material, int limit) {
return blockCount.getOrDefault(material, 0) >= limit;
return blockCounts.getOrDefault(material, 0) >= limit;
}
/**
@ -122,7 +131,7 @@ public class IslandBlockCount implements DataObject {
*/
public boolean isAtLimit(Material m) {
// Check island limits first
return blockLimits.containsKey(m) && blockCount.getOrDefault(m, 0) >= blockLimits.get(m);
return blockLimits.containsKey(m) && blockCounts.getOrDefault(m, 0) >= blockLimits.get(m);
}
public boolean isBlockLimited(Material m) {