Some updates

Author: KCodeYT

src/main/java/de/kcodeyt/headsdb/command/HeadDBCommand.java

@@ -6,7 +6,7 @@
 import cn.nukkit.form.element.ElementSlider;
 import cn.nukkit.form.window.FormWindowCustom;
 import de.kcodeyt.headsdb.HeadsDB;
-import de.kcodeyt.headsdb.database.DBSkin;
+import de.kcodeyt.headsdb.database.HeadEntry;
 import de.kcodeyt.headsdb.util.FormAPI;
 
 import java.util.List;
@@ -53,10 +53,10 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
                             amount = 1;
                         }
 
-                        final List<DBSkin> dbSkins = this.headsDB.getDatabase().getDbSkins();
+                        final List<HeadEntry> headEntries = this.headsDB.getDatabase().getHeadEntries();
                         final Random random = ThreadLocalRandom.current();
                         for(int i = 0; i < amount; i++)
-                            this.headsDB.getDatabase().giveItem((Player) sender, dbSkins.get(random.nextInt(dbSkins.size())));
+                            this.headsDB.getDatabase().giveItem((Player) sender, headEntries.get(random.nextInt(headEntries.size())));
                         return true;
                     }
                     break;

src/main/java/de/kcodeyt/headsdb/database/Category.java

@@ -1,17 +1,19 @@
 package de.kcodeyt.headsdb.database;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
 
 import java.util.List;
 
 @Getter
-@AllArgsConstructor
+@ToString
+@RequiredArgsConstructor
 class Category {
 
-    private final Categories categories;
+    private final CategoryEnum categoryEnum;
     private final String displayName;
     private final String displaySkin;
-    private final List<DBSkin> skins;
+    private final List<HeadEntry> entries;
 
 }

…kcodeyt/headsdb/database/Categories.java …odeyt/headsdb/database/CategoryEnum.javasrc/main/java/de/kcodeyt/headsdb/database/Categories.java renamed to src/main/java/de/kcodeyt/headsdb/database/CategoryEnum.java src/main/java/de/kcodeyt/headsdb/database/Categories.java renamed to src/main/java/de/kcodeyt/headsdb/database/CategoryEnum.java

@@ -5,7 +5,7 @@
 
 @Getter
 @AllArgsConstructor
