HuskLegacy
/
HuskSync
forked from public-mirrors/HuskSync
1
0
Fork 0
Code Pull Requests Activity

feat: correctly apply keyed attribute modifiers, close #326

Browse Source 
We need to construct attributes with their key if possible to avoid stacking. Uses reflection :( to do this.

Also adds a bit of error checking to health scale syncing
feat/data-edit-commands 3.6.4
William 5 months ago
parent 3d10b2324f
commit 2fcd58fc18
No known key found for this signature in database
4 changed files with 86 additions and 37 deletions
Show Stats Download Patch File Download Diff File

89
bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
Unescape Escape View File

@ -25,6 +25,7 @@ import com.google.gson.annotations.SerializedName;
import de.tr7zw.changeme.nbtapi.NBTCompound; import de.tr7zw.changeme.nbtapi.NBTCompound;
import de.tr7zw.changeme.nbtapi.NBTPersistentDataContainer; import de.tr7zw.changeme.nbtapi.NBTPersistentDataContainer;
import lombok.*; import lombok.*;
import net.kyori.adventure.util.TriState;
import net.william278.desertwell.util.ThrowingConsumer; import net.william278.desertwell.util.ThrowingConsumer;
import net.william278.desertwell.util.Version; import net.william278.desertwell.util.Version;
import net.william278.husksync.BukkitHuskSync; import net.william278.husksync.BukkitHuskSync;
@ -35,6 +36,7 @@ import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Registry; import org.bukkit.Registry;
import org.bukkit.Statistic; import org.bukkit.Statistic;
import org.bukkit.NamespacedKey;
import org.bukkit.advancement.AdvancementProgress; import org.bukkit.advancement.AdvancementProgress;
import org.bukkit.attribute.AttributeInstance; import org.bukkit.attribute.AttributeInstance;
import org.bukkit.attribute.AttributeModifier; import org.bukkit.attribute.AttributeModifier;
@ -565,6 +567,11 @@ public abstract class BukkitData implements Data {
@NoArgsConstructor(access = AccessLevel.PRIVATE) @NoArgsConstructor(access = AccessLevel.PRIVATE)
public static class Attributes extends BukkitData implements Data.Attributes, Adaptable { public static class Attributes extends BukkitData implements Data.Attributes, Adaptable {
private static final String EQUIPMENT_SLOT_GROUP = "org.bukkit.inventory.EquipmentSlotGroup";
private static final String EQUIPMENT_SLOT_GROUP$ANY = "ANY";
private static final String EQUIPMENT_SLOT$getGroup = "getGroup";
private static TriState USE_KEYED_MODIFIERS = TriState.NOT_SET;
private List<Attribute> attributes; private List<Attribute> attributes;
@NotNull @NotNull
@ -572,12 +579,12 @@ public abstract class BukkitData implements Data {
final List<Attribute> attributes = Lists.newArrayList(); final List<Attribute> attributes = Lists.newArrayList();
Registry.ATTRIBUTE.forEach(id -> { Registry.ATTRIBUTE.forEach(id -> {
final AttributeInstance instance = player.getAttribute(id); final AttributeInstance instance = player.getAttribute(id);
if (instance == null || instance.getValue() == instance.getDefaultValue() || plugin if (instance == null || Double.compare(instance.getValue(), instance.getDefaultValue()) == 0
.getSettings().getSynchronization().isIgnoredAttribute(id.getKey().toString())) { || plugin.getSettings().getSynchronization().isIgnoredAttribute(id.getKey().toString())) {
// We don't sync unmodified or disabled attributes // We don't sync unmodified or disabled attributes
return; return;
} }
attributes.add(adapt(instance, plugin.getMinecraftVersion())); attributes.add(adapt(instance));
}); });
return new BukkitData.Attributes(attributes); return new BukkitData.Attributes(attributes);
} }
@ -596,18 +603,18 @@ public abstract class BukkitData implements Data {
} }
@NotNull @NotNull
private static Attribute adapt(@NotNull AttributeInstance instance, @NotNull Version version) { private static Attribute adapt(@NotNull AttributeInstance instance) {
return new Attribute( return new Attribute(
instance.getAttribute().getKey().toString(), instance.getAttribute().getKey().toString(),
instance.getBaseValue(), instance.getBaseValue(),
instance.getModifiers().stream().map(m -> adapt(m, version)).collect(Collectors.toSet()) instance.getModifiers().stream().map(BukkitData.Attributes::adapt).collect(Collectors.toSet())
); );
} }
@NotNull @NotNull
private static Modifier adapt(@NotNull AttributeModifier modifier, @NotNull Version version) { private static Modifier adapt(@NotNull AttributeModifier modifier) {
return new Modifier( return new Modifier(
version.compareTo(Version.fromString("1.21")) >= 0 ? null : modifier.getUniqueId(), getModifierId(modifier),
modifier.getName(), modifier.getName(),
modifier.getAmount(), modifier.getAmount(),
modifier.getOperation().ordinal(), modifier.getOperation().ordinal(),
@ -615,26 +622,67 @@ public abstract class BukkitData implements Data {
); );
} }
@Override @Nullable
public void apply(@NotNull BukkitUser user, @NotNull BukkitHuskSync plugin) throws IllegalStateException { private static UUID getModifierId(@NotNull AttributeModifier modifier) {
Registry.ATTRIBUTE.forEach(id -> applyAttribute(user.getPlayer().getAttribute(id), getAttribute(id).orElse(null))); try {
return UUID.fromString(modifier.getName());
} catch (Throwable e) {
return null;
}
} }
private static void applyAttribute(@Nullable AttributeInstance instance, @Nullable Attribute attribute) { private static void applyAttribute(@Nullable AttributeInstance instance, @Nullable Attribute attribute,
@NotNull HuskSync plugin) {
if (instance == null) { if (instance == null) {
return; return;
} }
instance.setBaseValue(attribute == null ? instance.getDefaultValue() : attribute.baseValue()); instance.setBaseValue(attribute == null ? instance.getDefaultValue() : attribute.baseValue());
instance.getModifiers().forEach(instance::removeModifier); instance.getModifiers().forEach(instance::removeModifier);
if (attribute != null) { if (attribute != null) {
attribute.modifiers().forEach(modifier -> instance.addModifier(new AttributeModifier( attribute.modifiers().forEach(modifier -> instance.addModifier(adapt(modifier, plugin)));
modifier.uuid(), }
modifier.name(), }
modifier.amount(),
AttributeModifier.Operation.values()[modifier.operationType()], @SuppressWarnings("JavaReflectionMemberAccess")
modifier.equipmentSlot() != -1 ? EquipmentSlot.values()[modifier.equipmentSlot()] : null @NotNull
))); private static AttributeModifier adapt(@NotNull Modifier modifier, @NotNull HuskSync plugin) {
final int slotId = modifier.equipmentSlot();
if (USE_KEYED_MODIFIERS == TriState.NOT_SET) {
USE_KEYED_MODIFIERS = TriState.byBoolean(plugin.getMinecraftVersion()
.compareTo(Version.fromString("1.21")) >= 0);
}
if (USE_KEYED_MODIFIERS == TriState.TRUE) {
try {
// Reflexively create a modern keyed attribute modifier instance. Remove in favor of API long-term.
final EquipmentSlot slot = slotId != -1 ? EquipmentSlot.values()[slotId] : null;
final Class<?> slotGroup = Class.forName(EQUIPMENT_SLOT_GROUP);
return AttributeModifier.class.getDeclaredConstructor(
NamespacedKey.class, double.class, AttributeModifier.Operation.class, slotGroup
).newInstance(
NamespacedKey.fromString(modifier.name()), modifier.amount(),
AttributeModifier.Operation.values()[modifier.operationType()],
slot == null ? slotGroup.getField(EQUIPMENT_SLOT_GROUP$ANY).get(null)
: EquipmentSlot.class.getDeclaredMethod(EQUIPMENT_SLOT$getGroup).invoke(slot)
);
} catch (Throwable e) {
plugin.log(Level.WARNING, "Error reflectively creating keyed attribute modifier", e);
USE_KEYED_MODIFIERS = TriState.FALSE;
}
} }
return new AttributeModifier(
modifier.uuid(),
modifier.name(),
modifier.amount(),
AttributeModifier.Operation.values()[modifier.operationType()],
slotId != -1 ? EquipmentSlot.values()[slotId] : null
);
}
@Override
public void apply(@NotNull BukkitUser user, @NotNull BukkitHuskSync plugin) throws IllegalStateException {
Registry.ATTRIBUTE.forEach(id -> applyAttribute(
user.getPlayer().getAttribute(id), getAttribute(id).orElse(null), plugin
));
} }
} }
@ -696,11 +744,12 @@ public abstract class BukkitData implements Data {
} }
// Set health scale // Set health scale
double scale = healthScale <= 0 ? player.getMaxHealth() : healthScale;
try { try {
player.setHealthScale(healthScale); player.setHealthScale(scale);
player.setHealthScaled(isHealthScaled); player.setHealthScaled(isHealthScaled);
} catch (Throwable e) { } catch (Throwable e) {
plugin.log(Level.WARNING, "Error setting %s's health scale to %s".formatted(player.getName(), healthScale), e); plugin.log(Level.WARNING, "Error setting %s's health scale to %s".formatted(player.getName(), scale), e);
} }
} }

