remaining to be tested: serving resource packs, discordsrv integration

Author: cinnamondev

src/main/java/com/github/cinnamondev/minemoji/Minemoji.java

@@ -7,7 +7,7 @@
 import java.net.URISyntaxException;
 
 public final class Minemoji extends JavaPlugin {
-    private static final URI DEFAULT_URI = URI.create("https://cinnamondev.github.io/minemoji/latest.zip");
+    public static final URI DEFAULT_URI = URI.create("https://cinnamondev.github.io/minemoji/latest.zip");
     private static boolean DO_DISCORD_SRV = false;
     public DiscordIntegration discord = null;
     public SpriteEmojiManager emojiManager;

src/main/java/com/github/cinnamondev/minemoji/RequestPacks.java

@@ -20,9 +20,6 @@
 
 public class RequestPacks implements Listener {
     public static CompletableFuture<RequestPacks> requestPacks(Minemoji p, SpriteEmojiManager emojiManager) throws URISyntaxException {
-        // ew bwaah
-        CompletableFuture<ResourcePackInfo> future = new CompletableFuture<>();
-
         ArrayList<CompletableFuture<ResourcePackInfo>> futures =
                 emojiManager.customPacks.values().parallelStream()
                         .map(e -> ResourcePackInfo.resourcePackInfo()
@@ -33,14 +30,14 @@ public static CompletableFuture<RequestPacks> requestPacks(Minemoji p, SpriteEmo
 
         if (p.getConfig().getBoolean("unicode-emojis.enabled", true)) {
             String defaultPack = p.getConfig().getString("unicode-emojis.uri");
-            if (defaultPack != null && !defaultPack.isEmpty()) {
-                futures.add(
-                        ResourcePackInfo.resourcePackInfo()
-                                .uri(new URI(defaultPack))
-                                .id(UUID.fromString("unicode-emojis"))
-                                .computeHashAndBuild()
-                );
-            }
+            URI uri;
+            if (defaultPack == null) { uri = Minemoji.DEFAULT_URI; } else { uri = new URI(defaultPack); }
+            futures.add(
+                    ResourcePackInfo.resourcePackInfo()
+                            .uri(uri)
+                            .id(UUID.fromString("unicode-emojis"))
+                            .computeHashAndBuild()
+            );
         }
 
         if (futures.isEmpty()) {