Reorganized code.

Reorganized methods and attributes for better structure and clarity across multiple classes.
TheNextLvl-net · Jan 17, 2025 · d7d0a54 · d7d0a54
1 parent 8aaef56
commit d7d0a54
Show file tree

Hide file tree

Showing 16 changed files with 491 additions and 480 deletions.
diff --git a/api/src/main/java/net/thenextlvl/character/Character.java b/api/src/main/java/net/thenextlvl/character/Character.java
@@ -27,6 +27,8 @@ public interface Character<T extends Entity> {
     @Nullable
     Component getDisplayName();
 
+    void setDisplayName(@Nullable Component displayName);
+
     EntityType getType();
 
     @Nullable
@@ -35,16 +37,22 @@ public interface Character<T extends Entity> {
     @Nullable
     Location getSpawnLocation();
 
+    void setSpawnLocation(@Nullable Location location);
+
     @Unmodifiable
     Map<String, ClickAction<?>> getActions();
 
     @Nullable
     NamedTextColor getGlowColor();
 
+    void setGlowColor(@Nullable NamedTextColor color);
+
     Optional<T> getEntity();
 
     Pose getPose();
 
+    void setPose(Pose pose);
+
     @Unmodifiable
     Set<UUID> getViewers();
 
@@ -71,22 +79,34 @@ public interface Character<T extends Entity> {
 
     boolean isCollidable();
 
+    void setCollidable(boolean collidable);
+
     boolean isDisplayNameVisible();
 
+    void setDisplayNameVisible(boolean visible);
+
     boolean isInvincible();
 
+    void setInvincible(boolean invincible);
+
     boolean isPersistent();
 
+    void setPersistent(boolean persistent);
+
     boolean isSpawned();
 
     boolean isTicking();
 
+    void setTicking(boolean ticking);
+
     boolean isTrackedBy(Player player);
 
     boolean isViewer(UUID player);
 
     boolean isVisibleByDefault();
 
+    void setVisibleByDefault(boolean visible);
+
     boolean persist();
 
     boolean removeAction(String name);
@@ -105,25 +125,5 @@ public interface Character<T extends Entity> {
 
     void remove();
 
-    void setCollidable(boolean collidable);
-
-    void setDisplayName(@Nullable Component displayName);
-
-    void setDisplayNameVisible(boolean visible);
-
-    void setGlowColor(@Nullable NamedTextColor color);
-
     void setGravity(boolean gravity);
-
-    void setInvincible(boolean invincible);
-
-    void setPersistent(boolean persistent);
-
-    void setPose(Pose pose);
-
-    void setSpawnLocation(@Nullable Location location);
-
-    void setTicking(boolean ticking);
-
-    void setVisibleByDefault(boolean visible);
 }
diff --git a/api/src/main/java/net/thenextlvl/character/PlayerCharacter.java b/api/src/main/java/net/thenextlvl/character/PlayerCharacter.java
@@ -18,19 +18,19 @@ public interface PlayerCharacter extends Character<Player> {
 
     SkinParts getSkinParts();
 
+    void setSkinParts(SkinParts builder);
+
     UUID getUniqueId();
 
     boolean clearTextures();
 
     boolean isListed();
 
-    boolean isRealPlayer();
-
-    boolean setTextures(String value, @Nullable String signature);
-
     void setListed(boolean listed);
 
+    boolean isRealPlayer();
+
     void setRealPlayer(boolean real);
 
-    void setSkinParts(SkinParts builder);
+    boolean setTextures(String value, @Nullable String signature);
 }
diff --git a/api/src/main/java/net/thenextlvl/character/action/ClickAction.java b/api/src/main/java/net/thenextlvl/character/action/ClickAction.java
@@ -12,11 +12,12 @@
 
 @NullMarked
 public class ClickAction<T> {
+    private final ActionType<T> actionType;
+    private final Map<Player, Long> cooldowns = new WeakHashMap<>();
     private @Nullable String permission;
     private EnumSet<ClickType> clickTypes;
     private Duration cooldown;
     private T input;
-    private final ActionType<T> actionType;
 
     public ClickAction(ActionType<T> actionType, EnumSet<ClickType> clickTypes, T input) {
         this(actionType, clickTypes, input, Duration.ZERO, null);
@@ -30,54 +31,40 @@ public ClickAction(ActionType<T> actionType, EnumSet<ClickType> clickTypes, T in
         this.permission = permission;
     }
 
-    private final Map<Player, Long> cooldowns = new WeakHashMap<>();
-
-    public boolean isOnCooldown(Player player) {
-        return cooldown.isPositive() && cooldowns.computeIfPresent(player, (ignored, lastUsed) -> {
-            if (System.currentTimeMillis() - cooldown.toMillis() > lastUsed) return null;
-            return lastUsed;
-        }) != null;
-    }
-
     public boolean resetCooldown(Player player) {
         return cooldowns.remove(player) != null;
     }
 
-    public boolean canInvoke(Player player) {
-        return (permission == null || player.hasPermission(permission)) && !isOnCooldown(player);
-    }
-
     public boolean invoke(Player player) {
         if (!canInvoke(player)) return false;
         if (cooldown.isPositive()) cooldowns.put(player, System.currentTimeMillis());
         actionType.invoke(player, input);
         return true;
     }
 
-    public boolean isSupportedClickType(ClickType type) {
-        return clickTypes.contains(type);
+    public boolean canInvoke(Player player) {
+        return (permission == null || player.hasPermission(permission)) && !isOnCooldown(player);
     }
 
-    public void setClickTypes(EnumSet<ClickType> clickTypes) {
-        this.clickTypes = clickTypes;
+    public boolean isOnCooldown(Player player) {
+        return cooldown.isPositive() && cooldowns.computeIfPresent(player, (ignored, lastUsed) -> {
+            if (System.currentTimeMillis() - cooldown.toMillis() > lastUsed) return null;
+            return lastUsed;
+        }) != null;
     }
 
-    public void setCooldown(Duration cooldown) {
-        this.cooldown = cooldown;
+    public boolean isSupportedClickType(ClickType type) {
+        return clickTypes.contains(type);
     }
 
-    public void setInput(T input) {
-        this.input = input;
+    public @Nullable String getPermission() {
+        return permission;
     }
 
     public void setPermission(@Nullable String permission) {
         this.permission = permission;
     }
 
-    public @Nullable String getPermission() {
-        return permission;
-    }
-
     public ActionType<T> getActionType() {
         return actionType;
     }
@@ -86,14 +73,31 @@ public Duration getCooldown() {
         return cooldown;
     }
 
+    public void setCooldown(Duration cooldown) {
+        this.cooldown = cooldown;
+    }
+
     public EnumSet<ClickType> getClickTypes() {
         return clickTypes;
     }
 
+    public void setClickTypes(EnumSet<ClickType> clickTypes) {
+        this.clickTypes = clickTypes;
+    }
+
     public T getInput() {
         return input;
     }
 
+    public void setInput(T input) {
+        this.input = input;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(permission, clickTypes, cooldown, input, actionType, cooldowns);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
@@ -104,9 +108,4 @@ public boolean equals(Object o) {
                && Objects.equals(input, that.input)
                && Objects.equals(actionType, that.actionType);
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(permission, clickTypes, cooldown, input, actionType, cooldowns);
-    }
 }