Merge pull request #36 from Innectic/feature/group-ladders

Feature/group ladders

Author: Innectic

API/pom.xml

@@ -10,4 +10,11 @@
 
     <artifactId>PermissifyAPI</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+    </dependencies>
 </project>

API/src/main/java/me/innectic/permissify/api/PermissifyConstants.java

@@ -37,6 +37,8 @@
 public class PermissifyConstants {
     // TODO: Create a language formatter to allow for translating.
 
+    public static final int PERMISSIFY_PROFILE_VERSION = 2;
+
     // Chat messages
     private static final String PERMISSIFY_PREFIX = "&a&lPermissify> ";
 

API/src/main/java/me/innectic/permissify/api/database/DatabaseHandler.java

@@ -25,9 +25,9 @@
 package me.innectic.permissify.api.database;
 
 import lombok.Getter;
-import lombok.Setter;
-import me.innectic.permissify.api.permission.Permission;
-import me.innectic.permissify.api.permission.PermissionGroup;
+import me.innectic.permissify.api.group.Permission;
+import me.innectic.permissify.api.group.group.PermissionGroup;
+import me.innectic.permissify.api.group.ladder.AbstractLadder;
 import me.innectic.permissify.api.profile.PermissifyProfile;
 
 import java.util.*;
@@ -41,10 +41,12 @@
 public abstract class DatabaseHandler {
 
     @Getter protected Map<UUID, List<Permission>> cachedPermissions = new HashMap<>();
-    @Getter protected List<PermissionGroup> cachedGroups = new ArrayList<>();
+    @Getter protected Map<String, PermissionGroup> cachedGroups = new HashMap<>();
     @Getter protected Optional<PermissionGroup> defaultGroup = Optional.empty();
+    @Getter protected Map<String, AbstractLadder> cachedLadders = new HashMap<>();
     @Getter protected final Optional<ConnectionInformation> connectionInformation;
     @Getter protected List<UUID> superAdmins = new ArrayList<>();
+    // Revisit: Maybe different default formatters?
     protected String chatFormat = "{group} {username}: {message}";
     protected String whisperFormat = "{senderGroup} {username} > {receiverGroup} {to}: {message}";
 
@@ -71,6 +73,21 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
      */
     public abstract void reload(List<UUID> onlinePlayers);
 
+    /**
+     * Load all groups
+     */
+    protected abstract void loadGroups();
+
+    /**
+     * Load all ladders
+     */
+    protected abstract void loadLadders();
+
+    /**
+     * Load all super admins
+     */
+    protected abstract void loadSuperAdmins();
+
     /**
      * Drop all values from the handler.
      */
@@ -165,7 +182,7 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
      *
      * @return the registered permission groups
      */
-    public abstract List<PermissionGroup> getGroups();
+    public abstract Map<String, PermissionGroup> getGroups();
 
     /**
      * Get all permission groups a player is in.
@@ -239,6 +256,13 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
      */
     public abstract boolean isSuperAdmin(UUID uuid);
 
+    /***
+     * Remove a superadmin.
+     *
+     * @param uuid the uuid of the player to remove
+     */
+    public abstract void removeSuperAdmin(UUID uuid);
+
     /**
      * Set the format for chat messages
      *
@@ -275,4 +299,20 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
      * @param group the new group to become the default.
      */
     public abstract void setDefaultGroup(PermissionGroup group);
+
+    /**
+     * Set the ladder of a group.
+     *
+     * @param group  the name of the group
+     * @param ladder the ladder to add to the group
+     */
+    public abstract void setGroupLadder(String group, AbstractLadder ladder);
+
+    /**
+     * Get the current ladder of a group.
+     *
+     * @param group the name of the group to get the ladder from
+     * @return      the ladder, if present.
+     */
+    public abstract Optional<AbstractLadder> getGroupLadder(String group);
 }

API/src/main/java/me/innectic/permissify/api/database/handlers/SQLHandler.java

@@ -22,7 +22,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
  */
-package me.innectic.permissify.api.permission;
+package me.innectic.permissify.api.group;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -35,7 +35,15 @@
  * @since 6/8/2017
  */
 @AllArgsConstructor
-public class Permission implements Serializable {
+public class Permission {
     @Getter private String permission;
     @Getter @Setter private boolean granted;
+
+    @Override
+    public String toString() {
+        return "Permission [" +
+                "permission=" + permission +
+                ", granted=" + granted +
+                "]";
+    }
 }

…ermissify/api/permission/Permission.java …tic/permissify/api/group/Permission.javaAPI/src/main/java/me/innectic/permissify/api/permission/Permission.java renamed to API/src/main/java/me/innectic/permissify/api/group/Permission.java API/src/main/java/me/innectic/permissify/api/permission/Permission.java renamed to API/src/main/java/me/innectic/permissify/api/group/Permission.java

@@ -22,11 +22,14 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
  */
-package me.innectic.permissify.api.permission;
+package me.innectic.permissify.api.group.group;
 
 import lombok.Getter;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import me.innectic.permissify.api.group.Permission;
+import me.innectic.permissify.api.group.ladder.AbstractLadder;
 
 import java.io.Serializable;
 import java.util.*;
@@ -36,11 +39,12 @@
  * @since 6/14/2017
  */
 @RequiredArgsConstructor
-public class PermissionGroup implements Serializable {
+public class PermissionGroup {
     @Getter private final String name;
     @Getter private final String chatColor;
     @Getter private final String prefix;
     @Getter private final String suffix;
+    @NonNull @Getter @Setter private AbstractLadder ladder;
     @Getter private List<Permission> permissions = new ArrayList<>();
     @Getter private Map<UUID, Boolean> players = new HashMap<>();
 
@@ -88,4 +92,17 @@ public boolean isPrimaryGroup(UUID uuid) {
     public void setPrimaryGroup(UUID uuid, boolean isPrimary) {
         players.put(uuid, isPrimary);
     }
+
+    @Override
+    public String toString() {
+        return "PermissionGroup [" +
+                "name=" + name +
+                ", chatColor=" + chatColor +
+                ", prefix=" + prefix +
+                ", suffix=" + suffix +
+                ", ladder=" + ladder +
+                ", permissions=" + permissions +
+                ", players=" + players +
+                " ]";
+    }
 }

…sify/api/permission/PermissionGroup.java …ify/api/group/group/PermissionGroup.javaAPI/src/main/java/me/innectic/permissify/api/permission/PermissionGroup.java renamed to API/src/main/java/me/innectic/permissify/api/group/group/PermissionGroup.java API/src/main/java/me/innectic/permissify/api/permission/PermissionGroup.java renamed to API/src/main/java/me/innectic/permissify/api/group/group/PermissionGroup.java

@@ -0,0 +1,68 @@
+/*
+*
+* This file is part of Permissify, licensed under the MIT License (MIT).
+* Copyright (c) Innectic
+* Copyright (c) contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+ */
+package me.innectic.permissify.api.group.ladder;
+
+import lombok.Getter;
+
+import java.util.*;
+
+/**
+ * @author Innectic
+ * @since 9/1/2017
+ */
+public abstract class AbstractLadder {
+    @Getter protected Map<UUID, Integer> players = new HashMap<>();
+    @Getter protected List<LadderLevel> levels = new ArrayList<>();
+
+    public final void reset() {
+        drop();
+        registerLadders();
+    }
+
+    private void drop() {
+        players = new HashMap<>();
+        levels = new ArrayList<>();
+    }
+
+    public abstract void registerLadders();
+
+    public final void addPlayer(UUID uuid, int position) {
+        players.put(uuid, position);
+        // TODO: Apply extra permissions
+    }
+
+    public final void removePlayer(UUID uuid) {
+        if (players.containsKey(uuid)) players.remove(uuid);
+        // TODO: Remove extra permissions
+    }
+
+    @Override
+    public String toString() {
+        return "AbstractLadder [" +
+                "players=" + players +
+                ", levels=" + levels +
+                "]";
+    }
+}

API/src/main/java/me/innectic/permissify/api/group/ladder/AbstractLadder.java

@@ -0,0 +1,55 @@
+/*
+*
+* This file is part of Permissify, licensed under the MIT License (MIT).
+* Copyright (c) Innectic
+* Copyright (c) contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+ */
+package me.innectic.permissify.api.group.ladder;
+
+import com.google.gson.*;
+import java.lang.reflect.Type;
+
+/**
+ * @author Innectic
+ * @since 8/26/2017
+ */
+public class LadderAdapter implements JsonSerializer<AbstractLadder>, JsonDeserializer<AbstractLadder> {
+
+    @Override
+    public JsonElement serialize(AbstractLadder ladder, Type type, JsonSerializationContext context) {
+        JsonObject result = new JsonObject();
+        result.add("type", new JsonPrimitive(ladder.getClass().getSimpleName()));
+        result.add("data", context.serialize(ladder, ladder.getClass()));
+        return result;
+    }
+
+    @Override
+    public AbstractLadder deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException {
+        JsonObject jsonObject = json.getAsJsonObject();
+        String typeName = jsonObject.get("type").getAsString();
+        JsonElement element = jsonObject.get("data");
+        try {
+            return context.deserialize(element, Class.forName("me.innectic.permissify.api.group.ladder.impl." + type));
+        } catch (ClassNotFoundException e) {
+            throw new JsonParseException("Unknown element: " + typeName, e);
+        }
+    }
+}

API/src/main/java/me/innectic/permissify/api/group/ladder/LadderAdapter.java

@@ -0,0 +1,48 @@
+/*
+*
+* This file is part of Permissify, licensed under the MIT License (MIT).
+* Copyright (c) Innectic
+* Copyright (c) contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+ */
+package me.innectic.permissify.api.group.ladder;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Optional;
+
+/**
+ * @author Innectic
+ * @since 9/1/2017
+ */
+@AllArgsConstructor
+public class LadderLevel {
+    @Getter private int power;
+    @Getter private Optional<String> displayName;
+
+    @Override
+    public String toString() {
+        return "LadderLevel [" +
+                "power=" + power +
+                ", displayName=" + displayName +
+                "]";
+    }
+}