Merge master into feat/garden

Author: ArikSquad

.github/dependabot.yml

@@ -5,11 +5,15 @@
 
 version: 2
 updates:
-  - package-ecosystem: "gradle" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: "gradle"
+    directory: "/"
     schedule:
       interval: "weekly"
   - package-ecosystem: "npm"
     directory: "/website"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/pull_request.yml

@@ -2,35 +2,35 @@ name: Java CI with Gradle
 
 on:
   pull_request:
-    branches: [ "master" ]
+    branches:
+      - master
+
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
 
       - name: Set up JDK 25
-        uses: actions/setup-java@v5.1.0
+        uses: actions/setup-java@v5
         with:
           java-version: '25'
           distribution: 'temurin'
+          check-latest: false
 
       - name: Grant Gradlew Permissions
         run: chmod +x gradlew
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-      - name: Build with Gradle
-        run: ./gradlew shadowJar
+        uses: gradle/actions/setup-gradle@v6
 
-      - name: Cache Gradle packages
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+      - name: Build with Gradle
+        run: ./gradlew shadowJar --no-daemon

.github/workflows/release.yml

@@ -7,36 +7,55 @@ on:
 permissions:
   contents: write
 
+concurrency:
+  group: add-to-github-releases
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v7
 
       - name: Set up JDK 25
-        uses: actions/setup-java@v5.1.0
+        uses: actions/setup-java@v5
         with:
           java-version: '25'
           distribution: 'temurin'
 
-      - name: Grant Gradlew Permissions
-        run: chmod +x gradlew
-
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
+
       - name: Build with Gradle
-        run: ./gradlew shadowJar
+        run: ./gradlew --parallel --build-cache shadowJar
 
-      - name: Cache Gradle packages
-        uses: actions/cache@v4
+      - name: Set up Go
+        uses: actions/setup-go@v6
         with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          go-version-file: setup/go.mod
+          check-latest: false
+          cache-dependency-path: |
+            setup/go.mod
+            setup/go.sum
+
+      - name: Test setup TUI
+        run: go test ./...
+        working-directory: setup
+
+      - name: Build setup TUI release assets
+        working-directory: setup
+        run: |
+          mkdir -p dist
+          for goos in linux darwin; do
+            for goarch in amd64 arm64; do
+              name="skyblock-installer_${goos}_${goarch}"
+              CGO_ENABLED=0 GOOS="$goos" GOARCH="$goarch" \
+                go build -trimpath -ldflags="-s -w" -o "dist/skyblock-installer" ./cmd/skyblock-installer
+              tar -C dist -czf "dist/${name}.tar.gz" skyblock-installer
+              rm dist/skyblock-installer
+            done
+          done
 
       - name: Add Jar to GitHub releases
         uses: marvinpinto/action-automatic-releases@latest
