Texts done

- Added functionality to texts
- Added option to change size to button and text

Author: LitleProgrammer

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

@@ -93,6 +93,10 @@ public List<Component> getComponents() {
         return new ArrayList<>(components.values());
     }
 
+    public int getButtonAmount() {
+        return buttons.size();
+    }
+
     public boolean isOpen() {
         return open;
     }
@@ -107,10 +111,13 @@ public SimpleGui addButton(Button button) {
     }
 
     public SimpleGui addContent(Text content) {
-        if (content != null) {
-            content.remove();
+        if (this.content != null) {
+            components.remove(this.content.getUniqueId());
+            this.content.remove();
         }
         this.content = content;
+        components.put(content.getUniqueId(), content);
+        content.setGui(this);
         return this;
     }
 }

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

@@ -11,19 +11,19 @@
 public class SpawnCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
-        Button button = new Button((Player) commandSender, "\uE001", "\uE002", "LcoalizedName", 1).onClick(event -> {
+        Button button = new Button("\uE001", "\uE002", 1).setSize(2).onClick(event -> {
             event.getPlayer().sendMessage("You clicked a button1");
         });
 
-        Button button2 = new Button((Player) commandSender, "\uE001", "\uE002", "LcoalizedName", 2).onClick(event -> {
+        Button button2 = new Button("\uE001", "\uE002", 2).onClick(event -> {
             event.getPlayer().sendMessage("You clicked a button2");
         });
 
-        Button button3 = new Button((Player) commandSender, "\uE001", "\uE002", "LcoalizedName", 3).onClick(event -> {
+        Button button3 = new Button("\uE001", "\uE002", 3).onClick(event -> {
             event.getPlayer().sendMessage("You clicked a button3");
         });
 
-        SimpleGui gui = new SimpleGui("Some title", 1, 1).addContent(new Text("Test")).addButton(button).addButton(button2).addButton(button3);
+        SimpleGui gui = new SimpleGui("Some title", 1, 1).addContent(new Text("Test").setSize(2)).addButton(button).addButton(button2).addButton(button3);
         gui.open((Player) commandSender);
 
         return false;

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

@@ -19,29 +19,26 @@ public class Button implements Component {
 
     private String texture;
     private String hoverTexture;
-    private String localizedName;
     private UUID uuid;
     private TextDisplay textDisplay;
     private Location location;
-    private Player player;
     private Consumer<PlayerInteractEntityEvent> clickAction;
     private Consumer<HoverButtonEvent> hoverAction;
     private Consumer<UnHoverButtonEvent> unHoverAction;
     private int slot;
+    private int size = 2;
     private SimpleGui simpleGui;
 
-    public Button(Player player, String texture, String hoverTexture, String localizedName, int slot) {
-        this.player = player;
+    public Button(String texture, String hoverTexture, int slot) {
         this.texture = texture;
         this.hoverTexture = hoverTexture;
-        this.localizedName = localizedName;
         this.slot = slot;
 
         uuid = UUID.randomUUID();
     }
 
     public void spawn() {
-        textDisplay = (TextDisplay) player.getWorld().spawnEntity(Calculations.calculateInventoryCenter(player.getLocation()), EntityType.TEXT_DISPLAY);
+        textDisplay = (TextDisplay) simpleGui.getCenterLocation().getWorld().spawnEntity(Calculations.calculateComponentLocation(simpleGui, this, simpleGui.getButtonAmount()), EntityType.TEXT_DISPLAY);
         textDisplay.setCustomName(uuid.toString());
         textDisplay.setCustomNameVisible(false);
         textDisplay.setText(texture);
@@ -52,7 +49,7 @@ public void spawn() {
         textDisplay.setVisibleByDefault(false);
         textDisplay.setDefaultBackground(false);
         Transformation transformation = textDisplay.getTransformation();
-        transformation.getScale().set(new Vector3f(2, 2, 2));
+        transformation.getScale().set(new Vector3f(size, size, size));
         textDisplay.setTransformation(transformation);
     }
 
@@ -140,4 +137,8 @@ public int getSlot() {
     public void setGui(SimpleGui gui) {
         simpleGui = gui;
     }
+    public Button setSize(int size) {
+        this.size = size;
+        return this;
+    }
 }

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

@@ -1,49 +1,87 @@
 package de.littleprogrammer.guiapi.components;
 
-import org.bukkit.entity.Display;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
+import de.littleprogrammer.guiapi.GuiApi;
+import de.littleprogrammer.guiapi.SimpleGui;
+import org.bukkit.entity.*;
+import org.bukkit.util.Transformation;
+import org.joml.Vector3f;
 
 import java.util.UUID;
 
 public class Text implements Component {
 
+    private String text;
+    private UUID uuid;
+    private int size = 2;
+    private TextDisplay textDisplay;
+    private SimpleGui simpleGui;
+
     public Text(String text) {
+        this.text = text;
+        uuid = UUID.randomUUID();
+    }
 
+    @Override
+    public void spawn() {
+        textDisplay = (TextDisplay) simpleGui.getCenterLocation().getWorld().spawnEntity(simpleGui.getCenterLocation(), EntityType.TEXT_DISPLAY);
+        textDisplay.setCustomName(uuid.toString());
+        textDisplay.setCustomNameVisible(false);
+        textDisplay.setText(text);
+        textDisplay.setGlowing(true);
+        textDisplay.setBillboard(Display.Billboard.CENTER);
+        textDisplay.setDisplayWidth(30);
+        textDisplay.setDisplayHeight(30);
+        textDisplay.setVisibleByDefault(false);
+        textDisplay.setDefaultBackground(false);
+        Transformation transformation = textDisplay.getTransformation();
+        transformation.getScale().set(new Vector3f(size, size, size));
+        textDisplay.setTransformation(transformation);
     }
 
     @Override
     public Entity getEntity() {
-        return null;
+        return textDisplay;
     }
 
     @Override
     public Display getDisplay() {
-        return null;
+        return textDisplay;
     }
 
     @Override
     public UUID getUniqueId() {
-        return null;
+        return uuid;
     }
 
-    @Override
-    public void show(Player player) {
+    public SimpleGui getGui() {
+        return simpleGui;
+    }
 
+    public int getSize() {
+        return size;
     }
 
-    @Override
-    public void hide(Player player) {
+    public void setGui(SimpleGui simpleGui) {
+        this.simpleGui = simpleGui;
+    }
 
+    public Text setSize(int size) {
+        this.size = size;
+        return this;
     }
 
     @Override
-    public void remove() {
-
+    public void show(Player player) {
+        player.showEntity(GuiApi.getInstance().getPlugin(), textDisplay);
     }
 
     @Override
-    public void spawn() {
+    public void hide(Player player) {
+        player.hideEntity(GuiApi.getInstance().getPlugin(), textDisplay);
+    }
 
+    @Override
+    public void remove() {
+        textDisplay.remove();
     }
 }

src/main/java/de/littleprogrammer/guiapi/utils/Calculations.java

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