Merge remote-tracking branch 'origin/main'

Author: zigazajc007

.github/release.yml

@@ -0,0 +1,25 @@
+# Configure how the release notes are generated for GitHub releases
+
+changelog:
+  # List of authors (like bots) and labels to exclude from pull requests
+  exclude:
+    labels:
+      - ignore-for-release
+  categories:
+    - title: 🛠 Breaking Changes 
+      labels:
+        - Semver-Major
+        - breaking-change
+    - title: 🎉 Exciting New Features 
+      labels:
+        - Semver-Minor
+        - enhancement
+    - title: 🐞 Bugfixes
+      labels:
+        - bug
+    - title: 👒 Dependencies
+      labels:
+        - dependencies
+    - title: Other Changes
+      labels:
+        - "*"

.github/workflows/maven.yml

@@ -64,4 +64,4 @@ jobs:
 
       - name: Submit Dependency Snapshot
         if: ${{ github.event_name == 'push' }}
-        uses: advanced-security/maven-dependency-submission-action@v4.1.2
+        uses: advanced-security/maven-dependency-submission-action@v5.0.0

README.md

@@ -32,7 +32,11 @@ Development builds contain the latest changes from the Source-Code. They are ble
 but also include features, enhancements and bug fixes that are not yet in a released version. If you click on the left
 side on `Changes`, you can see iterative change sets leading to a specific build.
 
