chore: 优化代码

mcchampions · Nov 29, 2024 · 331e99f · 331e99f
1 parent 0294ff5
commit 331e99f
Show file tree

Hide file tree

Showing 143 changed files with 336 additions and 322 deletions.
diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/autocrafter/CrafterSmartPort.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/autocrafter/CrafterSmartPort.java
@@ -129,7 +129,7 @@ public void onPlayerBreak(
         });
     }
 
-    private ItemStack getCountItem() {
+    private static ItemStack getCountItem() {
         ItemStack countItem = new ItemStack(Material.CLOCK);
         ItemMeta im = countItem.getItemMeta();
         im.setDisplayName(ChatColor.BLUE + "合成表的原料数量");

diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/chat/listener/PlayerChatListener.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/chat/listener/PlayerChatListener.java
@@ -10,15 +10,15 @@
 public class PlayerChatListener implements Listener {
     @SuppressWarnings("deprecation")
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onChat(AsyncPlayerChatEvent e) {
+    public static void onChat(AsyncPlayerChatEvent e) {
         Slimefun.getChatCatcher().pollCatcher(e.getPlayer().getUniqueId()).ifPresent(h -> {
             e.setCancelled(true);
             Slimefun.runSync(() -> h.accept(e.getMessage()));
         });
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
-    public void onLeave(PlayerQuitEvent e) {
+    public static void onLeave(PlayerQuitEvent e) {
         Slimefun.getChatCatcher().pollCatcher(e.getPlayer().getUniqueId());
     }
 }
diff --git a/...in/java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/sqlcommon/ConnectionPool.java b/...in/java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/sqlcommon/ConnectionPool.java
@@ -69,11 +69,11 @@ public synchronized void destroy() {
         checkDestroy();
 
         destroyed = true;
-        freeConn.forEach(this::tryClose);
-        usingConn.forEach(this::tryClose);
+        freeConn.forEach(ConnectionPool::tryClose);
+        usingConn.forEach(ConnectionPool::tryClose);
     }
 
-    private boolean testConn(Connection conn) {
+    private static boolean testConn(Connection conn) {
         try (var stmt = conn.createStatement()) {
             stmt.execute("/* ping */ SHOW DATABASES");
             return true;
@@ -88,7 +88,7 @@ private void checkDestroy() {
         }
     }
 
-    private void tryClose(Connection conn) {
+    private static void tryClose(Connection conn) {
         try {
             conn.close();
         } catch (SQLException e) {

diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/common/RecordSet.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/common/RecordSet.java
@@ -3,7 +3,6 @@
 import com.xzavier0722.mc.plugin.slimefun4.storage.util.DataUtils;
 
 import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 

diff --git a/...in/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunUniversalData.java b/...in/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunUniversalData.java
@@ -5,7 +5,6 @@
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 import java.util.logging.Level;

diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/listener/ChunkListener.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/listener/ChunkListener.java
@@ -7,7 +7,7 @@
 
 public class ChunkListener implements Listener {
     @EventHandler
-    public void onChunkLoad(ChunkLoadEvent e) {
+    public static void onChunkLoad(ChunkLoadEvent e) {
         Slimefun.getDatabaseManager().getBlockDataController().loadChunk(e.getChunk(), e.isNewChunk());
     }
 }
diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/listener/WorldListener.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/listener/WorldListener.java
@@ -7,7 +7,7 @@
 
 public class WorldListener implements Listener {
     @EventHandler
-    public void onChunkLoad(WorldLoadEvent e) {
+    public static void onChunkLoad(WorldLoadEvent e) {
         Slimefun.getDatabaseManager().getBlockDataController().loadWorld(e.getWorld());
     }
 }
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/GEOResource.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/GEOResource.java
@@ -2,6 +2,7 @@
 
 import io.github.thebusybiscuit.slimefun4.api.events.GEOResourceGenerationEvent;
 import io.github.thebusybiscuit.slimefun4.core.services.localization.Language;
+import io.github.thebusybiscuit.slimefun4.core.services.localization.SlimefunLocalization;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner;
 import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOScanner;
@@ -55,7 +56,7 @@ public interface GEOResource extends Keyed {
      *
      * @return The name of this Resource
      */
-    
+
     String getName();
 
     /**
@@ -64,7 +65,7 @@ public interface GEOResource extends Keyed {
      *
      * @return The {@link ItemStack} version of this Resource.
      */
-    
+
     ItemStack getItem();
 
     /**
@@ -90,9 +91,9 @@ default void register() {
      *            The {@link Player} to localize the name for.
      * @return The localized name for this {@link GEOResource}
      */
-    
+
     default String getName(Player p) {
-        String name = Slimefun.getLocalization()
+        String name = SlimefunLocalization
                 .getResourceString(p, "resources." + getKey().getNamespace() + "." + getKey().getKey());
         return name == null ? getName() : name;
     }

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/ResourceManager.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/ResourceManager.java
@@ -5,6 +5,7 @@
 import io.github.bakedlibs.dough.config.Config;
 import io.github.bakedlibs.dough.items.CustomItemStack;
 import io.github.thebusybiscuit.slimefun4.api.events.GEOResourceGenerationEvent;
+import io.github.thebusybiscuit.slimefun4.core.services.localization.SlimefunLocalization;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner;
 import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOScanner;
@@ -87,7 +88,7 @@ void register(GEOResource resource) {
      *
      * @return An {@link OptionalInt}, either empty or containing the amount of the given {@link GEOResource}
      */
-    public OptionalInt getSupplies(GEOResource resource, World world, int x, int z) {
+    public static OptionalInt getSupplies(GEOResource resource, World world, int x, int z) {
         String key = resource.getKey().toString().replace(':', '-');
         var chunkData = Slimefun.getDatabaseManager().getBlockDataController().getChunkData(world.getChunkAt(x, z));
         if (chunkData == null) {
@@ -102,7 +103,7 @@ public OptionalInt getSupplies(GEOResource resource, World world, int x, int z)
         }
     }
 
-    public void getSuppliesAsync(GEOResource resource, Chunk chunk, IAsyncReadCallback<Integer> callback) {
+    public static void getSuppliesAsync(GEOResource resource, Chunk chunk, IAsyncReadCallback<Integer> callback) {
         Slimefun.getDatabaseManager().getBlockDataController().getChunkDataAsync(chunk, new IAsyncReadCallback<>() {
             @Override
             public boolean runOnMainThread() {
@@ -140,7 +141,7 @@ public void onResultNotFound() {
      * @param value
      *            The new supply value
      */
-    public void setSupplies(GEOResource resource, World world, int x, int z, int value) {
+    public static void setSupplies(GEOResource resource, World world, int x, int z, int value) {
         String key = resource.getKey().toString().replace(':', '-');
         Slimefun.getDatabaseManager()
                 .getBlockDataController()
@@ -170,7 +171,7 @@ public void onResult(SlimefunChunkData result) {
      *
      * @return The new supply value
      */
-    private int generate(GEOResource resource, World world, int x, int y, int z) {
+    private static int generate(GEOResource resource, World world, int x, int y, int z) {
         // Get the corresponding Block (and Biome)
         Block block = world.getBlockAt(x << 4, y, z << 4);
         Biome biome = block.getBiome();
@@ -224,7 +225,7 @@ public void scan(Player p, Block block, int page) {
         int x = block.getX() >> 4;
         int z = block.getZ() >> 4;
 
-        String title = "§4" + Slimefun.getLocalization().getResourceString(p, "tooltips.results");
+        String title = "§4" + SlimefunLocalization.getResourceString(p, "tooltips.results");
         ChestMenu menu = new ChestMenu(title);
 
         for (int slot : backgroundSlots) {
@@ -235,12 +236,12 @@ public void scan(Player p, Block block, int page) {
                 4,
                 new CustomItemStack(
                         HeadTexture.MINECRAFT_CHUNK.getAsItemStack(),
-                        ChatColor.YELLOW + Slimefun.getLocalization().getResourceString(p, "tooltips.chunk"),
+                        ChatColor.YELLOW + SlimefunLocalization.getResourceString(p, "tooltips.chunk"),
                         "",
                         "§8\u21E8 §7"
-                                + Slimefun.getLocalization().getResourceString(p, "tooltips.world")
-                                + ": "
-                                + block.getWorld().getName(),
+                        + SlimefunLocalization.getResourceString(p, "tooltips.world")
+                        + ": "
+                        + block.getWorld().getName(),
                         "§8\u21E8 §7X: " + x + " Z: " + z),
                 ChestMenuUtils.getEmptyClickHandler());
         List<GEOResource> resources =
@@ -262,7 +263,7 @@ public void scan(Player p, Block block, int page) {
         for (int i = page * 28; i < resources.size() && i < (page + 1) * 28; i++) {
             GEOResource resource = resources.get(i);
             int supplies = supplyMap.get(resource);
-            String suffix = Slimefun.getLocalization()
+            String suffix = SlimefunLocalization
                     .getResourceString(p, ChatUtils.checkPlurality("tooltips.unit", supplies));
 
             ItemStack item = new CustomItemStack(

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java
@@ -228,7 +228,7 @@ public void openTransmitterControlPanel(Player p) {
      *
      * @return An icon for this waypoint
      */
-    public ItemStack getIcon(String name, Environment environment) {
+    public static ItemStack getIcon(String name, Environment environment) {
         if (name.startsWith("player:death ")) {
             return HeadTexture.DEATHPOINT.getAsItemStack();
         } else if (environment == Environment.NETHER) {
@@ -240,7 +240,7 @@ public ItemStack getIcon(String name, Environment environment) {
         }
     }
 
-    private String getStatusText(Player player, int complexity) {
+    private static String getStatusText(Player player, int complexity) {
         if (complexity > 0) {
             return "§2§l" + Slimefun.getLocalization().getMessage(player, "gps.status-online");
         } else {

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/TeleportationManager.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/TeleportationManager.java
@@ -3,6 +3,7 @@
 import io.github.bakedlibs.dough.common.ChatColors;
 import io.github.bakedlibs.dough.items.CustomItemStack;
 import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile;
+import io.github.thebusybiscuit.slimefun4.core.services.localization.SlimefunLocalization;
 import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.Teleporter;
@@ -97,10 +98,10 @@ public void openTeleporterGUI(Player p, UUID ownerUUID, Block b, int complexity)
 
                     String[] lore = {
                         "",
-                        "§8\u21E8 &7"
-                                + Slimefun.getLocalization().getResourceString(p, "tooltips.world")
-                                + ": &f"
-                                + l.getWorld().getName(),
+                            "§8\u21E8 &7"
+                            + SlimefunLocalization.getResourceString(p, "tooltips.world")
+                            + ": &f"
+                            + l.getWorld().getName(),
                         "§8\u21E8 &7X: &f" + l.getX(),
                         "§8\u21E8 &7Y: &f" + l.getY(),
                         "§8\u21E8 &7Z: &f" + l.getZ(),
@@ -161,7 +162,7 @@ public void teleport(UUID uuid, int complexity, Location source, Location destin
      *
      * @return The amount of time the teleportation will take
      */
-    public int getTeleportationTime(int complexity, Location source, Location destination) {
+    public static int getTeleportationTime(int complexity, Location source, Location destination) {
         if (complexity < 100) {
             return 100;
         }
@@ -173,7 +174,7 @@ public int getTeleportationTime(int complexity, Location source, Location destin
         return Math.max(1, unsafeTime);
     }
 
-    private int distanceSquared(Location source, Location destination) {
+    private static int distanceSquared(Location source, Location destination) {
         if (source.getWorld().getUID().equals(destination.getWorld().getUID())) {
             int distance = (int) source.distanceSquared(destination);
             return Math.min(distance, 100_000_000);
@@ -182,7 +183,7 @@ private int distanceSquared(Location source, Location destination) {
         }
     }
 
-    private boolean isValid(@Nullable Player p, Location source) {
+    private static boolean isValid(@Nullable Player p, Location source) {
         return p != null
                 && p.isValid()
                 && p.getWorld().getUID().equals(source.getWorld().getUID())

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/Waypoint.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/Waypoint.java
@@ -2,7 +2,6 @@
 
 import io.github.thebusybiscuit.slimefun4.api.events.WaypointCreateEvent;
 import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile;
-import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.Teleporter;
 import java.util.Objects;
 import java.util.UUID;
@@ -127,7 +126,7 @@ public boolean isDeathpoint() {
      */
 
     public ItemStack getIcon() {
-        return Slimefun.getGPSNetwork().getIcon(name, location.getWorld().getEnvironment());
+        return GPSNetwork.getIcon(name, location.getWorld().getEnvironment());
     }
 
     /**

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemGroup.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemGroup.java
@@ -5,6 +5,7 @@
 import io.github.thebusybiscuit.slimefun4.api.items.groups.LockedItemGroup;
 import io.github.thebusybiscuit.slimefun4.api.items.groups.SeasonalItemGroup;
 import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide;
+import io.github.thebusybiscuit.slimefun4.core.services.localization.SlimefunLocalization;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedItemFlag;
 import java.util.ArrayList;
@@ -149,7 +150,7 @@ public void setTier(int tier) {
     /**
      * This refreshes the {@link ItemGroup} order.
      */
-    private void sortCategoriesByTier() {
+    private static void sortCategoriesByTier() {
         List<ItemGroup> categories = Slimefun.getRegistry().getAllItemGroups();
         categories.sort(Comparator.comparingInt(ItemGroup::getTier));
     }
@@ -207,7 +208,7 @@ public void remove(SlimefunItem item) {
      */
     public ItemStack getItem(Player p) {
         return new CustomItemStack(item, meta -> {
-            String name = Slimefun.getLocalization().getItemGroupName(p, key);
+            String name = SlimefunLocalization.getItemGroupName(p, key);
 
             if (name == null) {
                 name = item.getItemMeta().getDisplayName();
@@ -246,7 +247,7 @@ public String getUnlocalizedName() {
      * @return The localized name of this {@link ItemGroup}
      */
     public String getDisplayName(Player p) {
-        String localized = Slimefun.getLocalization().getItemGroupName(p, key);
+        String localized = SlimefunLocalization.getItemGroupName(p, key);
 
         if (localized != null) {
             return localized;

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java
@@ -174,6 +174,7 @@ public SlimefunItem(ItemGroup itemGroup, SlimefunItemStack item, RecipeType reci
      * @param recipe       An Array representing the recipe of this {@link SlimefunItem}
      * @param recipeOutput The result of crafting this item
      */
+    @SuppressWarnings("DynamicRegexReplaceableByCompiledPattern")
     public SlimefunItem(
             ItemGroup itemGroup,
             SlimefunItemStack item,
@@ -196,6 +197,7 @@ protected SlimefunItem(ItemGroup itemGroup, ItemStack item, String id, RecipeTyp
         this.id = id;
         this.recipeType = recipeType;
         this.recipe = recipe;
+        //noinspection DynamicRegexReplaceableByCompiledPattern
         normalItemName = TextUtils.toPlainText(itemStackTemplate.getItemMeta().getDisplayName()).replaceAll(" ", "_");
     }
 
@@ -520,7 +522,7 @@ private void loadItemHandlers() {
      *
      * @return Whether the original {@link SlimefunItemStack} is immutable.
      */
-    protected boolean isItemStackImmutable() {
+    protected static boolean isItemStackImmutable() {
         return true;
     }
 
@@ -529,7 +531,7 @@ protected boolean isItemStackImmutable() {
      *
      * @param addon The {@link SlimefunAddon} trying to register this {@link SlimefunItem}
      */
-    private void checkDependencies(SlimefunAddon addon) {
+    private static void checkDependencies(SlimefunAddon addon) {
         if (!addon.hasDependency("Slimefun")) {
             throw new MissingDependencyException(addon, "Slimefun");
         }
@@ -894,7 +896,7 @@ public void error(String message, Throwable throwable) {
      *
      * @param player The {@link Player} to inform.
      */
-    public void sendDeprecationWarning(Player player) {
+    public static void sendDeprecationWarning(Player player) {
         Slimefun.getLocalization().sendMessage(player, "messages.deprecated-item");
     }
 

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java
@@ -260,7 +260,7 @@ public void setBackpackCount(int count) {
         Slimefun.getDatabaseManager().getProfileDataController().saveProfileBackpackCount(this);
     }
 
-    private int countNonEmptyResearches(Collection<Research> researches) {
+    private static int countNonEmptyResearches(Collection<Research> researches) {
         int count = 0;
         for (Research research : researches) {
             if (research.hasEnabledItems()) {

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/recipes/RecipeType.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/recipes/RecipeType.java
@@ -5,6 +5,7 @@
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
 import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine;
+import io.github.thebusybiscuit.slimefun4.core.services.localization.SlimefunLocalization;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
 import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AltarRecipe;
@@ -228,7 +229,7 @@ public void unregister(ItemStack[] recipe, ItemStack result) {
     }
 
     public ItemStack getItem(Player p) {
-        return Slimefun.getLocalization().getRecipeTypeItem(p, this);
+        return SlimefunLocalization.getRecipeTypeItem(p, this);
     }
 
     public SlimefunItem getMachine() {