Better health implementation.

IzzelAliz · IzzelAliz · commit cedd226fcd66 · 2020-08-19T17:59:38.000+08:00
diff --git a/src/api/java/io/izzel/mesmerize/api/DefaultStats.java b/src/api/java/io/izzel/mesmerize/api/DefaultStats.java
@@ -53,6 +53,7 @@ public final class DefaultStats {
     public static final Stats<StatsNumber<Double>> ACCELERATE = singleRelativeStats("accelerate", true);
     public static final Stats<List<StatsSetValue>> STATS_SET = StatsSetValue.STATS;
     public static final Stats<Map<String, StatsValue<?>>> SLOT = SlotStats.STATS;
+    public static final Stats<List<StatsSetValue>> HIDDEN_SET = StatsSetValue.HIDDEN;
 
     @SuppressWarnings("deprecation")
     private static NamespacedKey key(String id) {
diff --git a/src/api/java/io/izzel/mesmerize/api/data/complex/StatsSetValue.java b/src/api/java/io/izzel/mesmerize/api/data/complex/StatsSetValue.java
@@ -98,4 +98,10 @@ public static BiFunction<StatsSetValue, StatsSetValue, StatsSetValue> defaultMer
             .supplying(MultiValue.builder().supplying(StatsSetValue::new).allowSingleNonListValue().buildSupplier())
             .merging(MultiValue.concatMerger())
             .displaying((value, pane) -> value.get().forEach(it -> ElementFactory.instance().displayHolder(it.get(), pane))).build();
+
+    @SuppressWarnings("deprecation")
+    public static final Stats<List<StatsSetValue>> HIDDEN =
+        Stats.builder().key(new NamespacedKey("mesmerize", "hidden"))
+            .supplying(MultiValue.builder().supplying(StatsSetValue::new).allowSingleNonListValue().buildSupplier())
+            .merging(MultiValue.concatMerger()).build();
 }
diff --git a/src/api/java/io/izzel/mesmerize/api/data/stats/SlotStats.java b/src/api/java/io/izzel/mesmerize/api/data/stats/SlotStats.java
@@ -2,15 +2,19 @@
 
 import com.google.common.collect.Lists;
 import io.izzel.mesmerize.api.Stats;
+import io.izzel.mesmerize.api.cause.ContextKeys;
 import io.izzel.mesmerize.api.data.MapValue;
 import io.izzel.mesmerize.api.data.MultiValue;
-import io.izzel.mesmerize.api.data.complex.StatsSetValue;
 import io.izzel.mesmerize.api.data.StringValue;
+import io.izzel.mesmerize.api.data.complex.StatsSetValue;
 import io.izzel.mesmerize.api.display.DisplayPane;
 import io.izzel.mesmerize.api.display.Element;
 import io.izzel.mesmerize.api.service.ElementFactory;
+import io.izzel.mesmerize.api.slot.StatsSlot;
 import io.izzel.mesmerize.api.visitor.StatsHolder;
 import io.izzel.mesmerize.api.visitor.StatsValue;
+import io.izzel.mesmerize.api.visitor.ValueVisitor;
+import io.izzel.mesmerize.api.visitor.VisitMode;
 import org.bukkit.NamespacedKey;
 
 import java.util.List;
@@ -24,7 +28,7 @@ public SlotStats(Map<String, Supplier<StatsValue<?>>> dataTypes) {
     }
 
     public List<String> getSlots() {
-        MultiValue<String, StringValue> value = this.get("node");
+        MultiValue<String, StringValue> value = this.get("slot");
         return Lists.transform(value.get(), StringValue::get);
     }
 
@@ -33,6 +37,32 @@ public StatsHolder getStats() {
         return statsSetValue.get();
     }
 
+    @Override
+    public void accept(ValueVisitor visitor, VisitMode mode) {
+        if (mode == VisitMode.VALUE) {
+            List<StatsSlot> list = visitor.context().get(ContextKeys.SLOT);
+            List<String> restrictions = this.getSlots();
+            boolean found = false;
+            for (StatsSlot slot : list) {
+                for (String restriction : restrictions) {
+                    if (restriction.equals(slot.getId())) {
+                        found = true;
+                        break;
+                    }
+                }
+                if (found) break;
+            }
+            if (found) {
+                this.getStats().accept(visitor.visitStats(), mode);
+            } else {
+                visitor.visitStats().visitEnd();
+            }
+            visitor.visitEnd();
+        } else {
+            super.accept(visitor, mode);
+        }
+    }
+
     @SuppressWarnings("deprecation")
     public static final Stats<Map<String, StatsValue<?>>> STATS =
         Stats.builder()
diff --git a/src/main/java/io/izzel/mesmerize/impl/command/MesmerizeCommand.java b/src/main/java/io/izzel/mesmerize/impl/command/MesmerizeCommand.java
@@ -21,6 +21,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
@@ -35,6 +36,16 @@ public void reload(CommandSender sender, String... args) {
         TLocale.sendTo(sender, "command.reload");
     }
 
+    @SubCommand(permission = "mesmerize.refresh", type = CommandType.PLAYER)
+    public void refresh(Player player, String... args) {
+        EntityEquipment equipment = player.getEquipment();
+        if (equipment != null) {
+            ItemStack itemInMainHand = equipment.getItemInMainHand();
+            ElementFactory.instance().updateLore(itemInMainHand);
+            equipment.setItemInMainHand(itemInMainHand);
+        }
+    }
+
     @SubCommand(permission = "mesmerize.attach", type = CommandType.PLAYER)
     public BaseSubCommand attach = new BaseSubCommand() {
 
diff --git a/src/main/java/io/izzel/mesmerize/impl/event/AttributeListener.java b/src/main/java/io/izzel/mesmerize/impl/event/AttributeListener.java
@@ -13,6 +13,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
+import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -34,6 +35,7 @@ public AttributeListener() {
                 return;
             }
             for (Player player : Bukkit.getOnlinePlayers()) {
+                if (player.isDead() || !player.isValid()) continue;
                 Optional<List<NumberValue<Double>>> regen = DefaultStats.REGENERATION.tryApply(StatsSet.of(player), null);
                 regen.ifPresent(list -> {
                     //noinspection ConstantConditions
@@ -55,6 +57,8 @@ public void onJoin(PlayerJoinEvent event) {
             } else {
                 event.getPlayer().setHealthScaled(false);
             }
+            //noinspection deprecation
+            event.getPlayer().setMaxHealth(health.defaultHealth());
         }
     }
 
@@ -69,10 +73,18 @@ public void onRefresh(StatsRefreshEvent event) {
                 AttributeInstance attribute = livingEntity.getAttribute(Attribute.GENERIC_MAX_HEALTH);
                 if (attribute != null) {
                     HealthSpec healthSpec = ConfigSpec.spec().health();
-                    attribute.setBaseValue(DefaultStats.HEALTH.tryApply(statsSet, event).map(number -> {
-                        double value = number.applyDouble(healthSpec.defaultHealth());
+                    for (AttributeModifier modifier : attribute.getModifiers()) {
+                        if (modifier.getName().equals("mesmerize:health")) {
+                            attribute.removeModifier(modifier);
+                        }
+                    }
+                    double baseHealth = attribute.getValue();
+                    double healthModifier = DefaultStats.HEALTH.tryApply(statsSet, event).map(number -> {
+                        double value = number.applyDouble(baseHealth);
                         return Util.clamp(value, healthSpec.minimalHealth(), healthSpec.maximumHealth());
-                    }).orElse(healthSpec.defaultHealth()));
+                    }).orElse(baseHealth) - baseHealth;
+                    attribute.addModifier(new AttributeModifier("mesmerize:health", healthModifier, AttributeModifier.Operation.ADD_NUMBER));
+                    livingEntity.setHealth(Util.clamp(livingEntity.getHealth(), 0, baseHealth + healthModifier));
                 }
             }
 
diff --git a/src/main/java/io/izzel/mesmerize/impl/service/SimpleStatsService.java b/src/main/java/io/izzel/mesmerize/impl/service/SimpleStatsService.java
@@ -48,10 +48,10 @@ public class SimpleStatsService implements StatsService {
     private final Set<Integer> entityLock = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
     private final CacheLoader<Entity, StatsSet> cacheLoader = entity -> {
-        if (!entity.isValid() || entity.isDead()) {
-            return null;
-        }
         Callable<StatsSet> callable = () -> {
+            if (!entity.isValid() || entity.isDead()) {
+                return null;
+            }
             StatsSet statsSet = new StatsSet();
             newEntityReader(entity).accept(statsSet, VisitMode.VALUE);
             Bukkit.getPluginManager().callEvent(new StatsRefreshEvent(entity, statsSet));
