mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

[CI skip] Reduced technical debt

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-04-09 03:18:14 +02:00
parent 75471eef62
commit 8f698bebee
11 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java
View File

@ -2,6 +2,7 @@ package io.github.thebusybiscuit.slimefun4.api.gps;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@ -166,7 +167,7 @@ public class GPSNetwork {
menu.addItem(slot, new CustomItem(globe, entry.getKey().replace("player:death ", ""), "&8\u21E8 &7World: &r" + l.getWorld().getName(), "&8\u21E8 &7X: &r" + l.getX(), "&8\u21E8 &7Y: &r" + l.getY(), "&8\u21E8 &7Z: &r" + l.getZ(), "", "&8\u21E8 &cClick to delete"));
menu.addMenuClickHandler(slot, (pl, slotn, item, action) -> {
String id = ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', entry.getKey())).toUpperCase().replace(' ', '_');
String id = ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', entry.getKey())).toUpperCase(Locale.ROOT).replace(' ', '_');
Config cfg = new Config(WAYPOINTS_DIRECTORY + pl.getUniqueId().toString() + ".yml");
cfg.setValue(id, null);
cfg.save();
@ -214,7 +215,7 @@ public class GPSNetwork {
}
Config cfg = new Config(WAYPOINTS_DIRECTORY + p.getUniqueId().toString() + ".yml");
String id = ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', name)).toUpperCase().replace(' ', '_');
String id = ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', name)).toUpperCase(Locale.ROOT).replace(' ', '_');
cfg.setValue(id, l);
cfg.setValue(id + ".name", name);

5
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
View File

@ -3,6 +3,7 @@ package io.github.thebusybiscuit.slimefun4.implementation.guide;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Optional;
import java.util.logging.Level;
@ -287,7 +288,7 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation {
if (p == null) return;
ChestMenu menu = new ChestMenu(SlimefunPlugin.getLocal().getMessage(p, "guide.search.inventory").replace("%item%", ChatUtils.crop(ChatColor.RESET, input)));
String searchTerm = input.toLowerCase();
String searchTerm = input.toLowerCase(Locale.ROOT);
if (addToHistory) {
profile.getGuideHistory().add(searchTerm);
@ -300,7 +301,7 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation {
int index = 9;
// Find items and add them
for (SlimefunItem item : SlimefunPlugin.getRegistry().getEnabledSlimefunItems()) {
String itemName = ChatColor.stripColor(item.getItemName()).toLowerCase();
String itemName = ChatColor.stripColor(item.getItemName()).toLowerCase(Locale.ROOT);
if (index == 44) break;

9
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/ElevatorPlate.java
View File

@ -107,7 +107,9 @@ public class ElevatorPlate extends SimpleSlimefunItem<BlockUseHandler> {
for (int i = 0; i < floors.size(); i++) {
if (i % 10 == 0) {
if (page != null) book.addPage(page);
if (page != null) {
book.addPage(page);
}
page = new ChatComponent(ChatColors.color(SlimefunPlugin.getLocal().getMessage(p, "machines.ELEVATOR.pick-a-floor")) + "\n");
}
@ -140,7 +142,10 @@ public class ElevatorPlate extends SimpleSlimefunItem<BlockUseHandler> {
page.append(line);
}
book.addPage(page);
if (page != null) {
book.addPage(page);
}
book.open(p);
}

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicianTalisman.java
View File

@ -41,7 +41,7 @@ public class MagicianTalisman extends Talisman {
* @author TheBusyBiscuit
*
*/
public class TalismanEnchantment extends ItemSetting<Boolean> {
public static class TalismanEnchantment extends ItemSetting<Boolean> {
private final Enchantment enchantment;
private final int level;

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/GrapplingHook.java
View File

@ -62,7 +62,7 @@ public class GrapplingHook extends SimpleSlimefunItem<ItemUseHandler> {
b.setLeashHolder(arrow);
boolean state = item.getType() != Material.SHEARS;
SlimefunPlugin.getGrapplingHookListener().addGrapplingHook(uuid, arrow, b, state, despawnTicks.getValue() * 20);
SlimefunPlugin.getGrapplingHookListener().addGrapplingHook(uuid, arrow, b, state, despawnTicks.getValue() * 20L);
}
};
}

1
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
View File

@ -2,7 +2,6 @@ package io.github.thebusybiscuit.slimefun4.implementation.setup;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;

10
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java
View File

@ -7,11 +7,13 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.logging.Level;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.bukkit.Bukkit;
@ -203,7 +205,7 @@ public class TickerTask implements Runnable {
public void info(CommandSender sender) {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&2== &aSlimefun Diagnostic Tool &2=="));
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&6Halted: &e&l" + String.valueOf(halted).toUpperCase()));
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&6Halted: &e&l" + String.valueOf(halted).toUpperCase(Locale.ROOT)));
sender.sendMessage("");
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&6Impact: &e" + toMillis(time, true)));
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&6Ticked Chunks: &e" + chunks));
@ -317,14 +319,14 @@ public class TickerTask implements Runnable {
}
public String toMillis(long nanoseconds, boolean colors) {
String number = decimalFormat.format(time / 1000000F);
String number = decimalFormat.format(nanoseconds / 1000000F);
if (!colors) {
return number;
}
else {
String[] parts = number.split(",|\\.");
return parts[0] + "," + ChatColor.GRAY + parts[1] + "ms";
String[] parts = PatternUtils.NUMBER_SEPERATOR.split(number);
return parts[0] + ',' + ChatColor.GRAY + parts[1] + "ms";
}
}

3
src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChatUtils.java
View File

@ -1,5 +1,6 @@
package io.github.thebusybiscuit.slimefun4.utils;
import java.util.Locale;
import java.util.function.Consumer;
import org.bukkit.ChatColor;
@ -49,7 +50,7 @@ public final class ChatUtils {
public static String humanize(String string) {
StringBuilder builder = new StringBuilder();
String[] segments = string.toLowerCase().split("_");
String[] segments = string.toLowerCase(Locale.ROOT).split("_");
builder.append(Character.toUpperCase(segments[0].charAt(0))).append(segments[0].substring(1));

3
src/main/java/io/github/thebusybiscuit/slimefun4/utils/PatternUtils.java
View File

@ -9,6 +9,7 @@ import java.util.regex.Pattern;
* This class solves that, one compile but many uses!
*
* @author Walshy
* @author TheBusyBiscuit
*
*/
public final class PatternUtils {
@ -24,4 +25,6 @@ public final class PatternUtils {
public static final Pattern ALPHANUMERIC = Pattern.compile("[A-Fa-f0-9]+");
public static final Pattern NUMERIC = Pattern.compile("[0-9]+");
public static final Pattern NUMBER_SEPERATOR = Pattern.compile(",|\\.");
}

4
src/main/java/me/mrCookieSlime/Slimefun/Lists/RecipeType.java
View File

@ -75,7 +75,7 @@ public class RecipeType implements Keyed {
this.machine = machine;
if (machine.length() > 0) {
this.key = new NamespacedKey(SlimefunPlugin.instance, machine.toLowerCase());
this.key = new NamespacedKey(SlimefunPlugin.instance, machine.toLowerCase(Locale.ROOT));
}
else {
this.key = new NamespacedKey(SlimefunPlugin.instance, "unknown");
@ -152,7 +152,7 @@ public class RecipeType implements Keyed {
}
private static void registerMobDrop(ItemStack[] recipe, ItemStack output) {
String mob = ChatColor.stripColor(recipe[4].getItemMeta().getDisplayName()).toUpperCase().replace(' ', '_');
String mob = ChatColor.stripColor(recipe[4].getItemMeta().getDisplayName()).toUpperCase(Locale.ROOT).replace(' ', '_');
EntityType entity = EntityType.valueOf(mob);
Set<ItemStack> dropping = SlimefunPlugin.getRegistry().getMobDrops().getOrDefault(entity, new HashSet<>());
dropping.add(output);

8
src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java
View File

@ -1,6 +1,5 @@
package me.mrCookieSlime.Slimefun.api;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
@ -27,13 +26,6 @@ public final class Slimefun {
private Slimefun() {}
@Deprecated
public static void registerGuideHandler(GuideHandler handler) {
Bukkit.getLogger().log(Level.SEVERE, "The Plugin \"EmeraldEnchants\" is outdated!");
Bukkit.getLogger().log(Level.SEVERE, "Your version will soon stop working.");
Bukkit.getLogger().log(Level.SEVERE, "Update it immediately: https://thebusybiscuit.github.io/builds/TheBusyBiscuit/EmeraldEnchants2/master/");
}
public static Logger getLogger() {
return SlimefunPlugin.instance.getLogger();
}