Refactor

api/src/main/java/com/alttd/essentia/api/events/EssentiaEvent.java

@@ -1,4 +1,4 @@
-package com.alttd.essentia.events;
+package com.alttd.essentia.api.events;
 
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;

api/src/main/java/com/alttd/essentia/api/events/EssentiaUserLoadEvent.java

@@ -0,0 +1,32 @@
+package com.alttd.essentia.api.events;
+
+import com.alttd.essentia.api.user.User;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+public class EssentiaUserLoadEvent extends EssentiaEvent {
+
+    private static final HandlerList handlerList = new HandlerList();
+
+    private final User user;
+
+    public EssentiaUserLoadEvent(User user) {
+        this.user = user;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return handlerList;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlerList;
+    }
+
+}

api/src/main/java/com/alttd/essentia/api/events/PlayerRemoveHomeEvent.java

@@ -1,4 +1,4 @@
-package com.alttd.essentia.events;
+package com.alttd.essentia.api.events;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;

api/src/main/java/com/alttd/essentia/api/events/PlayerSetHomeEvent.java

@@ -1,4 +1,4 @@
-package com.alttd.essentia.events;
+package com.alttd.essentia.api.events;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportBackEvent.java

@@ -1,4 +1,4 @@
-package com.alttd.essentia.events;
+package com.alttd.essentia.api.events;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportHomeEvent.java

@@ -1,4 +1,4 @@
-package com.alttd.essentia.events;
+package com.alttd.essentia.api.events;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportSpawnEvent.java

@@ -1,4 +1,4 @@
-package com.alttd.essentia.events;
+package com.alttd.essentia.api.events;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

api/src/main/java/com/alttd/essentia/api/model/Home.java

@@ -0,0 +1,10 @@
+package com.alttd.essentia.api.model;
+
+import org.bukkit.Location;
+
+public interface Home {
+
+    String name();
+
+    Location location();
+}

api/src/main/java/com/alttd/essentia/api/model/UserSettings.java

@@ -0,0 +1,16 @@
+package com.alttd.essentia.api.model;
+
+public interface UserSettings {
+
+    boolean godMode();
+
+    void godMode(boolean godMode);
+
+    boolean allowTeleports();
+
+    void allowTeleports(boolean allowTeleports);
+
+    boolean flying();
+
+    void flying(boolean flying);
+}

api/src/main/java/com/alttd/essentia/api/request/Request.java

@@ -1,4 +1,4 @@
-package com.alttd.essentia.request;
+package com.alttd.essentia.api.request;
 
 public interface Request {
 

api/src/main/java/com/alttd/essentia/api/user/User.java

@@ -1,8 +1,9 @@
-package com.alttd.essentia.user;
+package com.alttd.essentia.api.user;
 
-import com.alttd.essentia.request.Request;
+import com.alttd.essentia.api.model.Home;
+import com.alttd.essentia.api.model.UserSettings;
+import com.alttd.essentia.api.request.Request;
 import org.bukkit.Location;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.List;
 import java.util.Map;
@@ -19,7 +20,7 @@ public interface User {
 
     boolean hasHome(String name);
 
-    Location getHome(String name);
+    Home getHome(String name);
 
     void setHome(String name, Location location);
 
@@ -29,13 +30,11 @@ public interface User {
 
     List<String> getMatchingHomeNames(String homeName);
 
-    Map<String, Location> getHomeData();
+    Map<String, Home> getHomeData();
 
     Set<String> getHomes();
 
-    boolean allowTeleports();
-
-    void allowTeleports(boolean allowTeleports);
+    UserSettings getUserSettings();
 
     Request request();
 

api/src/main/java/com/alttd/essentia/api/user/UserManager.java

@@ -1,4 +1,4 @@
-package com.alttd.essentia.user;
+package com.alttd.essentia.api.user;
 
 import org.bukkit.entity.Player;