v.1.1.0 part 1

- Added a superclass for GUIs to better build new GUI types in the future
- Added a pagedGui
- Simplified the code a bit
- Added spacing variable to set how far apart the GUI components should be
- Made area of freedom top move depending on the spacing variable
- Changed the dev command to spawn a paged gui
- Made the opening of the gui account for the selected page
- Prob done more stuff, but I can't remember rn

Author: LitleProgrammer

build.gradle

@@ -45,6 +45,10 @@ wrapper {
     distributionType = Wrapper.DistributionType.ALL
 }
 
+jar {
+    destinationDirectory.set(file("/Users/linusglimm/Desktop/mineopoly stuff/servers/spigotTest/plugins"))
+}
+
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 

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

@@ -2,9 +2,10 @@
 
 import de.littleprogrammer.guiapi.commands.SpawnCommand;
 import de.littleprogrammer.guiapi.enums.ServerVersion;
+import de.littleprogrammer.guiapi.guis.Gui;
+import de.littleprogrammer.guiapi.guis.SimpleGui;
 import de.littleprogrammer.guiapi.listeners.GuiEvents;
 import de.littleprogrammer.guiapi.listeners.MoveListener;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -14,21 +15,21 @@
 import java.util.Map;
 import java.util.UUID;
 
-public final class GuiApi {
+public final class GuiApi extends JavaPlugin {
 
     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<>();
+    private Map<UUID, Gui> guis = new HashMap<>();
 
-    public GuiApi(JavaPlugin plugin) {
+    /*public GuiApi(JavaPlugin plugin) {
         this.plugin = plugin;
         instance = this;
-    }
+    }*/
 
-    /*@Override
+    @Override
     public void onEnable() {
         // Plugin startup logic
         this.plugin = this;
@@ -40,7 +41,7 @@ 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
@@ -66,7 +67,7 @@ public void init() {
         getPlugin().getServer().getPluginManager().registerEvents(this.listener, this.plugin);
         getPlugin().getServer().getPluginManager().registerEvents(this.moveListener, this.plugin);
 
-        //this.getPlugin().getCommand("spawnGui").setExecutor(new SpawnCommand());
+        this.getPlugin().getCommand("spawnGui").setExecutor(new SpawnCommand());
     }
 
     public JavaPlugin getPlugin() {return this.plugin;}
@@ -78,15 +79,15 @@ public static BukkitScheduler getScheduler() {
         return GuiApi.getInstance().getPlugin().getServer().getScheduler();
     }
 
-    public SimpleGui getGUI(UUID uuid) {
+    public Gui getGUI(UUID uuid) {
         return guis.get(uuid);
     }
 
-    public SimpleGui getGUI(Player player) {
+    public Gui getGUI(Player player) {
         return guis.get(player.getUniqueId());
     }
 
-    public Map<UUID, SimpleGui> getGuis() {
+    public Map<UUID, Gui> getGuis() {
         return guis;
     }
 

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

@@ -1,17 +1,21 @@
 package de.littleprogrammer.guiapi.commands;
 
-import de.littleprogrammer.guiapi.SimpleGui;
+import de.littleprogrammer.guiapi.guis.PagedGui;
+import de.littleprogrammer.guiapi.guis.SimpleGui;
 import de.littleprogrammer.guiapi.components.Button;
 import de.littleprogrammer.guiapi.components.Text;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class SpawnCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
-        Button button = new Button("\uE001", "\uE002", 1)
+        /*Button button = new Button("\uE001", "\uE002", 1)
                 .setSize(2)
                 .onClick(event -> {
                     event.getPlayer().sendMessage("You clicked a button1");
@@ -31,15 +35,24 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
             event.getPlayer().sendMessage("You clicked a button3");
         });
 
-        Text text = new Text("Here you can put\n some text. This is just for\n testing purposes.\n As you can see, \nit's working quite nicely and \nlook at this cool hovering effect.")
+        Text text = new Text("Here you can put\n some text. This is just for\n testing purposes.\n As you can see, \nit's working quite nicely and \nlook at this cool hovering effect.", 0)
                 .setSize(1.4f);
 
         SimpleGui gui = new SimpleGui("Some title")
                 .addContent(text)
                 .addButton(button)
                 .addButton(button2)
                 .addButton(button3);
-        gui.open((Player) commandSender);
+        gui.open((Player) commandSender);*/
+
+        List<String> stringList = new ArrayList<>();
+        stringList.add("String 1");
+        stringList.add("String 2");
+        stringList.add("String 3");
+
+        PagedGui pagedGui = new PagedGui("Title", 0);
+        pagedGui.addContent(stringList);
+        pagedGui.open((Player) commandSender);
 
         return false;
     }

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

@@ -1,7 +1,7 @@
 package de.littleprogrammer.guiapi.components;
 
 import de.littleprogrammer.guiapi.GuiApi;
-import de.littleprogrammer.guiapi.SimpleGui;
+import de.littleprogrammer.guiapi.guis.SimpleGui;
 import de.littleprogrammer.guiapi.customeEvents.HoverButtonEvent;
 import de.littleprogrammer.guiapi.customeEvents.UnHoverButtonEvent;
 import de.littleprogrammer.guiapi.utils.Calculations;
@@ -39,7 +39,7 @@ public Button(String texture, String hoverTexture, int slot) {
     }
 
     public void spawn() {
-        textDisplay = (TextDisplay) simpleGui.getCenterLocation().getWorld().spawnEntity(Calculations.calculateComponentLocation(simpleGui, this, simpleGui.getButtonAmount()), EntityType.TEXT_DISPLAY);
+        textDisplay = (TextDisplay) simpleGui.getCenterLocation().getWorld().spawnEntity(Calculations.calculateComponentLocation(simpleGui, this, simpleGui.getButtonAmount(), 30), EntityType.TEXT_DISPLAY);
         textDisplay.setCustomName(uuid.toString());
         textDisplay.setCustomNameVisible(false);
         textDisplay.setText(texture);

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

@@ -1,6 +1,5 @@
 package de.littleprogrammer.guiapi.components;
 
-import de.littleprogrammer.guiapi.SimpleGui;
 import org.bukkit.entity.Display;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;

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

@@ -1,7 +1,8 @@
 package de.littleprogrammer.guiapi.components;
 
 import de.littleprogrammer.guiapi.GuiApi;
-import de.littleprogrammer.guiapi.SimpleGui;
+import de.littleprogrammer.guiapi.guis.Gui;
+import de.littleprogrammer.guiapi.guis.SimpleGui;
 import org.bukkit.entity.*;
 import org.bukkit.util.Transformation;
 import org.joml.Vector3f;
@@ -14,16 +15,23 @@ public class Text implements Component {
     private UUID uuid;
     private float size = 2;
     private TextDisplay textDisplay;
-    private SimpleGui simpleGui;
+    private Gui gui;
+    private int slot;
 
     public Text(String text) {
         this.text = text;
         uuid = UUID.randomUUID();
     }
 
+    public Text(String text, int slot) {
+        this.text = text;
+        this.slot = slot < 0 || slot > 3 ? 1 : slot;
+        uuid = UUID.randomUUID();
+    }
+
     @Override
     public void spawn() {
-        textDisplay = (TextDisplay) simpleGui.getCenterLocation().getWorld().spawnEntity(simpleGui.getCenterLocation(), EntityType.TEXT_DISPLAY);
+        textDisplay = (TextDisplay) gui.getCenterLocation().getWorld().spawnEntity(gui.getCenterLocation(), EntityType.TEXT_DISPLAY);
         textDisplay.setCustomName(uuid.toString());
         textDisplay.setCustomNameVisible(false);
         textDisplay.setText(text);
@@ -53,16 +61,16 @@ public UUID getUniqueId() {
         return uuid;
     }
 
-    public SimpleGui getGui() {
-        return simpleGui;
+    public Gui getGui() {
+        return gui;
     }
 
     public float getSize() {
         return size;
     }
 
-    public void setGui(SimpleGui simpleGui) {
-        this.simpleGui = simpleGui;
+    public void setGui(Gui gui) {
+        this.gui = gui;
     }
 
     public Text setSize(float size) {
@@ -84,4 +92,12 @@ public void hide(Player player) {
     public void remove() {
         textDisplay.remove();
     }
+
+    public int getSlot() {
+        return slot;
+    }
+
+    public void setSlot(int slot) {
+        this.slot = slot;
+    }
 }

src/main/java/de/littleprogrammer/guiapi/customeEvents/HoverButtonEvent.java

@@ -1,6 +1,7 @@
 package de.littleprogrammer.guiapi.customeEvents;
 
-import de.littleprogrammer.guiapi.SimpleGui;
+import de.littleprogrammer.guiapi.guis.Gui;
+import de.littleprogrammer.guiapi.guis.SimpleGui;
 import de.littleprogrammer.guiapi.components.Button;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
@@ -9,13 +10,13 @@
 public class HoverButtonEvent extends Event {
     private static final HandlerList HANDLERS = new HandlerList();
 
-    private final SimpleGui gui;
+    private final Gui gui;
     private final Player player;
     private final Button button;
     private final String hoverText;
     private final String text;
 
-    public HoverButtonEvent(SimpleGui gui, Player player, Button button, String hoverText, String text) {
+    public HoverButtonEvent(Gui gui, Player player, Button button, String hoverText, String text) {
         this.gui = gui;
         this.player = player;
         this.button = button;
@@ -34,7 +35,7 @@ public static HandlerList getHandlerList() {
         return HANDLERS;
     }
 
-    public SimpleGui getGui() {
+    public Gui getGui() {
         return gui;
     }
 

src/main/java/de/littleprogrammer/guiapi/customeEvents/UnHoverButtonEvent.java

@@ -1,6 +1,7 @@
 package de.littleprogrammer.guiapi.customeEvents;
 
-import de.littleprogrammer.guiapi.SimpleGui;
+import de.littleprogrammer.guiapi.guis.Gui;
+import de.littleprogrammer.guiapi.guis.SimpleGui;
 import de.littleprogrammer.guiapi.components.Button;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
@@ -9,13 +10,13 @@
 public class UnHoverButtonEvent extends Event {
     private static final HandlerList HANDLERS = new HandlerList();
 
-    private final SimpleGui gui;
+    private final Gui gui;
     private final Player player;
     private final Button button;
     private final String hoverText;
     private final String text;
 
-    public UnHoverButtonEvent(SimpleGui gui, Player player, Button button, String hoverText, String text) {
+    public UnHoverButtonEvent(Gui gui, Player player, Button button, String hoverText, String text) {
         this.gui = gui;
         this.player = player;
         this.button = button;
@@ -34,7 +35,7 @@ public static HandlerList getHandlerList() {
         return HANDLERS;
     }
 
-    public SimpleGui getGui() {
+    public Gui getGui() {
         return gui;
     }
 

src/main/java/de/littleprogrammer/guiapi/guis/Gui.java

@@ -0,0 +1,71 @@
+package de.littleprogrammer.guiapi.guis;
+
+import de.littleprogrammer.guiapi.components.Component;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import java.util.*;
+
+public abstract class Gui {
+    public UUID uuid;
+    public Player player;
+    public Location centerLocation;
+    public boolean open;
+    public Map<UUID, Component> components;
+    public int spacing;
+
+    public Gui(UUID uuid, boolean open) {
+        this.uuid = uuid;
+        this.open = open;
+
+        this.components = new HashMap<>();
+    }
+
+    public abstract void open(Player player);
+    public abstract void close();
+    public abstract void updatePosition(Location location);
+
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    public void setPlayer(Player player) {
+        this.player = player;
+    }
+
+    public void setCenterLocation(Location centerLocation) {
+        this.centerLocation = centerLocation;
+    }
+
+    public void setOpen(boolean open) {
+        this.open = open;
+    }
+
+    public boolean isOpen() {
+        return open;
+    }
+
+    public Component getComponent(UUID uuid) {
+        return components.get(uuid);
+    }
+
+    public Location getCenterLocation() {
+        return centerLocation;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public List<Component> getComponents() {
+        return new ArrayList<>(components.values());
+    }
+
+    public void setSpacing(int spacing) {
+        this.spacing = spacing;
+    }
+
+    public int getSpacing() {
+        return spacing;
+    }
+}