Implement display.

Author: IzzelAliz

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id "io.izzel.taboolib" version "1.2"
+    id "io.izzel.taboolib" version "1.2" apply false
 }
 
 group 'io.izzel.mesmerize'
@@ -11,6 +11,16 @@ targetCompatibility = 1.8
 
 defaultTasks 'clean', 'build'
 
+repositories {
+    maven { url 'https://papermc.io/repo/repository/maven-public/' }
+    maven { url 'https://hub.spigotmc.org/nexus/content/groups/public/' }
+    mavenCentral()
+    maven { url 'https://repo.codemc.org/repository/maven-public' }
+    maven { url 'http://repo.extendedclip.com/content/repositories/placeholderapi/' }
+}
+
+apply plugin: 'io.izzel.taboolib'
+
 taboolib {
     loaderVersion = '2.2'
     classifier = null
@@ -27,19 +37,13 @@ sourceSets {
     }
 }
 
-repositories {
-    maven { url 'https://hub.spigotmc.org/nexus/content/groups/public/' }
-    mavenCentral()
-    maven { url 'https://repo.codemc.org/repository/maven-public' }
-    maven { url 'http://repo.extendedclip.com/content/repositories/placeholderapi/' }
-}
-
 dependencies {
     apiImplementation 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
     apiImplementation 'org.jetbrains:annotations:19.0.0'
     implementation 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
     implementation 'org.jetbrains:annotations:19.0.0'
     implementation 'com.github.ben-manes.caffeine:caffeine:2.8.5'
+    implementation 'com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT'
     implementation fileTree(dir:'libs',includes:['*jar'])
     taboo 'org.bstats:bstats-bukkit:1.7'
 }

src/api/java/io/izzel/mesmerize/api/data/MapValue.java

@@ -157,10 +157,9 @@ public <V extends MapValue> BiFunction<V, V, V> build(BiFunction<Map<String, Sup
                         }
                     });
                 }
-                return constructor.apply(
-                    ImmutableMap.<String, Supplier<StatsValue<?>>>builder().putAll(a.dataTypes).putAll(b.dataTypes).build(),
-                    map
-                );
+                HashMap<String, Supplier<StatsValue<?>>> hashMap = new HashMap<>(a.dataTypes);
+                hashMap.putAll(b.dataTypes);
+                return constructor.apply(ImmutableMap.copyOf(hashMap), map);
             };
         }
     }

src/api/java/io/izzel/mesmerize/api/data/complex/PermissionValue.java

@@ -87,7 +87,7 @@ public void accept(ValueVisitor visitor, VisitMode mode) {
                 Element nodeElement = factory.createLocaleElement("permission_name." + permissionValue.getPermissionNodes().get(0));
                 subPane.addHeader(factory.createLocaleElement("stats.permission", nodeElement));
                 factory.displayHolder(permissionValue.getStats(), subPane);
-                pane.addElement(pane);
+                pane.addElement(subPane);
             })
             .build();
 }

src/api/java/io/izzel/mesmerize/api/display/DisplayPane.java

@@ -25,5 +25,7 @@ public interface DisplayPane extends Element {
 
     @Nullable Element getPadding();
 
+    void setPadding(Element padding);
+
     @NotNull DisplaySetting getDisplaySetting();
 }

src/api/java/io/izzel/mesmerize/api/display/DisplaySetting.java

@@ -1,5 +1,77 @@
 package io.izzel.mesmerize.api.display;
 
-public class DisplaySetting {
+public class DisplaySetting implements Cloneable {
 
+    private int maxWidth = 30;
+
+    private Layout layout = Layout.LINE;
+
+    private String decimalFormat = "+0.##;-0.##";
+
+    private boolean paddingWithRandomColor = false;
+
+    private String paddingElement = "| ";
+
+    private boolean flattenFirstPadding = true;
+
+    public int maxWidth() {
+        return maxWidth;
+    }
+
+    public void setMaxWidth(int maxWidth) {
+        this.maxWidth = maxWidth;
+    }
+
+    public Layout layout() {
+        return layout;
+    }
+
+    public void setLayout(Layout layout) {
+        this.layout = layout;
+    }
+
+    public String decimalFormat() {
+        return decimalFormat;
+    }
+
+    public void setDecimalFormat(String decimalFormat) {
+        this.decimalFormat = decimalFormat;
+    }
+
+    public boolean paddingWithRandomColor() {
+        return paddingWithRandomColor;
+    }
+
+    public void setPaddingWithRandomColor(boolean paddingWithRandomColor) {
+        this.paddingWithRandomColor = paddingWithRandomColor;
+    }
+
+    public String paddingElement() {
+        return paddingElement;
+    }
+
+    public void setPaddingElement(String paddingElement) {
+        this.paddingElement = paddingElement;
+    }
+
+    public boolean flattenFirstPadding() {
+        return flattenFirstPadding;
+    }
+
+    public void setFlattenFirstPadding(boolean flattenFirstPadding) {
+        this.flattenFirstPadding = flattenFirstPadding;
+    }
+
+    @Override
+    public DisplaySetting clone() {
+        try {
+            return (DisplaySetting) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    public enum Layout {
+        LINE, FLOW
+    }
 }

src/api/java/io/izzel/mesmerize/api/service/ElementFactory.java

@@ -4,13 +4,16 @@
 import io.izzel.mesmerize.api.display.DisplayPane;
 import io.izzel.mesmerize.api.display.Element;
 import io.izzel.mesmerize.api.visitor.StatsHolder;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
 import java.time.Instant;
 
 public interface ElementFactory {
 
+    void updateLore(ItemStack itemStack);
+
     void displayHolder(StatsHolder holder, DisplayPane pane);
 
     DisplayPane createDisplayPane();

src/api/java/io/izzel/mesmerize/api/visitor/impl/AbstractValue.java

@@ -78,8 +78,8 @@ public void visitEnd() {
     }
 
     @Override
-    public StatsValue<?> getExternalValue() {
-        throw new UnsupportedOperationException("external");
+    public final StatsValue<?> getExternalValue() {
+        return null;
     }
 
     public static <V extends AbstractValue<?>> BiFunction<V, V, V> keepMutableValue(BiFunction<V, V, V> merger) {

src/main/java/io/izzel/mesmerize/impl/Mesmerize.java

@@ -62,6 +62,14 @@ public void onActivated() {
         this.getServer().getPluginManager().registerEvents(new ProjectileListener(), this);
         this.getServer().getPluginManager().registerEvents(new EntityStatsCacheListener(), this);
         this.getServer().getPluginManager().registerEvents(new AttributeListener(), this);
+        try {
+            Class.forName("com.destroystokyo.paper.event.player.PlayerArmorChangeEvent");
+            LOGGER.info(TLocale.asString("load.paper.present"));
+            this.getServer().getPluginManager().registerEvents(new EntityStatsCacheListener.Paper(), this);
+        } catch (ClassNotFoundException e) {
+            LOGGER.info(TLocale.asString("load.paper.absent"));
+            this.getServer().getPluginManager().registerEvents(new EntityStatsCacheListener.Spigot(), this);
+        }
         Updater.start();
         LOGGER.info(TLocale.asString("general.load", (System.currentTimeMillis() - begin) / 1000D));
     }

src/main/java/io/izzel/mesmerize/impl/command/MesmerizeCommand.java

@@ -4,6 +4,7 @@
 import io.izzel.mesmerize.api.DefaultStats;
 import io.izzel.mesmerize.api.data.MultiValue;
 import io.izzel.mesmerize.api.data.StatsSetValue;
+import io.izzel.mesmerize.api.service.ElementFactory;
 import io.izzel.mesmerize.api.service.StatsService;
 import io.izzel.mesmerize.api.visitor.StatsHolder;
 import io.izzel.mesmerize.api.visitor.StatsVisitor;
@@ -63,6 +64,7 @@ public void onCommand(CommandSender sender, Command command, String s, String[]
                         StatsVisitor writer = StatsService.instance().newStatsWriter(itemMeta);
                         statsSet.accept(writer, VisitMode.DATA);
                         itemInMainHand.setItemMeta(itemMeta);
+                        ElementFactory.instance().updateLore(itemInMainHand);
                         player.getInventory().setItemInMainHand(itemInMainHand);
                         StatsService.instance().refreshCache(player, true);
                         TLocale.sendTo(player, "command.attach", args[0]);

src/main/java/io/izzel/mesmerize/impl/config/spec/ConfigSpec.java

@@ -1,12 +1,14 @@
 package io.izzel.mesmerize.impl.config.spec;
 
+import io.izzel.mesmerize.api.display.DisplaySetting;
 import io.izzel.mesmerize.impl.Mesmerize;
 
 public class ConfigSpec {
 
     private HealthSpec health;
     private GeneralSpec general;
     private PerformanceSpec performance;
+    private DisplaySetting displaySetting;
 
     public HealthSpec health() {
         return health;
@@ -32,6 +34,14 @@ public void setPerformance(PerformanceSpec performance) {
         this.performance = performance;
     }
 
+    public DisplaySetting displaySetting() {
+        return displaySetting;
+    }
+
+    public void setDisplaySetting(DisplaySetting displaySetting) {
+        this.displaySetting = displaySetting;
+    }
+
     public static ConfigSpec spec() {
         return Mesmerize.instance().getConfigSpec();
     }