-You can download them from here: https://ci.codemc.org/job/Games647/job/FastLogin/
+~~You can download them from here: [CodeMC(Jenkins)](https://ci.codemc.org/job/Games647/job/FastLogin/)~~
+
+Currently broken due changed usernames. Download it from [here](https://github.com/TuxCoding/FastLogin/releases)
+
+
 
 ***
 

bukkit/pom.xml

@@ -354,6 +354,14 @@
             <version>v3.0.0</version>
             <scope>provided</scope>
             <optional>true</optional>
+
+            <!-- Exclude dependencies to prevent potential version conflicts-->
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--No maven repository :(-->

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java

@@ -28,6 +28,7 @@
 import com.comphenix.protocol.ProtocolLibrary;
 import com.github.games647.fastlogin.bukkit.command.CrackedCommand;
 import com.github.games647.fastlogin.bukkit.command.PremiumCommand;
+import com.github.games647.fastlogin.bukkit.command.DeleteCommand;
 import com.github.games647.fastlogin.bukkit.listener.ConnectionListener;
 import com.github.games647.fastlogin.bukkit.listener.PaperCacheListener;
 import com.github.games647.fastlogin.bukkit.listener.protocollib.ProtocolLibListener;
@@ -155,6 +156,7 @@ private void registerCommands() {
         //register commands using a unique name
         Optional.ofNullable(getCommand("premium")).ifPresent(c -> c.setExecutor(new PremiumCommand(this)));
         Optional.ofNullable(getCommand("cracked")).ifPresent(c -> c.setExecutor(new CrackedCommand(this)));
+        Optional.ofNullable(getCommand("fldelete")).ifPresent(c -> c.setExecutor(new DeleteCommand(this)));
     }
 
     private boolean initializeFloodgate() {

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/DeleteCommand.java

@@ -0,0 +1,94 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015-2024 games647 and 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 com.github.games647.fastlogin.bukkit.command;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
+
+public class DeleteCommand implements TabExecutor {
+    private final FastLoginBukkit plugin;
+
+    public DeleteCommand(FastLoginBukkit plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Handles the command to delete profiles.
+     */
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+
+        if (!sender.hasPermission(command.getPermission())) {
+            plugin.getCore().sendLocaleMessage("no-permission", sender);
+            return true;
+        }
+
+        if (plugin.getBungeeManager().isEnabled()) {
+            sender.sendMessage("Error: Cannot delete profile entries when using BungeeCord!");
+            return false;
+        }
+
+        if (args.length < 1) {
+            sender.sendMessage("Error: Must supply username to delete!");
+            return false;
+        }
+
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+            int count = plugin.getCore().getStorage().deleteProfile(args[0]);
+            if (!(sender instanceof ConsoleCommandSender)) {
+                Bukkit.getScheduler().runTask(plugin, () -> {
+                    if (count == 0) {
+                        sender.sendMessage("Error: No profile entries found!");
+                    } else {
+                        sender.sendMessage("Deleted " + count + " matching profile entries");
+                    }
+                });
+            }
+        });
+
+        return true;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        List<String> list = new ArrayList<>();
+        for (Player p : Bukkit.getOnlinePlayers()) {
+            if (p.getName().toLowerCase().startsWith(args[0])) {
+                list.add(p.getName());
+            }
+        }
+        return null;
+    }
+}

bukkit/src/main/resources/plugin.yml

@@ -45,6 +45,11 @@ commands:
         usage: /<command> [player]
         permission: ${project.artifactId}.command.cracked
 
+    fldelete:
+        description: 'Delete player profile data'
+        usage: /<command> [player]
+        permission: ${project.artifactId}.command.delete
+
 permissions:
     ${project.artifactId}.command.premium:
         description: 'Label themselves as premium'
@@ -63,3 +68,7 @@ permissions:
         description: 'Label others as cracked'
         children:
             ${project.artifactId}.command.cracked: true
+
+    ${project.artifactId}.command.delete:
+        description: 'Delete other players profile data'
+        default: op

core/pom.xml

@@ -203,7 +203,7 @@
         <dependency>
             <groupId>com.github.games647</groupId>
             <artifactId>craftapi</artifactId>
-            <version>0.8.1</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <!-- Database driver included in Spigot -->

core/src/main/java/com/github/games647/fastlogin/core/ProxyAgnosticMojangResolver.java

@@ -27,10 +27,9 @@
 
 import com.github.games647.craftapi.model.auth.Verification;
 import com.github.games647.craftapi.resolver.MojangResolver;
+import com.github.games647.craftapi.resolver.Options;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
 import java.net.InetAddress;
 import java.util.Optional;
 
@@ -44,38 +43,12 @@
  */
 public class ProxyAgnosticMojangResolver extends MojangResolver {
 
-    private static final String HOST = "sessionserver.mojang.com";
-
-    /**
-     * A formatting string containing a URL used to call the {@code hasJoined} method on mojang session servers.
-     * <p>
-     * Formatting parameters:
-     * 1. The username of the player in question
-     * 2. The serverId of this server
-     */
-    public static final String ENDPOINT = "https://" + HOST + "/session/minecraft/hasJoined?username=%s&serverId=%s";
-
+    public ProxyAgnosticMojangResolver(Options options) {
+        super(options);
+    }
     @Override
     public Optional<Verification> hasJoined(String username, String serverHash, InetAddress hostIp)
         throws IOException {
-        String url = String.format(ENDPOINT, username, serverHash);
-
-        HttpURLConnection conn = this.getConnection(url);
-        int responseCode = conn.getResponseCode();
-
-        Verification verification = null;
-
-        // Mojang session servers send HTTP 204 (NO CONTENT) when the authentication seems invalid
-        // If that's not our case, the authentication is valid, and so we can parse the response.
-        if (responseCode != HttpURLConnection.HTTP_NO_CONTENT) {
-            verification = this.parseRequest(conn, this::parseVerification);
-        }
-
-        return Optional.ofNullable(verification);
-    }
-
-    // Functional implementation of InputStreamAction, used in hasJoined method in parseRequest call
-    protected Verification parseVerification(InputStream input) throws IOException {
-        return this.readJson(input, Verification.class);
+        return super.hasJoined(username, serverHash, null);
     }
 }

core/src/main/java/com/github/games647/fastlogin/core/scheduler/AbstractAsyncScheduler.java

@@ -43,9 +43,30 @@ public AbstractAsyncScheduler(Logger logger, Executor processingPool) {
         this.processingPool = processingPool;
     }
 
-    public abstract CompletableFuture<Void> runAsync(Runnable task);
+    public CompletableFuture<Void> runAsync(Runnable task) {
+        return CompletableFuture.runAsync(() -> process(task), processingPool).exceptionally(error -> {
+            logger.warn("Error occurred on thread pool", error);
+            return null;
+        });
+    }
 
-    public abstract CompletableFuture<Void> runAsyncDelayed(Runnable task, Duration delay);
+    public CompletableFuture<Void> runAsyncDelayed(Runnable task, Duration delay) {
+        return CompletableFuture.runAsync(() -> {
+            currentlyRunning.incrementAndGet();
+            try {
+                Thread.sleep(delay.toMillis());
+                task.run();
+            } catch (InterruptedException interruptedException) {
+                // restore interrupt flag
+                Thread.currentThread().interrupt();
+            } finally {
+                currentlyRunning.getAndDecrement();
+            }
+        }, processingPool).exceptionally(error -> {
+            logger.warn("Error occurred on thread pool", error);
+            return null;
+        });
+    }
 
     protected void process(Runnable task) {
         currentlyRunning.incrementAndGet();