Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-19 14:59:21 +00:00
Code Issues Releases Activity

refactor: adjust modifier slot group methods

Browse Source
This commit is contained in:
William
2024-08-26 14:10:02 +01:00
parent bd560fcc99
commit 347d2d0a8f
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
View File

@@ -636,7 +636,7 @@ public abstract class BukkitData implements Data {
Objects.requireNonNull(NamespacedKey.fromString(modifier.name())),
modifier.amount(),
AttributeModifier.Operation.values()[modifier.operation()],
modifier.equipmentSlotGroup().map(EquipmentSlotGroup::getByName).orElse(EquipmentSlotGroup.ANY)
Optional.ofNullable(EquipmentSlotGroup.getByName(modifier.slotGroup())).orElse(EquipmentSlotGroup.ANY)
);
}

21
common/src/main/java/net/william278/husksync/data/Data.java
View File

@@ -23,7 +23,6 @@ import com.google.common.collect.Sets;
import com.google.gson.annotations.SerializedName;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
import lombok.experimental.Accessors;
import net.kyori.adventure.key.Key;
@@ -342,15 +341,13 @@ public interface Data {
@Getter
@Accessors(fluent = true)
@RequiredArgsConstructor
@NoArgsConstructor
final class Modifier {
final static String ANY_EQUIPMENT_SLOT_GROUP = "any";
@Getter(AccessLevel.NONE)
@Nullable
@SerializedName("uuid")
@Deprecated(since = "3.7")
private UUID uuid;
private UUID uuid = null;
// Since 1.21.1: Name, amount, operation, slotGroup
@SerializedName("name")
@@ -366,10 +363,8 @@ public interface Data {
@Deprecated(since = "3.7")
private int equipmentSlot;
@Getter(AccessLevel.NONE)
@SerializedName("equipment_slot_group")
@Nullable
private String slotGroup;
private String slotGroup = ANY_EQUIPMENT_SLOT_GROUP;
public Modifier(@NotNull String name, double amount, int operation, @NotNull String slotGroup) {
this.name = name;
@@ -378,14 +373,6 @@ public interface Data {
this.slotGroup = slotGroup;
}
@Deprecated(since = "3.7")
public Modifier(@NotNull String name, double amount, int operation, int equipmentSlot) {
this.name = name;
this.amount = amount;
this.operation = operation;
this.equipmentSlot = equipmentSlot;
}
@Deprecated(since = "3.7")
public Modifier(@NotNull UUID uuid, @NotNull String name, double amount, int operation, int equipmentSlot) {
this.name = name;
@@ -423,10 +410,6 @@ public interface Data {
return uuid != null ? uuid : UUID.nameUUIDFromBytes(name.getBytes());
}
Optional<String> equipmentSlotGroup() {
return Optional.ofNullable(slotGroup);
}
}
default Optional<Attribute> getAttribute(@NotNull Key key) {