Merge branch 'ju'

Author: julian-siebert

.devcontainer/README.md

@@ -0,0 +1,25 @@
+# Development Container Usage
+
+Full development setup available as [Development Container](https://containers.dev/).
+Please use it for being able to tell "It works on my machine".
+
+**Docker is required to be installed on your machine!**
+
+## IntelliJ IDEA
+
+- Open IntelliJ (Welcome screen)
+- Navigate to `Remote Development` - `Dev Containers`
+- Press `New Dev Container`
+- Select `From VCS Project`
+- Select and connect with `Docker`
+- Select `IntelliJ IDEA`
+- Enter `Git Repository`: `https://github.com/o7studios/cheetah-plugin`
+- Select `Detection for devcontainer.json file` `Automatic`
+- Press `Build Container and Continue`
+
+## Development Container Issues
+
+If you encounter an issue with setting up a development container, please
+try to rebuild it first before opening a GitHub Issue. It's not uncommon
+that some issues may fix themselves after a fresh container rebuild.
+

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "name": "Cheetah plugin",
+  "name": "o7studios/cheetah-plugin",
   "image": "ubuntu:latest",
   "customizations" : {
     "jetbrains" : {
@@ -15,17 +15,9 @@
     "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
     "ghcr.io/rio/features/k3d:1": {},
     "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {},
-    "ghcr.io/devcontainers/features/java:1": {
-      "version": "23",
-      "installGradle": true
-    }
-  },
-  "runArgs": [
-    "--add-host=host.docker.internal:host-gateway",
-    "--env-file=${localEnv:HOME}/dev.env"
-  ],
-  "containerEnv": {
-    "TEST_CLUSTER_NAME": "o7-test-cluster"
+    "ghcr.io/devcontainers/features/java:1": {"version": "23", "installGradle": true}
   },
+  "runArgs": ["--add-host=host.docker.internal:host-gateway", "--env-file=${localEnv:HOME}/dev.env"],
+  "containerEnv": {"TEST_CLUSTER_NAME": "o7-test-cluster"},
   "remoteUser": "ubuntu"
 }

Dockerfile

@@ -1,25 +1,19 @@
-FROM --platform=$BUILDPLATFORM debian AS paper
-
-RUN apt-get update
-RUN apt-get install jq curl wget -y
+FROM --platform=$BUILDPLATFORM ghcr.io/o7studios/scripts:latest AS paper
 
 WORKDIR /paper
 
-COPY test/paper/install.sh ./install.sh
-
-RUN chmod +x ./install.sh && ./install.sh
-RUN rm ./install.sh -rf
-
+RUN paper 1.21.8
+RUN floodgate latest ./plugins/floodgate.jar
+RUN viaversion latest ./plugins/viaversion.jar
+RUN octopus latest ./plugins/octopus.jar
 
 FROM --platform=$BUILDPLATFORM ghcr.io/graalvm/jdk-community:25 AS prerun
 
 WORKDIR /paper
 
 COPY --from=paper /paper/ .
 
-COPY test/paper/bukkit.yml .
-COPY test/paper/spigot.yml .
-COPY test/paper/server.properties .
+COPY test/paper/* ./
 
 RUN java -jar paperclip.jar --nogui
 

README.md

@@ -25,25 +25,4 @@ depend:
 
 ## Development
 
-Full development setup available as [Development Container](https://containers.dev/).
-Please use it for being able to tell "It works on my machine".
-
-**Docker is required to be installed on your machine!**
-
-### IntelliJ IDEA
-
-- Open IntelliJ (Welcome screen)
-- Navigate to `Remote Development` - `Dev Containers`
-- Press `New Dev Container`
-- Select `From VCS Project`
-- Select and connect with `Docker`
-- Select `IntelliJ IDEA`
-- Enter `Git Repository`: `https://github.com/o7studios/cheetah-plugin`
-- Select `Detection for devcontainer.json file` `Automatic`
-- Press `Build Container and Continue`
-
-### Development Container Issues
-
-If you encounter an issue with setting up a development container, please
-try to rebuild it first before opening a GitHub Issue. It's not uncommon
-that some issues may fix themselves after a fresh container rebuild.
+Please check out [Development Container](.devcontainer/README.md) for project setup.

delete.sh

@@ -4,6 +4,25 @@ set -e
 API_PORT=6550
 API_HOST=host.docker.internal
 
+while [[ "$#" -gt 0 ]]; do
+  case $1 in
+    --delete)
+      echo "🗑 Deleting cluster $TEST_CLUSTER_NAME..."
+      k3d cluster delete "$TEST_CLUSTER_NAME" || true
+      exit 0
+      ;;
+    --recreate)
+      echo "🔄 Recreating cluster $TEST_CLUSTER_NAME..."
+      k3d cluster delete "$TEST_CLUSTER_NAME" || true
+      ;;
+    *)
+      echo "❓ Unknown parameter: $1"
+      exit 1
+      ;;
+  esac
+  shift
+done
+
 if ! k3d cluster list | grep -qw "$TEST_CLUSTER_NAME"; then
   echo "🔧 K3d cluster $TEST_CLUSTER_NAME not found. Creating it..."
   k3d cluster create "$TEST_CLUSTER_NAME" --api-port "$API_PORT" -p "25565:25565@loadbalancer" -p "19132:19132/udp@loadbalancer"
@@ -28,6 +47,8 @@ kubectl config set-cluster k3d-"$TEST_CLUSTER_NAME" \
 
 kubectl config use-context k3d-"$TEST_CLUSTER_NAME"
 
+pids=()
+
 if ! kubectl get secret github-token >/dev/null 2>&1; then
   echo "🔐 Creating secret for github-token on K3d cluster $TEST_CLUSTER_NAME..."
   kubectl create secret generic github-token --from-literal="GITHUB_TOKEN=$GITHUB_TOKEN"