Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-02-17 04:02:04 +01:00
Code Issues Projects Releases Wiki Activity

Add a bunch of placeholders, fix a bug in 1.8

Browse Source
This commit is contained in:
Esophose 2019-04-06 22:59:45 -06:00
parent e867b00e58
commit 69e30ef992
6 changed files with 94 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/goodandevil/skyblock/command/commands/island/CloseCommand.java
View File

@ -65,7 +65,7 @@ public class CloseCommand extends SubCommand {
@Override
public String[] getAliases() {
return new String[0];
return new String[] { "lock" };
}
@Override

4
src/main/java/me/goodandevil/skyblock/island/IslandLevel.java
View File

@ -77,8 +77,8 @@ public class IslandLevel {
if (this.materials.containsKey(material)) {
long materialAmount = this.materials.get(material);
if (configLoad.getString("Materials." + materials + ".Points") != null) {
long pointsRequired = config.getFileConfiguration().getLong("Materials." + materials + ".Points");
if (configLoad.getString("Materials." + material + ".Points") != null) {
long pointsRequired = configLoad.getLong("Materials." + material + ".Points");
if (pointsRequired != 0) {
pointsEarned = materialAmount * pointsRequired;

1
src/main/java/me/goodandevil/skyblock/levelling/LevellingManager.java
View File

@ -45,7 +45,6 @@ public class LevellingManager {
int NMSVersion = NMSUtil.getVersionNumber();
new BukkitRunnable() {
@SuppressWarnings("deprecation")
@Override
public void run() {
if (!chunk.isComplete()) return;

2
src/main/java/me/goodandevil/skyblock/listeners/Entity.java
View File

@ -248,6 +248,8 @@ public class Entity implements Listener {
return;
StackableManager stackableManager = SkyBlock.getInstance().getStackableManager();
if (stackableManager == null)
return;
ArmorStand armorStand = event.getRightClicked();
for (Location stackLocation : stackableManager.getStacks().keySet()) {

63
src/main/java/me/goodandevil/skyblock/placeholder/PlaceholderManager.java
View File

@ -7,7 +7,10 @@ import me.goodandevil.skyblock.island.Island;
import me.goodandevil.skyblock.island.IslandManager;
import me.goodandevil.skyblock.island.IslandRole;
import me.goodandevil.skyblock.leaderboard.Leaderboard;
import me.goodandevil.skyblock.levelling.LevellingManager;
import me.goodandevil.skyblock.levelling.LevellingMaterial;
import me.goodandevil.skyblock.utils.NumberUtil;
import me.goodandevil.skyblock.utils.version.Materials;
import me.goodandevil.skyblock.visit.VisitManager;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@ -63,6 +66,7 @@ public class PlaceholderManager {
public String getPlaceholder(Player player, String placeholder) {
IslandManager islandManager = skyblock.getIslandManager();
VisitManager visitManager = skyblock.getVisitManager();
LevellingManager levellingManager = skyblock.getLevellingManager();
Island island = islandManager.getIsland(player);
@ -77,6 +81,19 @@ public class PlaceholderManager {
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_island_exists.Exists.Message"));
}
} else if (placeholder.equalsIgnoreCase("fabledskyblock_island_isopen")) {
if (island == null) {
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_island_isopen.Empty.Message"));
} else {
if (island.isOpen()) {
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_island_isopen.Open.Message"));
} else {
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_island_isopen.Closed.Message"));
}
}
} else if (placeholder.equalsIgnoreCase("fabledskyblock_island_size")) {
if (island == null) {
return ChatColor.translateAlternateColorCodes('&',
@ -289,6 +306,52 @@ public class PlaceholderManager {
configLoad.getString("Placeholder.fabledskyblock_island_bank_balance.Non-empty.Message"))
.replace("%placeholder", "" + island.getBankBalance());
}
} else if (placeholder.toLowerCase().startsWith("fabledskyblock_island_level_block_count_")) {
if (island == null) {
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_island_level_block_count.Empty.Message"));
} else {
String materialName = placeholder.replace("fabledskyblock_island_level_block_count_", "").toUpperCase();
Materials materials = Materials.fromString(materialName);
if (materials == null) {
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_island_level_block_count.Invalid.Message"));
} else {
long blockCount = island.getLevel().getMaterialAmount(materials.name());
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_island_level_block_count.Non-empty.Message")
.replace("%placeholder", NumberUtil.formatNumberByDecimal(blockCount)));
}
}
} else if (placeholder.toLowerCase().startsWith("fabledskyblock_island_level_block_points_")) {
if (island == null) {
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_island_level_block_points.Empty.Message"));
} else {
String materialName = placeholder.replace("fabledskyblock_island_level_block_points_", "").toUpperCase();
Materials materials = Materials.fromString(materialName);
if (materials == null) {
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_island_level_block_points.Invalid.Message"));
} else {
long blockPoints = island.getLevel().getMaterialPoints(materials.name());
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_island_level_block_points.Non-empty.Message")
.replace("%placeholder", NumberUtil.formatNumberByDecimal(blockPoints)));
}
}
} else if (placeholder.toLowerCase().startsWith("fabledskyblock_level_block_value_")) {
String materialName = placeholder.replace("fabledskyblock_level_block_value_", "").toUpperCase();
Materials materials = Materials.fromString(materialName);
if (materials == null) {
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_level_block_value.Invalid.Message"));
} else {
long blockValue = levellingManager.getMaterial(materials).getPoints();
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_level_block_value.Non-empty.Message")
.replace("%placeholder", NumberUtil.formatNumberByDecimal(blockValue)));
}
}
return "";

26
src/main/resources/language.yml
View File

@ -1095,6 +1095,13 @@ Placeholder:
Message: "&atrue"
Not-exists:
Message: "&cfalse"
fabledskyblock_island_isopen:
Empty:
Message: "&cfalse"
Open:
Message: "&atrue"
Closed:
Message: "&cfalse"
fabledskyblock_island_size:
Empty:
Message: "&c0"
@ -1198,6 +1205,25 @@ Placeholder:
Message: "&c0"
Non-empty:
Message: "&f%placeholder"
fabledskyblock_island_level_block_count:
Empty:
Message: "&c0"
Invalid:
Message: "&cInvalid Type"
Non-empty:
Message: "&f%placeholder"
fabledskyblock_island_level_block_points:
Empty:
Message: "&c0"
Invalid:
Message: "&cInvalid Type"
Non-empty:
Message: "&f%placeholder"
fabledskyblock_level_block_value:
Invalid:
Message: "&cInvalid Type"
Non-empty:
Message: "&f%placeholder"
Hologram:
Leaderboard:
Level: