Made ready for release

- Changed from plugin to API
- Fixed some minor problems
- Text is working fine

Author: LitleProgrammer

src/main/java/de/littleprogrammer/guiapi/GuiApi.java

@@ -1,6 +1,5 @@
 package de.littleprogrammer.guiapi;
 
-import de.littleprogrammer.guiapi.commands.SpawnCommand;
 import de.littleprogrammer.guiapi.enums.ServerVersion;
 import de.littleprogrammer.guiapi.listeners.GuiEvents;
 import de.littleprogrammer.guiapi.listeners.MoveListener;
@@ -14,15 +13,21 @@
 import java.util.Map;
 import java.util.UUID;
 
-public final class GuiApi extends JavaPlugin {
+public final class GuiApi {
 
     private JavaPlugin plugin;
     private static GuiApi instance;
     private ServerVersion version;
     private final Listener listener = new GuiEvents();
+    private final Listener moveListener = new MoveListener();
     private Map<UUID, SimpleGui> guis = new HashMap<>();
 
-    @Override
+    public GuiApi(JavaPlugin plugin) {
+        this.plugin = plugin;
+        instance = this;
+    }
+
+    /*@Override
     public void onEnable() {
         // Plugin startup logic
         this.plugin = this;
@@ -34,9 +39,10 @@ public void onEnable() {
     @Override
     public void onDisable() {
         // Plugin shutdown logic
-    }
+    }*/
 
     public void init() {
+        //This method checks the server version, to determine weather it should use the new 1.20.2 teleport interpolation or my own teleport interpolation
         String secIndicator = plugin.getServer().getBukkitVersion().split("\\.")[1];
         String preTrdIndicator = plugin.getServer().getBukkitVersion().split("\\.")[2];
         String trdIndicator = preTrdIndicator.split("-")[0];
@@ -55,10 +61,9 @@ public void init() {
             }
         }
 
-        Bukkit.getPluginManager().registerEvents(this.listener, this.plugin);
-        Bukkit.getPluginManager().registerEvents(new MoveListener(), this.plugin);
-
-        getCommand("spawnGui").setExecutor(new SpawnCommand());
+        //register the two listeners needed
+        getPlugin().getServer().getPluginManager().registerEvents(this.listener, this.plugin);
+        getPlugin().getServer().getPluginManager().registerEvents(this.moveListener, this.plugin);
     }
 
     public JavaPlugin getPlugin() {return this.plugin;}

src/main/java/de/littleprogrammer/guiapi/commands/SpawnCommand.java

@@ -26,8 +26,9 @@ public class Button implements Component {
     private Consumer<HoverButtonEvent> hoverAction;
     private Consumer<UnHoverButtonEvent> unHoverAction;
     private int slot;
-    private int size = 2;
+    private float size = 2;
     private SimpleGui simpleGui;
+    private boolean hover = false;
 
     public Button(String texture, String hoverTexture, int slot) {
         this.texture = texture;
@@ -137,8 +138,17 @@ public int getSlot() {
     public void setGui(SimpleGui gui) {
         simpleGui = gui;
     }
-    public Button setSize(int size) {
+
+    public Button setSize(float size) {
         this.size = size;
         return this;
     }
+
+    public void setHover(boolean hover) {
+        this.hover = hover;
+    }
+
+    public boolean isHover() {
+        return hover;
+    }
 }

src/main/java/de/littleprogrammer/guiapi/components/Button.java

@@ -12,7 +12,7 @@ public class Text implements Component {
 
     private String text;
     private UUID uuid;
-    private int size = 2;
+    private float size = 2;
     private TextDisplay textDisplay;
     private SimpleGui simpleGui;
 
@@ -57,15 +57,15 @@ public SimpleGui getGui() {
         return simpleGui;
     }
 
-    public int getSize() {
+    public float getSize() {
         return size;
     }
 
     public void setGui(SimpleGui simpleGui) {
         this.simpleGui = simpleGui;
     }
 
-    public Text setSize(int size) {
+    public Text setSize(float size) {
         this.size = size;
         return this;
     }

src/main/java/de/littleprogrammer/guiapi/components/Text.java

@@ -18,6 +18,28 @@ public class GuiEvents implements Listener {
 
     @EventHandler
     public void onPlayerInteractEvent(PlayerInteractEvent event) {
-        System.out.println(event.getAction());
+        final SimpleGui simpleGui = GuiApi.getInstance().getGUI(event.getPlayer());
+
+        if (simpleGui == null) return;
+
+        Entity awaitenEntity = null;
+        for (Entity entity : event.getPlayer().getNearbyEntities(7, 7, 7)) {
+            if (entity instanceof Display && entity.getCustomName() != null) {
+                if (Calculations.playerLookingAtEntity(event.getPlayer(), entity)) {
+                    awaitenEntity = entity;
+                    break;
+                }
+            }
+        }
+
+        if (awaitenEntity == null) { return; }
+
+        UUID uuid = UUID.fromString(awaitenEntity.getCustomName());
+        Component component = simpleGui.getComponent(uuid);
+        if (!(component instanceof Button)) return;
+
+        Button button = (Button) component;
+        //System.out.println("Click on button: " + button.getUniqueId());
+        button.getClickAction().accept(new PlayerInteractEntityEvent(event.getPlayer(), button.getEntity()));
     }
 }

src/main/java/de/littleprogrammer/guiapi/listeners/GuiEvents.java

@@ -30,7 +30,7 @@ public void onPlayerMove(PlayerMoveEvent event) {
             }
 
             Entity hoveredEntity = null;
-            for (Entity entity : event.getPlayer().getNearbyEntities(5, 5, 5)) {
+            for (Entity entity : event.getPlayer().getNearbyEntities(8, 8, 8)) {
                 if (entity instanceof Display && entity.getCustomName() != null) {
                     if (Calculations.isInRange(event.getPlayer().getEyeLocation(), entity.getLocation(), 7)) {
                         hoveredEntity = entity;
@@ -43,12 +43,16 @@ public void onPlayerMove(PlayerMoveEvent event) {
                 if (simpleGui.getComponent(UUID.fromString(hoveredEntity.getCustomName())) instanceof Button) {
                     Button button = (Button) simpleGui.getComponent(UUID.fromString(hoveredEntity.getCustomName()));
                     button.getHoverAction().accept(new HoverButtonEvent(simpleGui, event.getPlayer(), button, button.getHoverText(), button.getText()));
+                    button.setHover(true);
                 }
             } else {
                 for (Component component : simpleGui.getComponents()) {
                     if (component instanceof Button) {
                         Button button = (Button) component;
-                        button.getUnHoverAction().accept(new UnHoverButtonEvent(simpleGui, event.getPlayer(), button, button.getHoverText(), button.getText()));
+                        if (button.isHover()) {
+                            button.getUnHoverAction().accept(new UnHoverButtonEvent(simpleGui, event.getPlayer(), button, button.getHoverText(), button.getText()));
+                            button.setHover(false);
+                        }
                     }
                 }
             }

src/main/java/de/littleprogrammer/guiapi/listeners/MoveListener.java

@@ -50,7 +50,7 @@ public static Location calculateComponentLocation(SimpleGui simpleGui, Component
             }
         } else {
             //Is content
-            return centerLoc.clone().add(0, 0.5, 0);
+            return centerLoc.clone().add(0, 1.5, 0);
         }
         return null;
     }