-public enum Categories {
+public enum CategoryEnum {
 
     ALPHABET("Alphabet", "alphabet"),
     ANIMALS("Animals", "animals"),

src/main/java/de/kcodeyt/headsdb/database/DBSkin.java

@@ -3,7 +3,6 @@
 import cn.nukkit.Player;
 import cn.nukkit.Server;
 import cn.nukkit.form.element.ElementButton;
-import cn.nukkit.form.element.ElementButtonImageData;
 import cn.nukkit.form.window.FormWindowSimple;
 import cn.nukkit.item.Item;
 import com.google.common.collect.Iterables;
@@ -16,11 +15,11 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Getter
 public class Database {
@@ -30,27 +29,37 @@ public class Database {
 
     private final Map<String, Integer> pageCount;
     private final List<Category> categories;
-    private final List<DBSkin> dbSkins;
+    private final List<HeadEntry> headEntries;
 
     public Database() {
         this.pageCount = new HashMap<>();
         this.categories = new ArrayList<>();
-        this.dbSkins = new ArrayList<>();
+        this.headEntries = new ArrayList<>();
     }
 
     public boolean reload() {
         this.categories.clear();
-        this.dbSkins.clear();
+        this.headEntries.clear();
         return this.load();
     }
 
     public boolean load() {
         try {
-            for(final Categories value : Categories.values()) {
-                final List<Map<String, String>> values = GSON.<List<Map<String, String>>>fromJson(this.httpRequest(API_URL + "?cat=" + value.getIdentifier()), List.class);
-                final List<DBSkin> dbSkins = values.stream().map(map -> new DBSkin(map.get("name"), map.get("uuid"), map.get("value"))).collect(Collectors.toList());
-                this.dbSkins.addAll(dbSkins);
-                this.categories.add(new Category(value, value.getDisplayName(), Iterables.getLast(dbSkins).getTexture(), Collections.unmodifiableList(dbSkins)));
+            for(final CategoryEnum category : CategoryEnum.values()) {
+                final HttpURLConnection connection = (HttpURLConnection) new URL(API_URL + "?cat=" + category.getIdentifier()).openConnection();
+                connection.setRequestProperty("User-Agent", "Chrome");
+                connection.connect();
+
+                if(connection.getResponseCode() == 200) {
+                    try(final InputStream inputStream = connection.getInputStream();
+                        final Reader reader = new InputStreamReader(inputStream)) {
+                        final List<HeadEntry> headEntries = GSON.<List<HeadEntry>>fromJson(reader, List.class);
+                        this.headEntries.addAll(headEntries);
+                        this.categories.add(new Category(category, category.getDisplayName(), Iterables.getLast(headEntries).getTexture(), Collections.unmodifiableList(headEntries)));
+                    }
+                }
+
+                connection.disconnect();
             }
 
             return true;
@@ -61,92 +70,74 @@ public boolean load() {
         }
     }
 
-    private String httpRequest(String urlSpec) throws IOException {
-        final HttpURLConnection connection = (HttpURLConnection) new URL(urlSpec).openConnection();
-        connection.setRequestProperty("User-Agent", "Chrome");
-
-        String content = "{}";
-        if(connection.getResponseCode() == 200) {
-            try(final InputStream inputStream = connection.getInputStream()) {
-                final StringBuilder builder = new StringBuilder();
-                final byte[] bytes = new byte[1024 * 1024];
-                for(int read; (read = inputStream.read(bytes)) > 0; )
-                    builder.append(new String(Arrays.copyOf(bytes, read), StandardCharsets.UTF_8));
-                content = builder.toString();
-            }
-        }
-
-        connection.disconnect();
-        return content;
-    }
-
-    private List<List<DBSkin>> toPages(Category category, int count) {
-        final List<DBSkin> dbSkins = category.getSkins();
-        final int dbSize = dbSkins.size();
+    private List<List<HeadEntry>> toPages(Category category, int count) {
+        final List<HeadEntry> headEntries = category.getEntries();
+        final int dbSize = headEntries.size();
         if(dbSize <= 0)
             return Collections.emptyList();
-        final List<List<DBSkin>> pages = new ArrayList<>();
+        final List<List<HeadEntry>> pages = new ArrayList<>();
         final int chunks = (dbSize - 1) / count;
         for(int i = 0; i <= chunks; i++)
-            pages.add(dbSkins.subList(i * count, i == chunks ? dbSize : (i + 1) * count));
+            pages.add(headEntries.subList(i * count, i == chunks ? dbSize : (i + 1) * count));
         return Collections.unmodifiableList(pages);
     }
 
     public void showForm(Player player) {
         final FormWindowSimple categoriesForm = new FormWindowSimple("Select a category", "");
         final List<Category> categories = Collections.unmodifiableList(new ArrayList<>(this.categories));
         for(final Category category : categories)
-            categoriesForm.addButton(new ElementButton(category.getDisplayName(), new ElementButtonImageData(ElementButtonImageData.IMAGE_DATA_TYPE_URL, HeadRender.createUrl(category.getDisplaySkin()))));
+            categoriesForm.addButton(new ElementButton(category.getDisplayName(), HeadRender.createButtonImage(category.getDisplaySkin())));
         FormAPI.create(player, categoriesForm, () -> {
             if(categoriesForm.wasClosed())
                 return;
             final Category category = categories.get(categoriesForm.getResponse().getClickedButtonId());
             if(category == null)
                 return;
             final FormWindowSimple pagesForm = new FormWindowSimple("Select a page", "");
-            final List<List<DBSkin>> pages = this.toPages(category, this.pageCount.getOrDefault(player.getName(), 40));
+            final List<List<HeadEntry>> pages = this.toPages(category, this.pageCount.getOrDefault(player.getName(), 40));
             for(int i = 0; i < pages.size(); i++)
-                pagesForm.addButton(new ElementButton("Page " + (i + 1), new ElementButtonImageData(ElementButtonImageData.IMAGE_DATA_TYPE_URL, HeadRender.createUrl(Iterables.getLast(pages.get(i)).getTexture()))));
+                pagesForm.addButton(new ElementButton("Page " + (i + 1), HeadRender.createButtonImage(Iterables.getLast(pages.get(i)).getTexture())));
             FormAPI.create(player, pagesForm, () -> {
                 if(pagesForm.wasClosed()) {
                     this.showForm(player);
                     return;
                 }
 
-                final List<DBSkin> dbSkins = pages.get(pagesForm.getResponse().getClickedButtonId());
-                if(dbSkins == null)
+                final List<HeadEntry> headEntries = pages.get(pagesForm.getResponse().getClickedButtonId());
+                if(headEntries == null)
                     return;
                 final FormWindowSimple subForm = new FormWindowSimple(category.getDisplayName(), "");
-                for(final DBSkin dbSkin : dbSkins)
-                    subForm.addButton(new ElementButton(dbSkin.getName(), new ElementButtonImageData(ElementButtonImageData.IMAGE_DATA_TYPE_URL, HeadRender.createUrl(dbSkin.getTexture()))));
+                for(final HeadEntry headEntry : headEntries)
+                    subForm.addButton(new ElementButton(headEntry.getName(), HeadRender.createButtonImage(headEntry.getTexture())));
                 FormAPI.create(player, subForm, () -> {
                     if(subForm.wasClosed())
                         return;
-                    final DBSkin dbSkin = dbSkins.get(subForm.getResponse().getClickedButtonId());
-                    if(dbSkin == null)
+                    final HeadEntry headEntry = headEntries.get(subForm.getResponse().getClickedButtonId());
+                    if(headEntry == null)
                         return;
-                    this.giveItem(player, dbSkin);
+                    this.giveItem(player, headEntry);
                 });
             });
         });
     }
 
-    public void giveItem(Player player, DBSkin dbSkin) {
-        Heads.createItem(HeadInput.ofTexture(dbSkin.getTexture(), dbSkin.getId())).whenComplete((result, throwable) -> {
+    public void giveItem(Player player, HeadEntry headEntry) {
+        Heads.createItem(HeadInput.ofTexture(headEntry.getTexture(), headEntry.getId())).whenComplete((result, throwable) -> {
             if(throwable != null) {
                 player.sendMessage("§cCould not create the requested skull item!");
+                throwable.printStackTrace();
                 return;
             }
 
             final Item item = result.getItem();
-            item.setCustomName("§r§7" + dbSkin.getName());
+            item.setCustomName("§r§7" + headEntry.getName());
             final Item[] drops = player.getInventory().addItem(item);
             if(drops.length > 0) {
                 for(final Item drop : drops)
                     player.getLevel().dropItem(player, drop);
             }
 
-            player.sendMessage("§aGave you the head " + dbSkin.getName() + "§r§a!");
+            player.sendMessage("§aGave you the head " + headEntry.getName() + "§r§a!");
         });
     }
 

src/main/java/de/kcodeyt/headsdb/database/Database.java

@@ -0,0 +1,16 @@
+package de.kcodeyt.headsdb.database;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Getter
+@ToString
+@NoArgsConstructor
+public class HeadEntry {
+
+    private final String name = null;
+    private final String id = null;
+    private final String texture = null;
+
+}

src/main/java/de/kcodeyt/headsdb/database/HeadEntry.java

@@ -6,27 +6,22 @@
 import cn.nukkit.event.player.PlayerFormRespondedEvent;
 import cn.nukkit.event.player.PlayerQuitEvent;
 import cn.nukkit.form.window.FormWindow;
-import cn.nukkit.plugin.Plugin;
-import cn.nukkit.plugin.PluginManager;
 import cn.nukkit.scheduler.TaskHandler;
-import de.kcodeyt.headsdb.HeadsDB;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 public class FormAPI {
 
     private static final Map<FormWindow, Handler> HANDLERS = new HashMap<>();
-    private static final FormListener FORM_LISTENER = new FormListener();
 
     public static void create(Player player, FormWindow formWindow, Runnable onResponse) {
         new Handler(player, formWindow, onResponse);
     }
 
     public static class FormListener implements Listener {
 
-        private HeadsDB headsDB;
-
         @EventHandler
         public void onForm(PlayerFormRespondedEvent event) {
             this.handle(event.getWindow(), false);
@@ -51,19 +46,6 @@ private void handle(FormWindow formWindow, boolean isQuit) {
                 handler.handle(isQuit);
         }
 
-        private boolean register(Player player) {
-            if(this.headsDB != null)
-                return true;
-            final PluginManager pluginManager = player.getServer().getPluginManager();
-            for(final Plugin plugin : pluginManager.getPlugins().values()) {
-                if(plugin instanceof HeadsDB) {
-                    pluginManager.registerEvents(this, this.headsDB = (HeadsDB) plugin);
-                    return true;
-                }
-            }
-            return false;
-        }
-
     }
 
     private static class Handler {
@@ -73,14 +55,9 @@ private static class Handler {
 
         private Handler(Player player, FormWindow formWindow, Runnable runnable) {
             this.runnable = runnable;
-            if(FORM_LISTENER.register(player)) {
-                HANDLERS.put(formWindow, this);
-                player.showFormWindow(formWindow);
-                this.taskHandler = player.getServer().getScheduler().scheduleDelayedRepeatingTask(FORM_LISTENER.headsDB, player::sendExperience, 3, 3);
-                return;
-            }
-
-            this.taskHandler = null;
+            player.showFormWindow(formWindow);
+            this.taskHandler = player.getServer().getScheduler().scheduleDelayedRepeatingTask(null, player::sendExperience, 3, 3);
+            HANDLERS.put(formWindow, this);
         }
 
         private void handle(boolean isQuit) {

src/main/java/de/kcodeyt/headsdb/util/FormAPI.java

@@ -1,5 +1,6 @@
 package de.kcodeyt.headsdb.util;
 
+import cn.nukkit.form.element.ElementButtonImageData;
 import de.kcodeyt.heads.util.api.Mojang;
 import de.kcodeyt.heads.util.api.SkinAPI;
 
@@ -8,8 +9,12 @@ public class HeadRender {
     private static final String URL = "https://mc-heads.net/head/";
     private static final int SIZE = 256;
 
-    public static String createUrl(String texture) {
+    private static String createUrl(String texture) {
         return URL + SkinAPI.fromBase64(texture).substring(Mojang.TEXTURES.length()) + "/" + SIZE;
     }
 
+    public static ElementButtonImageData createButtonImage(String texture) {
+        return new ElementButtonImageData(ElementButtonImageData.IMAGE_DATA_TYPE_URL, HeadRender.createUrl(texture));
+    }
+
 }