Merge pull request TuffNetwork#2 from TuffNetwork/inspird-dev

optomize

Author: dragon731012

src/main/java/net/potato/tuff/ChunkSectionKey.java

@@ -3,67 +3,65 @@
 import java.util.Objects;
 import java.util.UUID;
 
-// formats stuff to be good boy strings
-
 public final class ChunkSectionKey {
-    private final UUID playerId;
-    private final String worldName;
-    private final int cx;
-    private final int cz;
-    private final int sectionY;
+    private final UUID p;
+    private final String w;
+    private final int x;
+    private final int z;
+    private final int y;
 
-    public ChunkSectionKey(UUID playerId, String worldName, int cx, int cz, int sectionY) {
-        this.playerId = playerId;
-        this.worldName = worldName;
-        this.cx = cx;
-        this.cz = cz;
-        this.sectionY = sectionY;
+    public ChunkSectionKey(UUID p, String w, int x, int z, int y) {
+        this.p = p;
+        this.w = w;
+        this.x = x;
+        this.z = z;
+        this.y = y;
     }
 
-    public UUID playerId() {
-        return playerId;
+    public UUID p() {
+        return p;
     }
 
-    public String worldName() {
-        return worldName;
+    public String w() {
+        return w;
     }
 
-    public int cx() {
-        return cx;
+    public int x() {
+        return x;
     }
 
-    public int cz() {
-        return cz;
+    public int z() {
+        return z;
     }
 
-    public int sectionY() {
-        return sectionY;
+    public int y() {
+        return y;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (obj == this) return true;
-        if (obj == null || obj.getClass() != this.getClass()) return false;
-        var that = (ChunkSectionKey) obj;
-        return Objects.equals(this.playerId, that.playerId) &&
-                Objects.equals(this.worldName, that.worldName) &&
-                this.cx == that.cx &&
-                this.cz == that.cz &&
-                this.sectionY == that.sectionY;
+    public boolean equals(Object o) {
+        if (o == this) return true;
+        if (o == null || o.getClass() != this.getClass()) return false;
+        var t = (ChunkSectionKey) o;
+        return Objects.equals(p, t.p) &&
+                Objects.equals(w, t.w) &&
+                x == t.x &&
+                z == t.z &&
+                y == t.y;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(playerId, worldName, cx, cz, sectionY);
+        return Objects.hash(p, w, x, z, y);
     }
 
     @Override
     public String toString() {
         return "ChunkSectionKey[" +
-                "playerId=" + playerId + ", " +
-                "worldName=" + worldName + ", " +
-                "cx=" + cx + ", " +
-                "cz=" + cz + ", " +
-                "sectionY=" + sectionY + ']';
+                "p=" + p + ", " +
+                "w=" + w + ", " +
+                "x=" + x + ", " +
+                "z=" + z + ", " +
+                "y=" + y + ']';
     }
-}
+}

src/main/java/net/potato/tuff/LegacyBlockIdManager.java

@@ -2,44 +2,42 @@
 
 import org.bukkit.Material;
 import org.bukkit.plugin.Plugin;
-
-import java.util.HashSet;
-import java.util.Set;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 
 public class LegacyBlockIdManager {
 
-    private static final short[] ID_CACHE = new short[Material.values().length];
-    private static final Set<String> unmappedBlocks = new HashSet<>();
-    private static boolean initialized = false;
+    private static final short[] IC = new short[Material.values().length];
+    private static final ObjectOpenHashSet<String> UB = new ObjectOpenHashSet<>();
+    private static boolean I = false;
 
-    public static void initialize(Plugin plugin) {
-        if (initialized) return;
+    public static void initialize(Plugin p) {
+        if (I) return;
 
-        for (Material material : Material.values()) {
-            if (!material.isBlock()) {
-                ID_CACHE[material.ordinal()] = 0; // Air
+        for (Material m : Material.values()) {
+            if (!m.isBlock()) {
+                IC[m.ordinal()] = 0;
                 continue;
             }
 
-            String blockName = material.name().toLowerCase();
-            int id = LegacyBlockIds.BLOCK_ID_MAP.getOrDefault(blockName, -1);
-            int meta = LegacyBlockIds.BLOCK_META_MAP.getOrDefault(blockName, 0);
+            String bn = m.name().toLowerCase();
+            int id = LegacyBlockIds.BLOCK_ID_MAP.getOrDefault(bn, -1);
+            int mt = LegacyBlockIds.BLOCK_META_MAP.getOrDefault(bn, 0);
 
             if (id == -1) {
                 id = 1; 
-                if (unmappedBlocks.add(blockName)) {
-                    plugin.getLogger().warning("Unmapped block: " + blockName + ". Defaulting to stone (ID=1).");
+                if (UB.add(bn)) {
+                    p.getLogger().warning("Unmapped block: " + bn + ". Defaulting to stone (ID=1).");
                 }
             }
 
-            ID_CACHE[material.ordinal()] = (short) ((id & 0xFFF) | ((meta & 0xF) << 12));
+            IC[m.ordinal()] = (short) ((id & 0xFFF) | ((mt & 0xF) << 12));
         }
 
-        initialized = true;
-        plugin.getLogger().info("Legacy Block ID cache initialized successfully.");
+        I = true;
+        p.getLogger().info("Legacy Block ID cache initialized successfully.");
     }
 
-    public static short getLegacyShort(Material material) {
-        return ID_CACHE[material.ordinal()];
+    public static short getLegacyShort(Material m) {
+        return IC[m.ordinal()];
     }
-}
+}