30
common/src/main/java/net/william278/husksync/data/Data.java
Unescape Escape View File

@ -155,14 +155,14 @@ public interface Data {
*/ */
interface Advancements extends Data { interface Advancements extends Data {
String RECIPE_ADVANCEMENT = "minecraft:recipe";
@NotNull @NotNull
List<Advancement> getCompleted(); List<Advancement> getCompleted();
@NotNull @NotNull
default List<Advancement> getCompletedExcludingRecipes() { default List<Advancement> getCompletedExcludingRecipes() {
return getCompleted().stream() return getCompleted().stream().filter(adv -> !adv.getKey().startsWith(RECIPE_ADVANCEMENT)).toList();
.filter(advancement -> !advancement.getKey().startsWith("minecraft:recipe"))
.collect(Collectors.toList());
} }
void setCompleted(@NotNull List<Advancement> completed); void setCompleted(@NotNull List<Advancement> completed);
@ -191,13 +191,13 @@ public interface Data {
@NotNull @NotNull
private static Map<String, Long> adaptDateMap(@NotNull Map<String, Date> dateMap) { private static Map<String, Long> adaptDateMap(@NotNull Map<String, Date> dateMap) {
return dateMap.entrySet().stream() return dateMap.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getTime())); .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getTime()));
} }
@NotNull @NotNull
private static Map<String, Date> adaptLongMap(@NotNull Map<String, Long> dateMap) { private static Map<String, Date> adaptLongMap(@NotNull Map<String, Long> dateMap) {
return dateMap.entrySet().stream() return dateMap.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e -> new Date(e.getValue()))); .collect(Collectors.toMap(Map.Entry::getKey, e -> new Date(e.getValue())));
} }
@NotNull @NotNull
@ -250,9 +250,9 @@ public interface Data {
void setWorld(@NotNull World world); void setWorld(@NotNull World world);
record World( record World(
@SerializedName("name") @NotNull String name, @SerializedName("name") @NotNull String name,
@SerializedName("uuid") @NotNull UUID uuid, @SerializedName("uuid") @NotNull UUID uuid,
@SerializedName("environment") @NotNull String environment @SerializedName("environment") @NotNull String environment
) { ) {
} }
} }
@ -324,9 +324,9 @@ public interface Data {
List<Attribute> getAttributes(); List<Attribute> getAttributes();
record Attribute( record Attribute(
@NotNull String name, @NotNull String name,
double baseValue, double baseValue,
@NotNull Set<Modifier> modifiers @NotNull Set<Modifier> modifiers
) { ) {
public double getValue() { public double getValue() {
@ -387,8 +387,8 @@ public interface Data {
default Optional<Attribute> getAttribute(@NotNull Key key) { default Optional<Attribute> getAttribute(@NotNull Key key) {
return getAttributes().stream() return getAttributes().stream()
.filter(attribute -> attribute.name().equals(key.asString())) .filter(attribute -> attribute.name().equals(key.asString()))
.findFirst(); .findFirst();
} }
default void removeAttribute(@NotNull Key key) { default void removeAttribute(@NotNull Key key) {
@ -397,8 +397,8 @@ public interface Data {
default double getMaxHealth() { default double getMaxHealth() {
return getAttribute(MAX_HEALTH_KEY) return getAttribute(MAX_HEALTH_KEY)
.map(Attribute::getValue) .map(Attribute::getValue)
.orElse(20.0); .orElse(20.0);
} }
default void setMaxHealth(double maxHealth) { default void setMaxHealth(double maxHealth) {

2
gradle.properties
Unescape Escape View File

@ -3,7 +3,7 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8'
org.gradle.daemon=true org.gradle.daemon=true
javaVersion=17 javaVersion=17
plugin_version=3.6.3 plugin_version=3.6.4
plugin_archive=husksync plugin_archive=husksync
plugin_description=A modern, cross-server player data synchronization system plugin_description=A modern, cross-server player data synchronization system

2
paper/build.gradle
Unescape Escape View File

@ -50,7 +50,7 @@ shadowJar {
tasks { tasks {
runServer { runServer {
minecraftVersion('1.20.4') minecraftVersion('1.21')
downloadPlugins { downloadPlugins {
url('https://download.luckperms.net/1549/bukkit/loader/LuckPerms-Bukkit-5.4.134.jar') url('https://download.luckperms.net/1549/bukkit/loader/LuckPerms-Bukkit-5.4.134.jar')

Write Preview
Loading…
Cancel
Save