@@ -60,3 +79,4 @@ jobs:
             service.orchestrator/build/libs/*.jar
             service.friend/build/libs/*.jar
             service.darkauction/build/libs/*.jar
+            setup/dist/*.tar.gz

.gitignore

@@ -36,12 +36,17 @@ build/
 
 
 ### Worlds / Maps ###
+/configuration/world/
 /configuration/skyblock/islands/
 /configuration/hypixel_prototype_lobby/
 /configuration/hypixel_bedwars_lobby/
 /configuration/hypixel_murder_mystery_lobby/
 /configuration/hypixel_skywars_lobby/
+/configuration/skyblock/garden/
 *.polar
+*.schem
+/setup/skyblock-installer
+/configuration/*.schem
 
 ### Logs ###
 /configuration/logs/
@@ -51,7 +56,6 @@ build/
 .gradle/
 /server/proxy/logs/
 /server/proxy/lang/
-/server/proxy/ViaLoader/
 /server/proxy/plugins/
 /server/proxy/forwarding.secret
 /server/proxy/velocity.toml
@@ -60,5 +64,3 @@ build/
 /server/forwarding.secret
 /configuration/config.yml
 /server/proxy/configuration/config.yml
-
-### Resource pack build output ###

DockerFiles/Dockerfile.game_server

@@ -19,18 +19,13 @@ RUN curl -fSL -o HypixelCore.jar "https://github.com/Swofty-Developments/Hypixel
 # Copy configuration data
 COPY ./configuration /app/configuration_files
 
-RUN mkdir -p configuration && \
-    cp configuration_files/config.yml ./configuration/config.yml
-
-RUN curl -fSL -o /tmp/worlds.tar.gz "https://files.catbox.moe/9uas8z.gz" && \
-    tar -xzf /tmp/worlds.tar.gz -C ./configuration && \
-    rm /tmp/worlds.tar.gz
+RUN mkdir -p configuration && \
+    cp -a configuration_files/. ./configuration/
 
 EXPOSE 25565 65535 8080 20000
 
-RUN cp configuration_files/server.toml ./server.toml && \
-    cp -a configuration_files/skyblock/. configuration/skyblock/ && \
-    cp configuration_files/entrypoint.sh ./entrypoint.sh && \
-    chmod +x entrypoint.sh
+RUN cp configuration_files/server.toml ./server.toml && \
+    cp configuration_files/entrypoint.sh ./entrypoint.sh && \
+    chmod +x entrypoint.sh
 
 CMD ["sh", "entrypoint.sh"]

DockerFiles/Dockerfile.proxy

@@ -5,7 +5,7 @@ WORKDIR /app
 RUN apt-get update && apt-get install -y jq netcat-traditional curl && apt-get clean
 
 # Download Velocity proxy JAR
-RUN curl -fSL -o velocity.jar "https://fill-data.papermc.io/v1/objects/ef1a852bfae7397e84907837925e7ad21c6312066290edaae401b77f6f423ac3/velocity-3.4.0-SNAPSHOT-558.jar"
+RUN curl -fSL -o velocity.jar "https://fill-data.papermc.io/v1/objects/0ec616020166465dacca3b790d3db2b246f8f7c13b3aaacaae60c825744a66e0/velocity-3.5.0-SNAPSHOT-605.jar"
 
 # Download SkyBlockProxy.jar
 RUN mkdir -p plugins && \

README.md

@@ -2,7 +2,7 @@
 
 [<img src="https://discordapp.com/assets/e4923594e694a21542a489471ecffa50.svg" alt="Discord" height="55" />](https://discord.swofty.net)
 
-A 1.21.11 Minestom-based recreation of Hypixel SkyBlock with a properly abstracted, scalable microservices architecture.
+A 26.1.2 Minestom-based recreation of Hypixel SkyBlock with a properly abstracted, scalable microservices architecture.
 
 > **Note**: This implementation is under active development and is not yet production-ready.
 

anticheat/README.md

@@ -2,14 +2,14 @@
 
 [<img src="https://discordapp.com/assets/e4923594e694a21542a489471ecffa50.svg" alt="" height="55" />](https://discord.gg/atlasmc)
 
-An advanced prediction-based anticheat for both Minestom and Spigot/Bukkit servers. Features comprehensive packet tracking, movement prediction with physics simulation, and lag compensation.
+An advanced prediction-based anticheat for Minestom servers. Features comprehensive packet tracking, movement prediction
+with physics simulation, and lag compensation.
 
 ## Table of contents
 
 * [Features](#features)
 * [Getting Started](#getting-started)
 * [Minestom Loader](#minestom-loader)
-* [Spigot Loader](#spigot-loader)
 * [API Usage](#api-usage)
   * [Custom Modifiers](#custom-modifiers)
   * [Player Data Storage](#player-data-storage)
@@ -47,12 +47,12 @@ An advanced prediction-based anticheat for both Minestom and Spigot/Bukkit serve
 
 ### Cross-Platform Support
 - Full Minestom support with native packet API
-- Full Spigot/Bukkit support via ProtocolLib
 - Unified packet abstraction layer
 - Platform-specific scheduler managers
 
 ## Getting Started
-SwoftyAnticheat requires Java 17+ and either Minestom or Spigot/Bukkit with ProtocolLib. 
+
+SwoftyAnticheat requires Java 25+ and Minestom.
 
 ## Minestom Loader
 To use SwoftyAnticheat with Minestom, create a new instance of the MinestomLoader and initialize the anticheat:
@@ -67,24 +67,6 @@ SwoftyAnticheat.start(); // Do this after MinecraftServer#init()
 
 The MinestomLoader automatically registers all packet listeners using Minestom's native packet API.
 
-## Spigot Loader
-To use SwoftyAnticheat with Spigot/Bukkit, you need ProtocolLib installed. Then create a SpigotLoader instance:
-
-```java
-public class YourPlugin extends JavaPlugin {
-    @Override
-    public void onEnable() {
-        SpigotLoader spigotLoader = new SpigotLoader(this);
-
-        SwoftyAnticheat.loader(spigotLoader);
-        SwoftyAnticheat.values(new SwoftyValues());
-        SwoftyAnticheat.start();
-    }
-}
-```
-
-The SpigotLoader uses ProtocolLib to intercept and process all relevant packets.
-
 ## API Usage
 
 SwoftyAnticheat provides a comprehensive API for extending the anticheat with custom functionality.

anticheat/build.gradle.kts

@@ -34,8 +34,6 @@ dependencies {
     implementation(libs.tinylog.api)
     implementation(libs.tinylog.impl)
 
-    compileOnly(libs.spigot.api)
-
     compileOnly(libs.protocollib)
 }
 

anticheat/src/main/java/net/swofty/anticheat/api/AnticheatAPI.java

@@ -12,7 +12,7 @@
 
 /**
  * Main API entry point for interacting with the Swofty Anticheat.
- *
+ * <p>
  * This API allows you to:
  * - Register custom movement modifiers
  * - Store and retrieve custom player data