From e4bb038e1d3b0e459694a1a4884a2908442035bf Mon Sep 17 00:00:00 2001 From: Snabeldier <79211348+Snabeldier@users.noreply.github.com> Date: Wed, 18 Dec 2024 01:40:51 +0100 Subject: [PATCH] small changes --- src/main/java/minevalley/core/api/ChatMenu.java | 9 +-------- src/main/java/minevalley/core/api/Registrant.java | 4 +++- src/main/java/minevalley/core/api/users/Purchase.java | 10 +--------- .../java/minevalley/core/api/vehicles/Vehicle.java | 7 +++++-- .../minevalley/core/api/vehicles/VehicleColor.java | 10 ---------- src/main/java/minevalley/core/api/weather/Weather.java | 7 +------ 6 files changed, 11 insertions(+), 36 deletions(-) delete mode 100644 src/main/java/minevalley/core/api/vehicles/VehicleColor.java diff --git a/src/main/java/minevalley/core/api/ChatMenu.java b/src/main/java/minevalley/core/api/ChatMenu.java index 20ab95b6..8e9a4fc7 100644 --- a/src/main/java/minevalley/core/api/ChatMenu.java +++ b/src/main/java/minevalley/core/api/ChatMenu.java @@ -1,7 +1,5 @@ package minevalley.core.api; -import lombok.AllArgsConstructor; -import lombok.Getter; import minevalley.core.api.utils.ClickableMessage; public interface ChatMenu { @@ -25,11 +23,6 @@ public interface ChatMenu { */ void disable(int index); - @AllArgsConstructor - @Getter - class Option { - - final String name, hover; - final ClickableMessage clickableMessage; + record Option(String name, String hover, ClickableMessage clickableMessage) { } } \ No newline at end of file diff --git a/src/main/java/minevalley/core/api/Registrant.java b/src/main/java/minevalley/core/api/Registrant.java index cde630e6..3a34cfd1 100644 --- a/src/main/java/minevalley/core/api/Registrant.java +++ b/src/main/java/minevalley/core/api/Registrant.java @@ -36,7 +36,9 @@ public interface Registrant { * @return this registrants name cropped to have a maximum length of 16 characters. */ default String getCroppedName() { - return getName().length() > 16 ? getName().substring(0, 13) + "..." : getName(); + final String name = getName(); + if (name.length() <= 16) return name; + return name.substring(0, 13) + "..."; } /** diff --git a/src/main/java/minevalley/core/api/users/Purchase.java b/src/main/java/minevalley/core/api/users/Purchase.java index e1a31275..fd5aea11 100644 --- a/src/main/java/minevalley/core/api/users/Purchase.java +++ b/src/main/java/minevalley/core/api/users/Purchase.java @@ -1,14 +1,6 @@ package minevalley.core.api.users; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public class Purchase { - - private final String code; - private final Type type; +public record Purchase(String code, Type type) { public enum Type { CAR_SKIN, diff --git a/src/main/java/minevalley/core/api/vehicles/Vehicle.java b/src/main/java/minevalley/core/api/vehicles/Vehicle.java index f6096687..e4d8900b 100644 --- a/src/main/java/minevalley/core/api/vehicles/Vehicle.java +++ b/src/main/java/minevalley/core/api/vehicles/Vehicle.java @@ -16,9 +16,9 @@ public interface Vehicle { int getDurability(); - VehicleColor getColor(); + Color getColor(); - void changeColor(VehicleColor color); + void changeColor(Color color); void createNewKey(OnlineUser user); @@ -51,4 +51,7 @@ public interface Vehicle { default boolean isLoaded() { return getLoadedVehicle() != null; } + + record Color(String name, String hex) { + } } \ No newline at end of file diff --git a/src/main/java/minevalley/core/api/vehicles/VehicleColor.java b/src/main/java/minevalley/core/api/vehicles/VehicleColor.java deleted file mode 100644 index 4b610feb..00000000 --- a/src/main/java/minevalley/core/api/vehicles/VehicleColor.java +++ /dev/null @@ -1,10 +0,0 @@ -package minevalley.core.api.vehicles; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public class VehicleColor { - private final String name, hex; -} \ No newline at end of file diff --git a/src/main/java/minevalley/core/api/weather/Weather.java b/src/main/java/minevalley/core/api/weather/Weather.java index e83d13df..b9262282 100644 --- a/src/main/java/minevalley/core/api/weather/Weather.java +++ b/src/main/java/minevalley/core/api/weather/Weather.java @@ -4,12 +4,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter -@RequiredArgsConstructor -public class Weather { - - private final Type type; - private final int temperature; +public record Weather(Type type, int temperature) { @Getter @RequiredArgsConstructor(access = AccessLevel.PRIVATE)