Merge build-info updates

.cache/debian-base.digest

@@ -1 +0,0 @@
-gitea.fithwum.tech/fithwum/debian-base@sha256:b405854d9dbfb510af67cd8d949a488c86d05c3ac1890558c40a6bf993d82703

.gitea/workflows/file.txt

@@ -1,21 +0,0 @@
-      # - name: Compare with stored digest
-      #   id: compare_digest
-      #   run: |
-      #     CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
-      #     LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
-      #     if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
-      #       echo "changed=false" >> $GITHUB_OUTPUT
-      #     else
-      #       echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-      #       git config user.name "${{ secrets.GIT_USERNAME }}"
-      #       git config user.email "${{ secrets.GIT_EMAIL }}"
-      #       git add ${{ env.DIGEST_FILE }}
-      #       git commit -m "Update base digest to $CURRENT_DIGEST" || true
-      #       # Try to rebase onto latest remote
-      #       git pull --rebase || {
-      #         echo "[ERROR] Rebase failed — aborting."
-      #         exit 1
-      #       }
-      #       git push
-      #       echo "changed=true" >> $GITHUB_OUTPUT
-      #     fi

.gitea/workflows/minecraft-build-bukkit.yml

@@ -1,405 +0,0 @@
-name: minecraft-build-bukkit
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.gitea/workflows/minecraft-build-bukkit.yml'
-      - 'bukkit/Dockerfile'
-      - 'bukkit/*.sh'
-      - '!.cache/*'
-      - '!bukkit/CHANGES.md'
-      - '!bukkit/build-info.json'
-  schedule:
-    - cron: '30 21 * * 0'
-
-env:
-  IMAGE_REGISTRY: gitea.fithwum.tech
-  IMAGE_ORG: fithwum
-  IMAGE_REPO_DEBIAN: debian-base
-  IMAGE_REPO_MINECRAFT: minecraft
-  IMAGE_TAG_DEBIAN: bookworm
-  DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: bukkit
-
-jobs:
-  docker-prune:
-    name: Docker prune (${{ matrix.runner }})
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runner:
-          - vm-docker-build2
-    steps:
-      - name: Prune unused Docker images
-        run: |
-          echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
-          docker image prune -a -f || true
-
-  poll-debian-base-and-detect-changes:
-    runs-on: vm-docker-build2
-    needs: docker-prune
-    outputs:
-      digest_changed: ${{ steps.compare_digest.outputs.changed }}
-      versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }}
-      new_versions: ${{ steps.check_new_versions.outputs.new_versions }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Ensure .cache exists
-        run: mkdir -p .cache && touch .cache/.gitkeep
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Get current digest of debian-base image
-        id: get_digest
-        run: |
-          IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}"
-          docker pull "$IMAGE" > /dev/null
-          DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-          echo "$DIGEST" > .cache/debian-base.digest.new
-
-      - name: Compare with stored digest
-        id: compare_digest
-        run: |
-          CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
-          LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
-
-          if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
-            echo "[INFO] Digest unchanged"
-            echo "changed=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          echo "[INFO] Digest changed → updating cache"
-          echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          git add ${{ env.DIGEST_FILE }}
-          git commit -m "Update base digest to $CURRENT_DIGEST" || true
-
-          # --- Safe rebase with auto conflict resolution ---
-          git fetch origin master
-          if ! git rebase --strategy-option=theirs origin/master; then
-            echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
-            git rebase --abort
-            git fetch origin master
-            git reset --hard origin/master
-            echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-            git add ${{ env.DIGEST_FILE }}
-            git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
-          fi
-
-          git push origin HEAD:master
-          echo "changed=true" >> $GITHUB_OUTPUT
-
-      - name: Detect changed Minecraft versions
-        id: check_changed_versions
-        run: |
-          BEFORE_COMMIT="${{ github.event.before }}"
-          if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then
-            BEFORE_COMMIT=$(git rev-parse HEAD~1)
-          fi
-          CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
-          CHANGED_VERSIONS=""
-          for version in $VERSIONS; do
-            echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
-          done
-          CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
-          echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT
-      
-      - name: Detect Minecraft versions without build-info
-        id: check_new_versions
-        run: |
-          NEW_VERSIONS=""
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-          for version in $VERSIONS; do
-            if [ ! -f "upload-repo/$version/build-info.json" ]; then
-              echo "[INFO] No build-info.json for $version → treating as new"
-              NEW_VERSIONS="$NEW_VERSIONS $version"
-            fi
-          done
-
-          echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT
-
-  build-minecraft-images:
-    runs-on: vm-docker-build2
-    needs:
-      - docker-prune
-      - poll-debian-base-and-detect-changes
-    if: |
-      needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' ||
-      needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' ||
-      needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
-    strategy:
-      matrix:
-        version: [bukkit]
-    name: Build and Push ${{ matrix.version }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Clone Minecraft repo (with retries)
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          for i in {1..5}; do
-            git clone "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo && break
-            echo "[WARN] Clone attempt $i failed. Retrying in 10s..."
-            sleep 10
-          done
-          if [ ! -d upload-repo ]; then
-            echo "[ERROR] Failed to clone Minecraft repo after retries."
-            exit 1
-          fi
-
-      - name: Build and push image
-        run: |
-          IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
-          docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
-
-  generate-changelogs:
-    needs: build-minecraft-images
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Create temporary changelog workspace
-        run: mkdir -p changelogs
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=3 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate changelogs
-        run: |
-          for version in $VERSIONS; do
-            echo "[INFO] Generating changelog for $version"
-            changelog="changelogs/$version/CHANGES.md"
-            mkdir -p "$(dirname "$changelog")"
-            touch "$changelog"
-
-            cd upload-repo
-            infofile="$version/build-info.json"
-            last_commit=""
-            if [ -f "$infofile" ]; then
-              last_commit=$(jq -r '.commit' "$infofile")
-            fi
-
-            echo -e "## $(date -u +'%Y-%m-%dT%H:%M:%SZ')\n" > "../$changelog"
-            if [ -n "$last_commit" ]; then
-              COMMITS=$(git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" || true)
-            fi
-            if [ -z "$COMMITS" ]; then
-              echo "[INFO] No new commits since last build. Showing latest 5 instead."
-              COMMITS=$(git log -n 5 --pretty=format:"- %s (%an)" || true)
-            fi
-            echo "$COMMITS" >> "../$changelog"
-            cd ..
-          done
-
-      - name: Copy changelogs into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp changelogs/$version/CHANGES.md upload-repo/$version/
-          done
-
-      - name: Commit and push changelogs (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-changelog-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */CHANGES.md
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No changelog changes."
-            exit 0
-          fi
-
-          git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Fast-forward master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge changelog updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-  generate-build-info:
-    needs: generate-changelogs
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Prepare temporary build-info workspace
-        run: mkdir -p buildinfo
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate build-info files
-        run: |
-          human_size() {
-            local b=$1 d='' s=0 S=(B KB MB GB TB)
-            while ((b >= 1024 && s < ${#S[@]}-1)); do
-              d=$((b % 1024)); b=$((b / 1024)); s=$((s + 1))
-            done
-            printf "%s%s\n" "$b" "${S[$s]}"
-          }
-
-          for version in $VERSIONS; do
-            echo "[INFO] Generating build-info.json for $version"
-            image="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO_MINECRAFT}:$version"
-            infofile="buildinfo/$version/build-info.json"
-            mkdir -p "$(dirname "$infofile")"
-
-            if ! docker pull "$image"; then
-              echo "[WARN] Failed to pull $image — setting fields to unknown/0"
-              digest="unknown"
-              size_bytes=0
-            else
-              digest=$(docker inspect --format='{{if .RepoDigests}}{{index .RepoDigests 0}}{{else}}unknown{{end}}' "$image" 2>/dev/null || echo "unknown")
-              size_bytes=$(docker image inspect "$image" --format='{{.Size}}' 2>/dev/null || echo "0")
-              size_bytes=${size_bytes//[^0-9]/}
-              if [[ -z "$size_bytes" ]]; then size_bytes=0; fi
-            fi
-
-            size_human=$(human_size "$size_bytes")
-
-            cd upload-repo
-            commit=$(git rev-parse HEAD)
-            cd ..
-
-            jq -n \
-              --arg version "$version" \
-              --arg commit "$commit" \
-              --arg build_time "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
-              --arg image_tag "$image" \
-              --arg digest "$digest" \
-              --arg image_size "$size_human" \
-              --argjson image_size_bytes "$size_bytes" \
-              '{
-                version: $version,
-                commit: $commit,
-                build_time: $build_time,
-                image_tag: $image_tag,
-                digest: $digest,
-                image_size: $image_size,
-                image_size_bytes: $image_size_bytes
-              }' > "$infofile"
-          done
-
-      - name: Copy build-info.json into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp "buildinfo/$version/build-info.json" "upload-repo/$version/"
-          done
-
-      - name: Commit and push build-info (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-buildinfo-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */build-info.json
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No build-info changes."
-            exit 0
-          fi
-
-          git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Merge into master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge build-info updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-          for version in $VERSIONS; do
-            TAG="build-$version"
-
-            git tag -d "$TAG" 2>/dev/null || true
-            git push origin ":refs/tags/$TAG" 2>/dev/null || true
-
-            git tag "$TAG"
-            git push origin "$TAG" --force
-          done

.gitea/workflows/minecraft-build-fabric.yml

@@ -1,405 +0,0 @@
-name: minecraft-build-fabric
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.gitea/workflows/minecraft-build-fabric.yml'
-      - 'fabric/Dockerfile'
-      - 'fabric/*.sh'
-      - '!.cache/*'
-      - '!fabric/CHANGES.md'
-      - '!fabric/build-info.json'
-  schedule:
-    - cron: '30 21 * * 0'
-
-env:
-  IMAGE_REGISTRY: gitea.fithwum.tech
-  IMAGE_ORG: fithwum
-  IMAGE_REPO_DEBIAN: debian-base
-  IMAGE_REPO_MINECRAFT: minecraft
-  IMAGE_TAG_DEBIAN: bookworm
-  DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: fabric
-
-jobs:
-  docker-prune:
-    name: Docker prune (${{ matrix.runner }})
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runner:
-          - vm-docker-build2
-    steps:
-      - name: Prune unused Docker images
-        run: |
-          echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
-          docker image prune -a -f || true
-
-  poll-debian-base-and-detect-changes:
-    runs-on: vm-docker-build2
-    needs: docker-prune
-    outputs:
-      digest_changed: ${{ steps.compare_digest.outputs.changed }}
-      versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }}
-      new_versions: ${{ steps.check_new_versions.outputs.new_versions }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Ensure .cache exists
-        run: mkdir -p .cache && touch .cache/.gitkeep
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Get current digest of debian-base image
-        id: get_digest
-        run: |
-          IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}"
-          docker pull "$IMAGE" > /dev/null
-          DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-          echo "$DIGEST" > .cache/debian-base.digest.new
-
-      - name: Compare with stored digest
-        id: compare_digest
-        run: |
-          CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
-          LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
-
-          if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
-            echo "[INFO] Digest unchanged"
-            echo "changed=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          echo "[INFO] Digest changed → updating cache"
-          echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          git add ${{ env.DIGEST_FILE }}
-          git commit -m "Update base digest to $CURRENT_DIGEST" || true
-
-          # --- Safe rebase with auto conflict resolution ---
-          git fetch origin master
-          if ! git rebase --strategy-option=theirs origin/master; then
-            echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
-            git rebase --abort
-            git fetch origin master
-            git reset --hard origin/master
-            echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-            git add ${{ env.DIGEST_FILE }}
-            git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
-          fi
-
-          git push origin HEAD:master
-          echo "changed=true" >> $GITHUB_OUTPUT
-
-      - name: Detect changed Minecraft versions
-        id: check_changed_versions
-        run: |
-          BEFORE_COMMIT="${{ github.event.before }}"
-          if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then
-            BEFORE_COMMIT=$(git rev-parse HEAD~1)
-          fi
-          CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
-          CHANGED_VERSIONS=""
-          for version in $VERSIONS; do
-            echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
-          done
-          CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
-          echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT
-      
-      - name: Detect Minecraft versions without build-info
-        id: check_new_versions
-        run: |
-          NEW_VERSIONS=""
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-          for version in $VERSIONS; do
-            if [ ! -f "upload-repo/$version/build-info.json" ]; then
-              echo "[INFO] No build-info.json for $version → treating as new"
-              NEW_VERSIONS="$NEW_VERSIONS $version"
-            fi
-          done
-
-          echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT
-
-  build-minecraft-images:
-    runs-on: vm-docker-build2
-    needs:
-      - docker-prune
-      - poll-debian-base-and-detect-changes
-    if: |
-      needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' ||
-      needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' ||
-      needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
-    strategy:
-      matrix:
-        version: [fabric]
-    name: Build and Push ${{ matrix.version }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Clone Minecraft repo (with retries)
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          for i in {1..5}; do
-            git clone "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo && break
-            echo "[WARN] Clone attempt $i failed. Retrying in 10s..."
-            sleep 10
-          done
-          if [ ! -d upload-repo ]; then
-            echo "[ERROR] Failed to clone Minecraft repo after retries."
-            exit 1
-          fi
-
-      - name: Build and push image
-        run: |
-          IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
-          docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
-
-  generate-changelogs:
-    needs: build-minecraft-images
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Create temporary changelog workspace
-        run: mkdir -p changelogs
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=3 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate changelogs
-        run: |
-          for version in $VERSIONS; do
-            echo "[INFO] Generating changelog for $version"
-            changelog="changelogs/$version/CHANGES.md"
-            mkdir -p "$(dirname "$changelog")"
-            touch "$changelog"
-
-            cd upload-repo
-            infofile="$version/build-info.json"
-            last_commit=""
-            if [ -f "$infofile" ]; then
-              last_commit=$(jq -r '.commit' "$infofile")
-            fi
-
-            echo -e "## $(date -u +'%Y-%m-%dT%H:%M:%SZ')\n" > "../$changelog"
-            if [ -n "$last_commit" ]; then
-              COMMITS=$(git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" || true)
-            fi
-            if [ -z "$COMMITS" ]; then
-              echo "[INFO] No new commits since last build. Showing latest 5 instead."
-              COMMITS=$(git log -n 5 --pretty=format:"- %s (%an)" || true)
-            fi
-            echo "$COMMITS" >> "../$changelog"
-            cd ..
-          done
-
-      - name: Copy changelogs into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp changelogs/$version/CHANGES.md upload-repo/$version/
-          done
-
-      - name: Commit and push changelogs (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-changelog-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */CHANGES.md
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No changelog changes."
-            exit 0
-          fi
-
-          git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Fast-forward master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge changelog updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-  generate-build-info:
-    needs: generate-changelogs
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Prepare temporary build-info workspace
-        run: mkdir -p buildinfo
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate build-info files
-        run: |
-          human_size() {
-            local b=$1 d='' s=0 S=(B KB MB GB TB)
-            while ((b >= 1024 && s < ${#S[@]}-1)); do
-              d=$((b % 1024)); b=$((b / 1024)); s=$((s + 1))
-            done
-            printf "%s%s\n" "$b" "${S[$s]}"
-          }
-
-          for version in $VERSIONS; do
-            echo "[INFO] Generating build-info.json for $version"
-            image="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO_MINECRAFT}:$version"
-            infofile="buildinfo/$version/build-info.json"
-            mkdir -p "$(dirname "$infofile")"
-
-            if ! docker pull "$image"; then
-              echo "[WARN] Failed to pull $image — setting fields to unknown/0"
-              digest="unknown"
-              size_bytes=0
-            else
-              digest=$(docker inspect --format='{{if .RepoDigests}}{{index .RepoDigests 0}}{{else}}unknown{{end}}' "$image" 2>/dev/null || echo "unknown")
-              size_bytes=$(docker image inspect "$image" --format='{{.Size}}' 2>/dev/null || echo "0")
-              size_bytes=${size_bytes//[^0-9]/}
-              if [[ -z "$size_bytes" ]]; then size_bytes=0; fi
-            fi
-
-            size_human=$(human_size "$size_bytes")
-
-            cd upload-repo
-            commit=$(git rev-parse HEAD)
-            cd ..
-
-            jq -n \
-              --arg version "$version" \
-              --arg commit "$commit" \
-              --arg build_time "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
-              --arg image_tag "$image" \
-              --arg digest "$digest" \
-              --arg image_size "$size_human" \
-              --argjson image_size_bytes "$size_bytes" \
-              '{
-                version: $version,
-                commit: $commit,
-                build_time: $build_time,
-                image_tag: $image_tag,
-                digest: $digest,
-                image_size: $image_size,
-                image_size_bytes: $image_size_bytes
-              }' > "$infofile"
-          done
-
-      - name: Copy build-info.json into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp "buildinfo/$version/build-info.json" "upload-repo/$version/"
-          done
-
-      - name: Commit and push build-info (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-buildinfo-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */build-info.json
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No build-info changes."
-            exit 0
-          fi
-
-          git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Merge into master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge build-info updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-          for version in $VERSIONS; do
-            TAG="build-$version"
-
-            git tag -d "$TAG" 2>/dev/null || true
-            git push origin ":refs/tags/$TAG" 2>/dev/null || true
-
-            git tag "$TAG"
-            git push origin "$TAG" --force
-          done

.gitea/workflows/minecraft-build-forge.yml

@@ -1,405 +0,0 @@
-name: minecraft-build-forge
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.gitea/workflows/minecraft-build-forge.yml'
-      - 'forge/Dockerfile'
-      - 'forge/*.sh'
-      - '!.cache/*'
-      - '!forge/CHANGES.md'
-      - '!forge/build-info.json'
-  schedule:
-    - cron: '30 21 * * 0'
-
-env:
-  IMAGE_REGISTRY: gitea.fithwum.tech
-  IMAGE_ORG: fithwum
-  IMAGE_REPO_DEBIAN: debian-base
-  IMAGE_REPO_MINECRAFT: minecraft
-  IMAGE_TAG_DEBIAN: bookworm
-  DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: forge
-
-jobs:
-  docker-prune:
-    name: Docker prune (${{ matrix.runner }})
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runner:
-          - vm-docker-build2
-    steps:
-      - name: Prune unused Docker images
-        run: |
-          echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
-          docker image prune -a -f || true
-
-  poll-debian-base-and-detect-changes:
-    runs-on: vm-docker-build2
-    needs: docker-prune
-    outputs:
-      digest_changed: ${{ steps.compare_digest.outputs.changed }}
-      versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }}
-      new_versions: ${{ steps.check_new_versions.outputs.new_versions }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Ensure .cache exists
-        run: mkdir -p .cache && touch .cache/.gitkeep
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Get current digest of debian-base image
-        id: get_digest
-        run: |
-          IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}"
-          docker pull "$IMAGE" > /dev/null
-          DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-          echo "$DIGEST" > .cache/debian-base.digest.new
-
-      - name: Compare with stored digest
-        id: compare_digest
-        run: |
-          CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
-          LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
-
-          if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
-            echo "[INFO] Digest unchanged"
-            echo "changed=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          echo "[INFO] Digest changed → updating cache"
-          echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          git add ${{ env.DIGEST_FILE }}
-          git commit -m "Update base digest to $CURRENT_DIGEST" || true
-
-          # --- Safe rebase with auto conflict resolution ---
-          git fetch origin master
-          if ! git rebase --strategy-option=theirs origin/master; then
-            echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
-            git rebase --abort
-            git fetch origin master
-            git reset --hard origin/master
-            echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-            git add ${{ env.DIGEST_FILE }}
-            git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
-          fi
-
-          git push origin HEAD:master
-          echo "changed=true" >> $GITHUB_OUTPUT
-
-      - name: Detect changed Minecraft versions
-        id: check_changed_versions
-        run: |
-          BEFORE_COMMIT="${{ github.event.before }}"
-          if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then
-            BEFORE_COMMIT=$(git rev-parse HEAD~1)
-          fi
-          CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
-          CHANGED_VERSIONS=""
-          for version in $VERSIONS; do
-            echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
-          done
-          CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
-          echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT
-      
-      - name: Detect Minecraft versions without build-info
-        id: check_new_versions
-        run: |
-          NEW_VERSIONS=""
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-          for version in $VERSIONS; do
-            if [ ! -f "upload-repo/$version/build-info.json" ]; then
-              echo "[INFO] No build-info.json for $version → treating as new"
-              NEW_VERSIONS="$NEW_VERSIONS $version"
-            fi
-          done
-
-          echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT
-
-  build-minecraft-images:
-    runs-on: vm-docker-build2
-    needs:
-      - docker-prune
-      - poll-debian-base-and-detect-changes
-    if: |
-      needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' ||
-      needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' ||
-      needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
-    strategy:
-      matrix:
-        version: [forge]
-    name: Build and Push ${{ matrix.version }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Clone Minecraft repo (with retries)
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          for i in {1..5}; do
-            git clone "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo && break
-            echo "[WARN] Clone attempt $i failed. Retrying in 10s..."
-            sleep 10
-          done
-          if [ ! -d upload-repo ]; then
-            echo "[ERROR] Failed to clone Minecraft repo after retries."
-            exit 1
-          fi
-
-      - name: Build and push image
-        run: |
-          IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
-          docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
-
-  generate-changelogs:
-    needs: build-minecraft-images
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Create temporary changelog workspace
-        run: mkdir -p changelogs
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=3 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate changelogs
-        run: |
-          for version in $VERSIONS; do
-            echo "[INFO] Generating changelog for $version"
-            changelog="changelogs/$version/CHANGES.md"
-            mkdir -p "$(dirname "$changelog")"
-            touch "$changelog"
-
-            cd upload-repo
-            infofile="$version/build-info.json"
-            last_commit=""
-            if [ -f "$infofile" ]; then
-              last_commit=$(jq -r '.commit' "$infofile")
-            fi
-
-            echo -e "## $(date -u +'%Y-%m-%dT%H:%M:%SZ')\n" > "../$changelog"
-            if [ -n "$last_commit" ]; then
-              COMMITS=$(git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" || true)
-            fi
-            if [ -z "$COMMITS" ]; then
-              echo "[INFO] No new commits since last build. Showing latest 5 instead."
-              COMMITS=$(git log -n 5 --pretty=format:"- %s (%an)" || true)
-            fi
-            echo "$COMMITS" >> "../$changelog"
-            cd ..
-          done
-
-      - name: Copy changelogs into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp changelogs/$version/CHANGES.md upload-repo/$version/
-          done
-
-      - name: Commit and push changelogs (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-changelog-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */CHANGES.md
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No changelog changes."
-            exit 0
-          fi
-
-          git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Fast-forward master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge changelog updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-  generate-build-info:
-    needs: generate-changelogs
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Prepare temporary build-info workspace
-        run: mkdir -p buildinfo
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate build-info files
-        run: |
-          human_size() {
-            local b=$1 d='' s=0 S=(B KB MB GB TB)
-            while ((b >= 1024 && s < ${#S[@]}-1)); do
-              d=$((b % 1024)); b=$((b / 1024)); s=$((s + 1))
-            done
-            printf "%s%s\n" "$b" "${S[$s]}"
-          }
-
-          for version in $VERSIONS; do
-            echo "[INFO] Generating build-info.json for $version"
-            image="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO_MINECRAFT}:$version"
-            infofile="buildinfo/$version/build-info.json"
-            mkdir -p "$(dirname "$infofile")"
-
-            if ! docker pull "$image"; then
-              echo "[WARN] Failed to pull $image — setting fields to unknown/0"
-              digest="unknown"
-              size_bytes=0
-            else
-              digest=$(docker inspect --format='{{if .RepoDigests}}{{index .RepoDigests 0}}{{else}}unknown{{end}}' "$image" 2>/dev/null || echo "unknown")
-              size_bytes=$(docker image inspect "$image" --format='{{.Size}}' 2>/dev/null || echo "0")
-              size_bytes=${size_bytes//[^0-9]/}
-              if [[ -z "$size_bytes" ]]; then size_bytes=0; fi
-            fi
-
-            size_human=$(human_size "$size_bytes")
-
-            cd upload-repo
-            commit=$(git rev-parse HEAD)
-            cd ..
-
-            jq -n \
-              --arg version "$version" \
-              --arg commit "$commit" \
-              --arg build_time "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
-              --arg image_tag "$image" \
-              --arg digest "$digest" \
-              --arg image_size "$size_human" \
-              --argjson image_size_bytes "$size_bytes" \
-              '{
-                version: $version,
-                commit: $commit,
-                build_time: $build_time,
-                image_tag: $image_tag,
-                digest: $digest,
-                image_size: $image_size,
-                image_size_bytes: $image_size_bytes
-              }' > "$infofile"
-          done
-
-      - name: Copy build-info.json into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp "buildinfo/$version/build-info.json" "upload-repo/$version/"
-          done
-
-      - name: Commit and push build-info (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-buildinfo-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */build-info.json
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No build-info changes."
-            exit 0
-          fi
-
-          git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Merge into master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge build-info updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-          for version in $VERSIONS; do
-            TAG="build-$version"
-
-            git tag -d "$TAG" 2>/dev/null || true
-            git push origin ":refs/tags/$TAG" 2>/dev/null || true
-
-            git tag "$TAG"
-            git push origin "$TAG" --force
-          done

.gitea/workflows/minecraft-build-minecraft.yml

@@ -12,7 +12,7 @@ on:
       - '!minecraft/CHANGES.md'
       - '!minecraft/build-info.json'
   schedule:
-    - cron: '30 21 * * 0'
+    - cron: '35 21 * * 0'
 
 env:
   IMAGE_REGISTRY: gitea.fithwum.tech
@@ -38,110 +38,9 @@ jobs:
           echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
           docker image prune -a -f || true
 
-  poll-debian-base-and-detect-changes:
-    runs-on: vm-docker-build2
-    needs: docker-prune
-    outputs:
-      digest_changed: ${{ steps.compare_digest.outputs.changed }}
-      versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }}
-      new_versions: ${{ steps.check_new_versions.outputs.new_versions }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Ensure .cache exists
-        run: mkdir -p .cache && touch .cache/.gitkeep
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Get current digest of debian-base image
-        id: get_digest
-        run: |
-          IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}"
-          docker pull "$IMAGE" > /dev/null
-          DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-          echo "$DIGEST" > .cache/debian-base.digest.new
-
-      - name: Compare with stored digest
-        id: compare_digest
-        run: |
-          CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
-          LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
-
-          if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
-            echo "[INFO] Digest unchanged"
-            echo "changed=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          echo "[INFO] Digest changed → updating cache"
-          echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          git add ${{ env.DIGEST_FILE }}
-          git commit -m "Update base digest to $CURRENT_DIGEST" || true
-
-          # --- Safe rebase with auto conflict resolution ---
-          git fetch origin master
-          if ! git rebase --strategy-option=theirs origin/master; then
-            echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
-            git rebase --abort
-            git fetch origin master
-            git reset --hard origin/master
-            echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-            git add ${{ env.DIGEST_FILE }}
-            git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
-          fi
-
-          git push origin HEAD:master
-          echo "changed=true" >> $GITHUB_OUTPUT
-
-      - name: Detect changed Minecraft versions
-        id: check_changed_versions
-        run: |
-          BEFORE_COMMIT="${{ github.event.before }}"
-          if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then
-            BEFORE_COMMIT=$(git rev-parse HEAD~1)
-          fi
-          CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
-          CHANGED_VERSIONS=""
-          for version in $VERSIONS; do
-            echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
-          done
-          CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
-          echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT
-      
-      - name: Detect Minecraft versions without build-info
-        id: check_new_versions
-        run: |
-          NEW_VERSIONS=""
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-          for version in $VERSIONS; do
-            if [ ! -f "upload-repo/$version/build-info.json" ]; then
-              echo "[INFO] No build-info.json for $version → treating as new"
-              NEW_VERSIONS="$NEW_VERSIONS $version"
-            fi
-          done
-
-          echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT
-
   build-minecraft-images:
     runs-on: vm-docker-build2
-    needs:
-      - docker-prune
-      - poll-debian-base-and-detect-changes
-    if: |
-      needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' ||
-      needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' ||
-      needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
+    needs: docker-prune
     strategy:
       matrix:
         version: [minecraft]
@@ -166,10 +65,15 @@ jobs:
             exit 1
           fi
 
+      - name: Clear BuildKit cache
+        run: |
+          docker builder prune -af || true
+          docker buildx prune -af || true
+
       - name: Build and push image
         run: |
           IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
-          docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
+          docker buildx build --platform linux/amd64 --pull --no-cache --push -t "$IMAGE" "./${{ matrix.version }}"
 
   generate-changelogs:
     needs: build-minecraft-images

.gitea/workflows/minecraft-build-neoforged.yml

@@ -1,405 +0,0 @@
-name: minecraft-build-neoforged
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.gitea/workflows/minecraft-build-neoforged.yml'
-      - 'neoforged/Dockerfile'
-      - 'neoforged/*.sh'
-      - '!.cache/*'
-      - '!neoforged/CHANGES.md'
-      - '!neoforged/build-info.json'
-  schedule:
-    - cron: '30 21 * * 0'
-
-env:
-  IMAGE_REGISTRY: gitea.fithwum.tech
-  IMAGE_ORG: fithwum
-  IMAGE_REPO_DEBIAN: debian-base
-  IMAGE_REPO_MINECRAFT: minecraft
-  IMAGE_TAG_DEBIAN: bookworm
-  DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: neoforged
-
-jobs:
-  docker-prune:
-    name: Docker prune (${{ matrix.runner }})
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runner:
-          - vm-docker-build2
-    steps:
-      - name: Prune unused Docker images
-        run: |
-          echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
-          docker image prune -a -f || true
-
-  poll-debian-base-and-detect-changes:
-    runs-on: vm-docker-build2
-    needs: docker-prune
-    outputs:
-      digest_changed: ${{ steps.compare_digest.outputs.changed }}
-      versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }}
-      new_versions: ${{ steps.check_new_versions.outputs.new_versions }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Ensure .cache exists
-        run: mkdir -p .cache && touch .cache/.gitkeep
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Get current digest of debian-base image
-        id: get_digest
-        run: |
-          IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}"
-          docker pull "$IMAGE" > /dev/null
-          DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-          echo "$DIGEST" > .cache/debian-base.digest.new
-
-      - name: Compare with stored digest
-        id: compare_digest
-        run: |
-          CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
-          LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
-
-          if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
-            echo "[INFO] Digest unchanged"
-            echo "changed=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          echo "[INFO] Digest changed → updating cache"
-          echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          git add ${{ env.DIGEST_FILE }}
-          git commit -m "Update base digest to $CURRENT_DIGEST" || true
-
-          # --- Safe rebase with auto conflict resolution ---
-          git fetch origin master
-          if ! git rebase --strategy-option=theirs origin/master; then
-            echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
-            git rebase --abort
-            git fetch origin master
-            git reset --hard origin/master
-            echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-            git add ${{ env.DIGEST_FILE }}
-            git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
-          fi
-
-          git push origin HEAD:master
-          echo "changed=true" >> $GITHUB_OUTPUT
-
-      - name: Detect changed Minecraft versions
-        id: check_changed_versions
-        run: |
-          BEFORE_COMMIT="${{ github.event.before }}"
-          if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then
-            BEFORE_COMMIT=$(git rev-parse HEAD~1)
-          fi
-          CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
-          CHANGED_VERSIONS=""
-          for version in $VERSIONS; do
-            echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
-          done
-          CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
-          echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT
-      
-      - name: Detect Minecraft versions without build-info
-        id: check_new_versions
-        run: |
-          NEW_VERSIONS=""
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-          for version in $VERSIONS; do
-            if [ ! -f "upload-repo/$version/build-info.json" ]; then
-              echo "[INFO] No build-info.json for $version → treating as new"
-              NEW_VERSIONS="$NEW_VERSIONS $version"
-            fi
-          done
-
-          echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT
-
-  build-minecraft-images:
-    runs-on: vm-docker-build2
-    needs:
-      - docker-prune
-      - poll-debian-base-and-detect-changes
-    if: |
-      needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' ||
-      needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' ||
-      needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
-    strategy:
-      matrix:
-        version: [neoforged]
-    name: Build and Push ${{ matrix.version }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Clone Minecraft repo (with retries)
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          for i in {1..5}; do
-            git clone "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo && break
-            echo "[WARN] Clone attempt $i failed. Retrying in 10s..."
-            sleep 10
-          done
-          if [ ! -d upload-repo ]; then
-            echo "[ERROR] Failed to clone Minecraft repo after retries."
-            exit 1
-          fi
-
-      - name: Build and push image
-        run: |
-          IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
-          docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
-
-  generate-changelogs:
-    needs: build-minecraft-images
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Create temporary changelog workspace
-        run: mkdir -p changelogs
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=3 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate changelogs
-        run: |
-          for version in $VERSIONS; do
-            echo "[INFO] Generating changelog for $version"
-            changelog="changelogs/$version/CHANGES.md"
-            mkdir -p "$(dirname "$changelog")"
-            touch "$changelog"
-
-            cd upload-repo
-            infofile="$version/build-info.json"
-            last_commit=""
-            if [ -f "$infofile" ]; then
-              last_commit=$(jq -r '.commit' "$infofile")
-            fi
-
-            echo -e "## $(date -u +'%Y-%m-%dT%H:%M:%SZ')\n" > "../$changelog"
-            if [ -n "$last_commit" ]; then
-              COMMITS=$(git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" || true)
-            fi
-            if [ -z "$COMMITS" ]; then
-              echo "[INFO] No new commits since last build. Showing latest 5 instead."
-              COMMITS=$(git log -n 5 --pretty=format:"- %s (%an)" || true)
-            fi
-            echo "$COMMITS" >> "../$changelog"
-            cd ..
-          done
-
-      - name: Copy changelogs into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp changelogs/$version/CHANGES.md upload-repo/$version/
-          done
-
-      - name: Commit and push changelogs (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-changelog-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */CHANGES.md
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No changelog changes."
-            exit 0
-          fi
-
-          git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Fast-forward master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge changelog updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-  generate-build-info:
-    needs: generate-changelogs
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Prepare temporary build-info workspace
-        run: mkdir -p buildinfo
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate build-info files
-        run: |
-          human_size() {
-            local b=$1 d='' s=0 S=(B KB MB GB TB)
-            while ((b >= 1024 && s < ${#S[@]}-1)); do
-              d=$((b % 1024)); b=$((b / 1024)); s=$((s + 1))
-            done
-            printf "%s%s\n" "$b" "${S[$s]}"
-          }
-
-          for version in $VERSIONS; do
-            echo "[INFO] Generating build-info.json for $version"
-            image="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO_MINECRAFT}:$version"
-            infofile="buildinfo/$version/build-info.json"
-            mkdir -p "$(dirname "$infofile")"
-
-            if ! docker pull "$image"; then
-              echo "[WARN] Failed to pull $image — setting fields to unknown/0"
-              digest="unknown"
-              size_bytes=0
-            else
-              digest=$(docker inspect --format='{{if .RepoDigests}}{{index .RepoDigests 0}}{{else}}unknown{{end}}' "$image" 2>/dev/null || echo "unknown")
-              size_bytes=$(docker image inspect "$image" --format='{{.Size}}' 2>/dev/null || echo "0")
-              size_bytes=${size_bytes//[^0-9]/}
-              if [[ -z "$size_bytes" ]]; then size_bytes=0; fi
-            fi
-
-            size_human=$(human_size "$size_bytes")
-
-            cd upload-repo
-            commit=$(git rev-parse HEAD)
-            cd ..
-
-            jq -n \
-              --arg version "$version" \
-              --arg commit "$commit" \
-              --arg build_time "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
-              --arg image_tag "$image" \
-              --arg digest "$digest" \
-              --arg image_size "$size_human" \
-              --argjson image_size_bytes "$size_bytes" \
-              '{
-                version: $version,
-                commit: $commit,
-                build_time: $build_time,
-                image_tag: $image_tag,
-                digest: $digest,
-                image_size: $image_size,
-                image_size_bytes: $image_size_bytes
-              }' > "$infofile"
-          done
-
-      - name: Copy build-info.json into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp "buildinfo/$version/build-info.json" "upload-repo/$version/"
-          done
-
-      - name: Commit and push build-info (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-buildinfo-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */build-info.json
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No build-info changes."
-            exit 0
-          fi
-
-          git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Merge into master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge build-info updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-          for version in $VERSIONS; do
-            TAG="build-$version"
-
-            git tag -d "$TAG" 2>/dev/null || true
-            git push origin ":refs/tags/$TAG" 2>/dev/null || true
-
-            git tag "$TAG"
-            git push origin "$TAG" --force
-          done

.gitea/workflows/minecraft-build-quilt.yml

@@ -1,405 +0,0 @@
-name: minecraft-build-quilt
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.gitea/workflows/minecraft-build-quilt.yml'
-      - 'quilt/Dockerfile'
-      - 'quilt/*.sh'
-      - '!.cache/*'
-      - '!quilt/CHANGES.md'
-      - '!quilt/build-info.json'
-  schedule:
-    - cron: '30 21 * * 0'
-
-env:
-  IMAGE_REGISTRY: gitea.fithwum.tech
-  IMAGE_ORG: fithwum
-  IMAGE_REPO_DEBIAN: debian-base
-  IMAGE_REPO_MINECRAFT: minecraft
-  IMAGE_TAG_DEBIAN: bookworm
-  DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: quilt
-
-jobs:
-  docker-prune:
-    name: Docker prune (${{ matrix.runner }})
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runner:
-          - vm-docker-build2
-    steps:
-      - name: Prune unused Docker images
-        run: |
-          echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
-          docker image prune -a -f || true
-
-  poll-debian-base-and-detect-changes:
-    runs-on: vm-docker-build2
-    needs: docker-prune
-    outputs:
-      digest_changed: ${{ steps.compare_digest.outputs.changed }}
-      versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }}
-      new_versions: ${{ steps.check_new_versions.outputs.new_versions }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Ensure .cache exists
-        run: mkdir -p .cache && touch .cache/.gitkeep
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Get current digest of debian-base image
-        id: get_digest
-        run: |
-          IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}"
-          docker pull "$IMAGE" > /dev/null
-          DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-          echo "$DIGEST" > .cache/debian-base.digest.new
-
-      - name: Compare with stored digest
-        id: compare_digest
-        run: |
-          CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
-          LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
-
-          if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
-            echo "[INFO] Digest unchanged"
-            echo "changed=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          echo "[INFO] Digest changed → updating cache"
-          echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          git add ${{ env.DIGEST_FILE }}
-          git commit -m "Update base digest to $CURRENT_DIGEST" || true
-
-          # --- Safe rebase with auto conflict resolution ---
-          git fetch origin master
-          if ! git rebase --strategy-option=theirs origin/master; then
-            echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
-            git rebase --abort
-            git fetch origin master
-            git reset --hard origin/master
-            echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-            git add ${{ env.DIGEST_FILE }}
-            git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
-          fi
-
-          git push origin HEAD:master
-          echo "changed=true" >> $GITHUB_OUTPUT
-
-      - name: Detect changed Minecraft versions
-        id: check_changed_versions
-        run: |
-          BEFORE_COMMIT="${{ github.event.before }}"
-          if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then
-            BEFORE_COMMIT=$(git rev-parse HEAD~1)
-          fi
-          CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
-          CHANGED_VERSIONS=""
-          for version in $VERSIONS; do
-            echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
-          done
-          CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
-          echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT
-      
-      - name: Detect Minecraft versions without build-info
-        id: check_new_versions
-        run: |
-          NEW_VERSIONS=""
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-          for version in $VERSIONS; do
-            if [ ! -f "upload-repo/$version/build-info.json" ]; then
-              echo "[INFO] No build-info.json for $version → treating as new"
-              NEW_VERSIONS="$NEW_VERSIONS $version"
-            fi
-          done
-
-          echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT
-
-  build-minecraft-images:
-    runs-on: vm-docker-build2
-    needs:
-      - docker-prune
-      - poll-debian-base-and-detect-changes
-    if: |
-      needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' ||
-      needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' ||
-      needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
-    strategy:
-      matrix:
-        version: [quilt]
-    name: Build and Push ${{ matrix.version }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Clone Minecraft repo (with retries)
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          for i in {1..5}; do
-            git clone "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo && break
-            echo "[WARN] Clone attempt $i failed. Retrying in 10s..."
-            sleep 10
-          done
-          if [ ! -d upload-repo ]; then
-            echo "[ERROR] Failed to clone Minecraft repo after retries."
-            exit 1
-          fi
-
-      - name: Build and push image
-        run: |
-          IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
-          docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
-
-  generate-changelogs:
-    needs: build-minecraft-images
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Create temporary changelog workspace
-        run: mkdir -p changelogs
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=3 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate changelogs
-        run: |
-          for version in $VERSIONS; do
-            echo "[INFO] Generating changelog for $version"
-            changelog="changelogs/$version/CHANGES.md"
-            mkdir -p "$(dirname "$changelog")"
-            touch "$changelog"
-
-            cd upload-repo
-            infofile="$version/build-info.json"
-            last_commit=""
-            if [ -f "$infofile" ]; then
-              last_commit=$(jq -r '.commit' "$infofile")
-            fi
-
-            echo -e "## $(date -u +'%Y-%m-%dT%H:%M:%SZ')\n" > "../$changelog"
-            if [ -n "$last_commit" ]; then
-              COMMITS=$(git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" || true)
-            fi
-            if [ -z "$COMMITS" ]; then
-              echo "[INFO] No new commits since last build. Showing latest 5 instead."
-              COMMITS=$(git log -n 5 --pretty=format:"- %s (%an)" || true)
-            fi
-            echo "$COMMITS" >> "../$changelog"
-            cd ..
-          done
-
-      - name: Copy changelogs into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp changelogs/$version/CHANGES.md upload-repo/$version/
-          done
-
-      - name: Commit and push changelogs (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-changelog-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */CHANGES.md
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No changelog changes."
-            exit 0
-          fi
-
-          git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Fast-forward master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge changelog updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-  generate-build-info:
-    needs: generate-changelogs
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Prepare temporary build-info workspace
-        run: mkdir -p buildinfo
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate build-info files
-        run: |
-          human_size() {
-            local b=$1 d='' s=0 S=(B KB MB GB TB)
-            while ((b >= 1024 && s < ${#S[@]}-1)); do
-              d=$((b % 1024)); b=$((b / 1024)); s=$((s + 1))
-            done
-            printf "%s%s\n" "$b" "${S[$s]}"
-          }
-
-          for version in $VERSIONS; do
-            echo "[INFO] Generating build-info.json for $version"
-            image="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO_MINECRAFT}:$version"
-            infofile="buildinfo/$version/build-info.json"
-            mkdir -p "$(dirname "$infofile")"
-
-            if ! docker pull "$image"; then
-              echo "[WARN] Failed to pull $image — setting fields to unknown/0"
-              digest="unknown"
-              size_bytes=0
-            else
-              digest=$(docker inspect --format='{{if .RepoDigests}}{{index .RepoDigests 0}}{{else}}unknown{{end}}' "$image" 2>/dev/null || echo "unknown")
-              size_bytes=$(docker image inspect "$image" --format='{{.Size}}' 2>/dev/null || echo "0")
-              size_bytes=${size_bytes//[^0-9]/}
-              if [[ -z "$size_bytes" ]]; then size_bytes=0; fi
-            fi
-
-            size_human=$(human_size "$size_bytes")
-
-            cd upload-repo
-            commit=$(git rev-parse HEAD)
-            cd ..
-
-            jq -n \
-              --arg version "$version" \
-              --arg commit "$commit" \
-              --arg build_time "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
-              --arg image_tag "$image" \
-              --arg digest "$digest" \
-              --arg image_size "$size_human" \
-              --argjson image_size_bytes "$size_bytes" \
-              '{
-                version: $version,
-                commit: $commit,
-                build_time: $build_time,
-                image_tag: $image_tag,
-                digest: $digest,
-                image_size: $image_size,
-                image_size_bytes: $image_size_bytes
-              }' > "$infofile"
-          done
-
-      - name: Copy build-info.json into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp "buildinfo/$version/build-info.json" "upload-repo/$version/"
-          done
-
-      - name: Commit and push build-info (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-buildinfo-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */build-info.json
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No build-info changes."
-            exit 0
-          fi
-
-          git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Merge into master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge build-info updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-          for version in $VERSIONS; do
-            TAG="build-$version"
-
-            git tag -d "$TAG" 2>/dev/null || true
-            git push origin ":refs/tags/$TAG" 2>/dev/null || true
-
-            git tag "$TAG"
-            git push origin "$TAG" --force
-          done

.gitea/workflows/minecraft-build-testing.yml

@@ -38,110 +38,9 @@ jobs:
           echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
           docker image prune -a -f || true
 
-  poll-debian-base-and-detect-changes:
-    runs-on: vm-docker-build2
-    needs: docker-prune
-    outputs:
-      digest_changed: ${{ steps.compare_digest.outputs.changed }}
-      versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }}
-      new_versions: ${{ steps.check_new_versions.outputs.new_versions }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Ensure .cache exists
-        run: mkdir -p .cache && touch .cache/.gitkeep
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Get current digest of debian-base image
-        id: get_digest
-        run: |
-          IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}"
-          docker pull "$IMAGE" > /dev/null
-          DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-          echo "$DIGEST" > .cache/debian-base.digest.new
-
-      - name: Compare with stored digest
-        id: compare_digest
-        run: |
-          CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
-          LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
-
-          if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
-            echo "[INFO] Digest unchanged"
-            echo "changed=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          echo "[INFO] Digest changed → updating cache"
-          echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          git add ${{ env.DIGEST_FILE }}
-          git commit -m "Update base digest to $CURRENT_DIGEST" || true
-
-          # --- Safe rebase with auto conflict resolution ---
-          git fetch origin master
-          if ! git rebase --strategy-option=theirs origin/master; then
-            echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
-            git rebase --abort
-            git fetch origin master
-            git reset --hard origin/master
-            echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-            git add ${{ env.DIGEST_FILE }}
-            git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
-          fi
-
-          git push origin HEAD:master
-          echo "changed=true" >> $GITHUB_OUTPUT
-
-      - name: Detect changed Minecraft versions
-        id: check_changed_versions
-        run: |
-          BEFORE_COMMIT="${{ github.event.before }}"
-          if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then
-            BEFORE_COMMIT=$(git rev-parse HEAD~1)
-          fi
-          CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
-          CHANGED_VERSIONS=""
-          for version in $VERSIONS; do
-            echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
-          done
-          CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
-          echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT
-      
-      - name: Detect Minecraft versions without build-info
-        id: check_new_versions
-        run: |
-          NEW_VERSIONS=""
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-          for version in $VERSIONS; do
-            if [ ! -f "upload-repo/$version/build-info.json" ]; then
-              echo "[INFO] No build-info.json for $version → treating as new"
-              NEW_VERSIONS="$NEW_VERSIONS $version"
-            fi
-          done
-
-          echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT
-
   build-minecraft-images:
     runs-on: vm-docker-build2
-    needs:
-      - docker-prune
-      - poll-debian-base-and-detect-changes
-    if: |
-      needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' ||
-      needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' ||
-      needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
+    needs: docker-prune
     strategy:
       matrix:
         version: [testing]
@@ -166,10 +65,15 @@ jobs:
             exit 1
           fi
 
+      - name: Clear BuildKit cache
+        run: |
+          docker builder prune -af || true
+          docker buildx prune -af || true
+
       - name: Build and push image
         run: |
           IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
-          docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
+          docker buildx build --platform linux/amd64 --pull --no-cache --push -t "$IMAGE" "./${{ matrix.version }}"
 
   generate-changelogs:
     needs: build-minecraft-images

.gitea/workflows/minecraft-build-vanilla.yml

@@ -1,405 +0,0 @@
-name: minecraft-build-vanilla
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.gitea/workflows/minecraft-build-vanilla.yml'
-      - 'vanilla/Dockerfile'
-      - 'vanilla/*.sh'
-      - '!.cache/*'
-      - '!vanilla/CHANGES.md'
-      - '!vanilla/build-info.json'
-  schedule:
-    - cron: '30 21 * * 0'
-
-env:
-  IMAGE_REGISTRY: gitea.fithwum.tech
-  IMAGE_ORG: fithwum
-  IMAGE_REPO_DEBIAN: debian-base
-  IMAGE_REPO_MINECRAFT: minecraft
-  IMAGE_TAG_DEBIAN: bookworm
-  DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: vanilla
-
-jobs:
-  docker-prune:
-    name: Docker prune (${{ matrix.runner }})
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runner:
-          - vm-docker-build2
-    steps:
-      - name: Prune unused Docker images
-        run: |
-          echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
-          docker image prune -a -f || true
-
-  poll-debian-base-and-detect-changes:
-    runs-on: vm-docker-build2
-    needs: docker-prune
-    outputs:
-      digest_changed: ${{ steps.compare_digest.outputs.changed }}
-      versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }}
-      new_versions: ${{ steps.check_new_versions.outputs.new_versions }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Ensure .cache exists
-        run: mkdir -p .cache && touch .cache/.gitkeep
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Get current digest of debian-base image
-        id: get_digest
-        run: |
-          IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}"
-          docker pull "$IMAGE" > /dev/null
-          DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-          echo "$DIGEST" > .cache/debian-base.digest.new
-
-      - name: Compare with stored digest
-        id: compare_digest
-        run: |
-          CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
-          LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
-
-          if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
-            echo "[INFO] Digest unchanged"
-            echo "changed=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          echo "[INFO] Digest changed → updating cache"
-          echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          git add ${{ env.DIGEST_FILE }}
-          git commit -m "Update base digest to $CURRENT_DIGEST" || true
-
-          # --- Safe rebase with auto conflict resolution ---
-          git fetch origin master
-          if ! git rebase --strategy-option=theirs origin/master; then
-            echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
-            git rebase --abort
-            git fetch origin master
-            git reset --hard origin/master
-            echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
-            git add ${{ env.DIGEST_FILE }}
-            git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
-          fi
-
-          git push origin HEAD:master
-          echo "changed=true" >> $GITHUB_OUTPUT
-
-      - name: Detect changed Minecraft versions
-        id: check_changed_versions
-        run: |
-          BEFORE_COMMIT="${{ github.event.before }}"
-          if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then
-            BEFORE_COMMIT=$(git rev-parse HEAD~1)
-          fi
-          CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
-          CHANGED_VERSIONS=""
-          for version in $VERSIONS; do
-            echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
-          done
-          CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
-          echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT
-      
-      - name: Detect Minecraft versions without build-info
-        id: check_new_versions
-        run: |
-          NEW_VERSIONS=""
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-          for version in $VERSIONS; do
-            if [ ! -f "upload-repo/$version/build-info.json" ]; then
-              echo "[INFO] No build-info.json for $version → treating as new"
-              NEW_VERSIONS="$NEW_VERSIONS $version"
-            fi
-          done
-
-          echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT
-
-  build-minecraft-images:
-    runs-on: vm-docker-build2
-    needs:
-      - docker-prune
-      - poll-debian-base-and-detect-changes
-    if: |
-      needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' ||
-      needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' ||
-      needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
-    strategy:
-      matrix:
-        version: [vanilla]
-    name: Build and Push ${{ matrix.version }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: Clone Minecraft repo (with retries)
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          for i in {1..5}; do
-            git clone "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo && break
-            echo "[WARN] Clone attempt $i failed. Retrying in 10s..."
-            sleep 10
-          done
-          if [ ! -d upload-repo ]; then
-            echo "[ERROR] Failed to clone Minecraft repo after retries."
-            exit 1
-          fi
-
-      - name: Build and push image
-        run: |
-          IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
-          docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
-
-  generate-changelogs:
-    needs: build-minecraft-images
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Create temporary changelog workspace
-        run: mkdir -p changelogs
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=3 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate changelogs
-        run: |
-          for version in $VERSIONS; do
-            echo "[INFO] Generating changelog for $version"
-            changelog="changelogs/$version/CHANGES.md"
-            mkdir -p "$(dirname "$changelog")"
-            touch "$changelog"
-
-            cd upload-repo
-            infofile="$version/build-info.json"
-            last_commit=""
-            if [ -f "$infofile" ]; then
-              last_commit=$(jq -r '.commit' "$infofile")
-            fi
-
-            echo -e "## $(date -u +'%Y-%m-%dT%H:%M:%SZ')\n" > "../$changelog"
-            if [ -n "$last_commit" ]; then
-              COMMITS=$(git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" || true)
-            fi
-            if [ -z "$COMMITS" ]; then
-              echo "[INFO] No new commits since last build. Showing latest 5 instead."
-              COMMITS=$(git log -n 5 --pretty=format:"- %s (%an)" || true)
-            fi
-            echo "$COMMITS" >> "../$changelog"
-            cd ..
-          done
-
-      - name: Copy changelogs into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp changelogs/$version/CHANGES.md upload-repo/$version/
-          done
-
-      - name: Commit and push changelogs (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-changelog-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */CHANGES.md
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No changelog changes."
-            exit 0
-          fi
-
-          git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Fast-forward master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge changelog updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-  generate-build-info:
-    needs: generate-changelogs
-    runs-on: vm-docker-build2
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Prepare temporary build-info workspace
-        run: mkdir -p buildinfo
-
-      - name: Clone Minecraft repo
-        run: |
-          GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
-          git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/minecraft.git" upload-repo
-
-      - name: Generate build-info files
-        run: |
-          human_size() {
-            local b=$1 d='' s=0 S=(B KB MB GB TB)
-            while ((b >= 1024 && s < ${#S[@]}-1)); do
-              d=$((b % 1024)); b=$((b / 1024)); s=$((s + 1))
-            done
-            printf "%s%s\n" "$b" "${S[$s]}"
-          }
-
-          for version in $VERSIONS; do
-            echo "[INFO] Generating build-info.json for $version"
-            image="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO_MINECRAFT}:$version"
-            infofile="buildinfo/$version/build-info.json"
-            mkdir -p "$(dirname "$infofile")"
-
-            if ! docker pull "$image"; then
-              echo "[WARN] Failed to pull $image — setting fields to unknown/0"
-              digest="unknown"
-              size_bytes=0
-            else
-              digest=$(docker inspect --format='{{if .RepoDigests}}{{index .RepoDigests 0}}{{else}}unknown{{end}}' "$image" 2>/dev/null || echo "unknown")
-              size_bytes=$(docker image inspect "$image" --format='{{.Size}}' 2>/dev/null || echo "0")
-              size_bytes=${size_bytes//[^0-9]/}
-              if [[ -z "$size_bytes" ]]; then size_bytes=0; fi
-            fi
-
-            size_human=$(human_size "$size_bytes")
-
-            cd upload-repo
-            commit=$(git rev-parse HEAD)
-            cd ..
-
-            jq -n \
-              --arg version "$version" \
-              --arg commit "$commit" \
-              --arg build_time "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
-              --arg image_tag "$image" \
-              --arg digest "$digest" \
-              --arg image_size "$size_human" \
-              --argjson image_size_bytes "$size_bytes" \
-              '{
-                version: $version,
-                commit: $commit,
-                build_time: $build_time,
-                image_tag: $image_tag,
-                digest: $digest,
-                image_size: $image_size,
-                image_size_bytes: $image_size_bytes
-              }' > "$infofile"
-          done
-
-      - name: Copy build-info.json into repo
-        run: |
-          for version in $VERSIONS; do
-            mkdir -p upload-repo/$version
-            cp "buildinfo/$version/build-info.json" "upload-repo/$version/"
-          done
-
-      - name: Commit and push build-info (temp branch)
-        run: |
-          cd upload-repo
-
-          git config user.name "${{ secrets.GIT_USERNAME }}"
-          git config user.email "${{ secrets.GIT_EMAIL }}"
-
-          TEMP_BRANCH="tmp-buildinfo-$(date +%s)"
-
-          # Create temporary branch
-          git checkout -b "$TEMP_BRANCH"
-
-          # Stage changes
-          git add */build-info.json
-
-          # Nothing changed?
-          if git diff --cached --quiet; then
-            echo "[INFO] No build-info changes."
-            exit 0
-          fi
-
-          git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-
-          # Push temporary branch
-          git push origin HEAD:$TEMP_BRANCH
-
-          # Rebase temp branch onto latest master
-          git fetch origin master
-
-          git checkout "$TEMP_BRANCH"
-
-          if ! git rebase origin/master; then
-            echo "[WARN] Rebase failed, using merge instead."
-            git rebase --abort || true
-            git merge origin/master --no-edit
-          fi
-
-          git push origin HEAD:$TEMP_BRANCH --force
-
-          # Merge into master
-          git checkout master
-          git reset --hard origin/master
-
-          git merge --no-ff "$TEMP_BRANCH" \
-            -m "Merge build-info updates"
-
-          git push origin master
-
-          git push origin --delete "$TEMP_BRANCH" || true
-
-          for version in $VERSIONS; do
-            TAG="build-$version"
-
-            git tag -d "$TAG" 2>/dev/null || true
-            git push origin ":refs/tags/$TAG" 2>/dev/null || true
-
-            git tag "$TAG"
-            git push origin "$TAG" --force
-          done

bukkit/CHANGES.md

@@ -1,7 +0,0 @@
-## 2026-07-19T21:34:01Z
-
-- Merge changelog updates (fithwum)
-- Update changelogs on 2026-07-19T21:33:56Z [skip ci] (fithwum)
-- Merge changelog updates (fithwum)
-- Update changelogs on 2026-07-19T21:33:50Z [skip ci] (fithwum)
-- Merge changelog updates (fithwum)

bukkit/Dockerfile

@@ -1,38 +0,0 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:trixie
-LABEL maintainer="fithwum"
-
-# Environment Variables
-ENV ACCEPT_EULA=""
-ENV GAME_PORT=""
-ENV MC_VERSION=""
-ENV JAVA_VERSION="25"
-ENV XMX_SIZE=""
-ENV XMS_SIZE=""
-ENV XMN_SIZE=""
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/install_script.sh
-
-# Install Java & Dependencies.
-RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
-	&& apt-get -y --fix-broken install \
-	&& apt-get -y autoclean \
-	&& apt-get -y autoremove \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& update-ca-certificates -f;
-
-# Folder creation.
-RUN mkdir -p /mc_server /mc_temp \
-	&& chmod 777 -R /mc_server /mc_temp \
-	&& chown 99:100 -R /mc_server /mc_temp
-
-# Main script
-RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
-	&& chmod +x /mc_temp/install_script.sh
-
-# Directory where data is stored
-VOLUME /mc_server
-
-# Run command
-CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]

bukkit/build-info.json

@@ -1,9 +0,0 @@
-{
-  "version": "bukkit",
-  "commit": "5aa4fc9b5e6bc9a7969f5f6069717e588608f25d",
-  "build_time": "2026-07-18T01:40:15Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:bukkit",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:c7644bfad5510f2981c5f95cf9a6d5daba3fb002a0de14f38777c9d474f33214",
-  "image_size": "302MB",
-  "image_size_bytes": 317396786
-}

bukkit/install_script.sh

@@ -1,122 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_DIR_OLD=/MCserver
-MC_DIR=/mc_server
-
-if [ -d "$MC_DIR_OLD" ]; then
-    mkdir -p "$MC_DIR"
-    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
-fi
-
-EULA_FILE=$MC_DIR/eula.txt
-EULA_MARKER=$MC_DIR/.eula_accepted
-
-# Main Install Links
-INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
-
-# Install java
-if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
-	then
-		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
-	else
-		echo " "
-		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
-		apt-get update
-		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
-fi
-
-# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
-# 	then
-# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
-# 	else
-# 		echo " "
-# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
-# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 		dpkg -i packages-microsoft-prod.deb \
-# 		apt-get update && apt-get install -y msopenjdk-25 \
-# 		apt-get -y update && apt-get -y --fix-broken install
-# fi
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ] && [ -e "$MC_DIR/run-$MC_VERSION.sh" ]
-	then
-		echo " "
-		echo "INFO ! craftbukkit-$MC_VERSION.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! craftbukkit-$MC_VERSION.jar is out of date/missing ... will download now."
-		echo " "
-		echo "INFO ! Cleaning old files."
-		mkdir -p $MC_DIR/old-server-versions/
-		mv $MC_DIR/craftbukkit-*.sh $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O $MC_DIR/craftbukkit-$MC_VERSION.jar
-		chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
-		echo " "
-		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now."
-		mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		cat > $MC_DIR/run-$MC_VERSION.sh <<- "EOF"
-		#!/bin/bash
-		# Copyright (c) 2022 fithwum
-		# All rights reserved
-
-		cd /mc_server
-		JAR=./craftbukkit-*.jar
-
-		while [ true ]; do
-			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-			if [ $? -eq 0 ]; then
-				break
-			fi
-		done
-		EOF
-		chmod +x $MC_DIR/run-$MC_VERSION.sh
-fi
-
-echo "INFO ! Setting game port."
-if [ -f $MC_DIR/server.properties ]; then
-	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
-fi
-
-# Wait briefly for installer/server to generate eula.txt
-if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
-    echo "INFO ! Waiting for EULA generation..."
-    sleep 5
-fi
-
-# If EULA already accepted once, never touch it again
-if [ -f "$EULA_MARKER" ]; then
-    echo "INFO ! EULA previously accepted"
-    return 0 2>/dev/null || true
-fi
-
-# First-time decision
-if [ "$ACCEPT_EULA" = "true" ]; then
-    echo "INFO ! Accepting EULA (one-time)"
-    sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
-    || echo "eula=true" > "$EULA_FILE"
-    touch "$EULA_MARKER"
-elif [ "$ACCEPT_EULA" = "false" ]; then
-    echo "WARNING ! EULA not accepted on first run"
-    echo "WARNING ! Set ACCEPT_EULA=true to proceed"
-    sleep infinity
-else
-    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
-    sleep infinity
-fi
-
-# Set permissions.
-chown 99:100 -R $MC_DIR
-chmod 777 -R $MC_DIR
-
-sleep 1
-
-# Run Minecraft server.
-echo " "
-echo "INFO ! Starting Minecraft Server $MC_VERSION"
-cd $MC_DIR
-exec ./run-$MC_VERSION.sh nogui
-
-exit

fabric/CHANGES.md

@@ -1,7 +0,0 @@
-## 2026-07-19T21:34:16Z
-
-- Merge build-info updates (fithwum)
-- Update build-info on 2026-07-19T21:34:10Z [skip ci] (fithwum)
-- Merge build-info updates (fithwum)
-- Update build-info on 2026-07-19T21:34:06Z [skip ci] (fithwum)
-- Merge changelog updates (fithwum)

fabric/Dockerfile

@@ -1,40 +0,0 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:trixie
-LABEL maintainer="fithwum"
-
-# Environment Variables
-ENV ACCEPT_EULA=""
-ENV GAME_PORT=""
-ENV MC_VERSION=""
-ENV FABRIC_VERSION=""
-ENV INSTALLER_VERSION=""
-ENV JAVA_VERSION="25"
-ENV XMX_SIZE=""
-ENV XMS_SIZE=""
-ENV XMN_SIZE=""
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/install_script.sh
-
-# Install Java & Dependencies.
-RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
-	&& apt-get -y --fix-broken install \
-	&& apt-get -y autoclean \
-	&& apt-get -y autoremove \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& update-ca-certificates -f;
-
-# Folder creation.
-RUN mkdir -p /mc_server /mc_temp \
-	&& chmod 777 -R /mc_server /mc_temp \
-	&& chown 99:100 -R /mc_server /mc_temp
-
-# Main script
-RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
-	&& chmod +x /mc_temp/install_script.sh
-
-# Directory where data is stored
-VOLUME /mc_server
-
-# Run command
-CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]

fabric/build-info.json

@@ -1,9 +0,0 @@
-{
-  "version": "fabric",
-  "commit": "87d07539f78a2adf46dbe878a978c93ec214e12a",
-  "build_time": "2026-07-18T01:39:48Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:fabric",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:909ce6a945a4daf112f2a3da28a5cee8878dfab6fd3f0e21ac219cbb75710451",
-  "image_size": "302MB",
-  "image_size_bytes": 317411450
-}

fabric/install_script.sh

@@ -1,121 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_DIR_OLD=/MCserver
-MC_DIR=/mc_server
-
-if [ -d "$MC_DIR_OLD" ]; then
-    mkdir -p "$MC_DIR"
-    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
-fi
-
-EULA_FILE=$MC_DIR/eula.txt
-EULA_MARKER=$MC_DIR/.eula_accepted
-
-# Main Install Links
-SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$INSTALLER_VERSION/server/jar
-
-# Install java
-if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
-	then
-		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
-	else
-		echo " "
-		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
-		apt-get update
-		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
-fi
-
-# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
-# 	then
-# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
-# 	else
-# 		echo " "
-# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
-# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 		dpkg -i packages-microsoft-prod.deb \
-# 		apt-get update && apt-get install -y msopenjdk-25 \
-# 		apt-get -y update && apt-get -y --fix-broken install
-# fi
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ] && [ -e "$MC_DIR/run-$MC_VERSION.sh" ]
-	then
-		echo " "
-		echo "INFO ! fabric-$MC_VERSION-$FABRIC_VERSION.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! fabric-$MC_VERSION-$FABRIC_VERSION.jar is out of date/missing ... will download now."
-		echo " "
-		echo "INFO ! Cleaning old files."
-		mkdir -p $MC_DIR/old-server-versions
-		mv $MC_DIR/fabric-*-*.jar $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
-		chmod +x $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
-		echo " "
-		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now."
-		mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		cat > $MC_DIR/run-$MC_VERSION.sh <<- "EOF"
-		#!/bin/bash
-		# Copyright (c) 2022 fithwum
-		# All rights reserved
-
-		cd /mc_server
-		JAR=./fabric-*-*.jar
-
-		while [ true ]; do
-			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-			if [ $? -eq 0 ]; then
-				break
-			fi
-		done
-		EOF
-		chmod +x $MC_DIR/run-$MC_VERSION.sh
-fi
-
-echo "INFO ! Setting game port."
-if [ -f $MC_DIR/server.properties ]; then
-	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
-fi
-
-# Wait briefly for installer/server to generate eula.txt
-if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
-    echo "INFO ! Waiting for EULA generation..."
-    sleep 5
-fi
-
-# If EULA already accepted once, never touch it again
-if [ -f "$EULA_MARKER" ]; then
-    echo "INFO ! EULA previously accepted"
-    return 0 2>/dev/null || true
-fi
-
-# First-time decision
-if [ "$ACCEPT_EULA" = "true" ]; then
-    echo "INFO ! Accepting EULA (one-time)"
-    sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
-    || echo "eula=true" > "$EULA_FILE"
-    touch "$EULA_MARKER"
-elif [ "$ACCEPT_EULA" = "false" ]; then
-    echo "WARNING ! EULA not accepted on first run"
-    echo "WARNING ! Set ACCEPT_EULA=true to proceed"
-    sleep infinity
-else
-    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
-    sleep infinity
-fi
-
-# Set permissions.
-chown 99:100 -R $MC_DIR
-chmod 777 -R $MC_DIR
-
-sleep 1
-
-# Run Minecraft server.
-echo " "
-echo "INFO ! Starting Minecraft Server $MC_VERSION"
-exec $MC_DIR/run-$MC_VERSION.sh --dataPath=$MC_DIR
-
-exit

forge/CHANGES.md

@@ -1,7 +0,0 @@
-## 2026-07-19T21:33:56Z
-
-- Merge changelog updates (fithwum)
-- Update changelogs on 2026-07-19T21:33:50Z [skip ci] (fithwum)
-- Merge changelog updates (fithwum)
-- Update changelogs on 2026-07-19T21:33:46Z [skip ci] (fithwum)
-- Merge changelog updates (fithwum)

forge/Dockerfile

@@ -1,38 +0,0 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:trixie
-LABEL maintainer="fithwum"
-
-ENV ACCEPT_EULA=""
-ENV GAME_PORT=""
-ENV MC_VERSION=""
-ENV FORGE_VERSION=""
-ENV JAVA_VERSION="25"
-ENV XMX_SIZE=""
-ENV XMS_SIZE=""
-ENV XMN_SIZE=""
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/forge/Install_Script.sh
-
-# Install Java & Dependencies.
-RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
-	&& apt-get -y --fix-broken install \
-	&& apt-get -y autoclean \
-	&& apt-get -y autoremove \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& update-ca-certificates -f;
-
-# Folder creation.
-RUN mkdir -p /mc_server /mc_temp \
-	&& chmod 777 -R /mc_server /mc_temp \
-	&& chown 99:100 -R /mc_server /mc_temp
-
-# Main script
-RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
-	&& chmod +x /mc_temp/install_script.sh
-
-# Directory where data is stored
-VOLUME /mc_server
-
-# Run command
-CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]

forge/Install_Script.sh

@@ -1,118 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_DIR_OLD=/MCserver
-MC_DIR=/mc_server
-
-if [ -d "$MC_DIR_OLD" ]; then
-    mkdir -p "$MC_DIR"
-    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
-fi
-
-EULA_FILE=$MC_DIR/eula.txt
-EULA_MARKER=$MC_DIR/.eula_accepted
-
-# Main Install Links
-INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$MC_VERSION-$FORGE_VERSION/forge-$MC_VERSION-$FORGE_VERSION-installer.jar
-
-# Install java
-if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
-	then
-		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
-	else
-		echo " "
-		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
-		apt-get update
-		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
-fi
-
-# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
-# 	then
-# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
-# 	else
-# 		echo " "
-# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
-# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 		dpkg -i packages-microsoft-prod.deb \
-# 		apt-get update && apt-get install -y msopenjdk-25 \
-# 		apt-get -y update && apt-get -y --fix-broken install
-# fi
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]
-	then
-		echo " "
-		echo "INFO ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar is out of date/missing ... will download now."
-		echo " "
-		echo "INFO ! Cleaning old files."
-		cd $MC_DIR
-		mkdir -p /old-server-versions/
-		mv neoforge-*.jar old-server-versions/
-		mv run-*.sh old-server-versions/ 
-		mv /libraries /libraries_OLD
-		mv /libraries_OLD old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
-		chmod +x forge-$MC_VERSION-$FORGE_VERSION-installer.jar
-		java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer
-		mv run.sh run-$MC_VERSION-$FORGE_VERSION.sh
-		chmod +x run-$MC_VERSION-$FORGE_VERSION.sh
-		cd ..
-fi
-
-echo "INFO ! Setting game port."
-if [ -f $MC_DIR/server.properties ]; then
-	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
-fi
-
-echo "INFO ! Setting java settings."
-tee $MC_DIR/user_jvm_args.txt <<-EOF
--Xmx${XMX_SIZE}
--Xms${XMS_SIZE}
--Xmn${XMN_SIZE}
-EOF
-
-# Wait briefly for installer/server to generate eula.txt
-if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
-    echo "INFO ! Waiting for EULA generation..."
-    sleep 5
-fi
-
-# If EULA already accepted once, never touch it again
-if [ -f "$EULA_MARKER" ]; then
-    echo "INFO ! EULA previously accepted"
-    return 0 2>/dev/null || true
-fi
-
-# First-time decision
-if [ "$ACCEPT_EULA" = "true" ]; then
-    echo "INFO ! Accepting EULA (one-time)"
-    sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
-    || echo "eula=true" > "$EULA_FILE"
-    touch "$EULA_MARKER"
-elif [ "$ACCEPT_EULA" = "false" ]; then
-    echo "WARNING ! EULA not accepted on first run"
-    echo "WARNING ! Set ACCEPT_EULA=true to proceed"
-    sleep infinity
-else
-    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
-    sleep infinity
-fi
-
-# Set permissions.
-chown 99:100 -R $MC_DIR
-chmod 777 -R $MC_DIR
-
-sleep 1
-
-# Run Minecraft server.
-echo " "
-echo "INFO ! Starting Minecraft Server $MC_VERSION-$FORGE_VERSION"
-cd $MC_DIR
-exec ./run-$MC_VERSION-$FORGE_VERSION.sh nogui
-
-exit

forge/build-info.json

@@ -1,9 +0,0 @@
-{
-  "version": "forge",
-  "commit": "8a0348df8a440541c0c7975cfae8978d1b53f5f7",
-  "build_time": "2026-07-18T04:15:55Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:forge",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:2c78b88db1385dd8a36144fd933b9014a749bb3b02bd305984bd1568bbe8eb41",
-  "image_size": "302MB",
-  "image_size_bytes": 317411380
-}

minecraft/CHANGES.md

@@ -1,7 +1,7 @@
-## 2026-07-19T21:33:50Z
+## 2026-08-09T21:36:46Z
 
+- Merge build-info updates (fithwum)
+- Update build-info on 2026-08-09T21:31:56Z [skip ci] (fithwum)
 - Merge changelog updates (fithwum)
-- Update changelogs on 2026-07-19T21:33:46Z [skip ci] (fithwum)
-- Merge changelog updates (fithwum)
-- Update changelogs on 2026-07-19T21:33:38Z [skip ci] (fithwum)
-- Merge changelog updates (fithwum)
+- Update changelogs on 2026-08-09T21:31:42Z [skip ci] (fithwum)
+- Merge build-info updates (fithwum)

minecraft/Dockerfile

@@ -2,10 +2,9 @@ FROM gitea.fithwum.tech/fithwum/debian-base:trixie
 LABEL maintainer="fithwum"
 
 # Environment Variables.
+# Minecarft settings.
 ENV ACCEPT_EULA=""
 ENV GAME_PORT=""
-
-# Minecarft versions.
 ENV MC_TYPE=""
 ENV MC_VERSION=""
 ENV QUILT_VERSION=""
@@ -14,9 +13,13 @@ ENV NEOFORGED_VERSION=""
 ENV FABRIC_VERSION=""
 ENV FABRIC_INSTALLER_VERSION=""
 
+# RCON settings.
+ENV ENABLE_RCON=""
+ENV RCON_PORT=""
+ENV RCON_PASSWORD=""
+
 # Java settings.
 ENV JAVA_VERSION=""
-
 ENV XMX_SIZE=""
 ENV XMS_SIZE=""
 ENV XMN_SIZE=""
@@ -34,16 +37,16 @@ RUN apt-get -y update \
 	&& update-ca-certificates -f;
 
 # Folder creation.
-RUN mkdir -p /mc_server /mc_temp \
-	&& chmod 777 -R /mc_server /mc_temp \
-	&& chown 99:100 -R /mc_server /mc_temp
+RUN mkdir -p /mcserver /mctemp \
+	&& chmod 777 -R /mcserver /mctemp \
+	&& chown 99:100 -R /mcserver /mctemp
 
 # Main script
-RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
-	&& chmod +x /mc_temp/install_script.sh
+RUN wget "$INSTALL_SCRIPT" -O /mctemp/install_script.sh \
+	&& chmod +x /mctemp/install_script.sh
 
 # Directory where data is stored
-VOLUME /mc_server
+VOLUME /mcserver
 
 # Run command
-CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]
+CMD [ "/bin/bash", "./mctemp/install_script.sh" ]

minecraft/build-info.json

@@ -1,9 +1,9 @@
 {
   "version": "minecraft",
-  "commit": "caa227b9dd31c3bc1e1a2e879d75e5cd7a7aec36",
-  "build_time": "2026-07-18T01:39:28Z",
+  "commit": "df114a0900e7999360513bb3b540e7550ce5dfa9",
+  "build_time": "2026-08-09T21:36:57Z",
   "image_tag": "gitea.fithwum.tech/fithwum/minecraft:minecraft",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:1e23927a291a1d3c6d2d11d85182de3c63d0001d5ae0353835b209d514e8d251",
+  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:41049ca42113c9ec177af14c5b74713385c10eb279cf283482f07e841ad32fec",
   "image_size": "302MB",
-  "image_size_bytes": 317417955
+  "image_size_bytes": 317406827
 }

minecraft/install_script.sh

@@ -1,13 +1,19 @@
 #!/bin/bash
-# Copyright (c) 2022 fithwum
+# Copyright (c) 2026 fithwum
 # All rights reserved
 
-MC_DIR=/mc_server
+MC_DIR=/mcserver
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
-VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
-MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
+MS_REPO=https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb
+SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/minecraft/server.properties
+
+RUN_VANILLA=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-vanilla.sh
+RUN_BUKKIT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-bukkit.sh
+RUN_FABRIC=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-fabric.sh
+RUN_QUILT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-quilt.sh
+
 BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
 FABRIC_SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$FABRIC_INSTALLER_VERSION/server/jar
 QUILT_INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
@@ -15,70 +21,135 @@ FORGE_INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$
 NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar
 
 # Install java
-if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
+if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
+    echo "INFO ! $JAVA_VERSION Selected"
+	if [ dpkg -s openjdk-21-jre-headless &> /dev/null ]
 		then
-		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
+			echo "INFO ! $JAVA_VERSION installed ... moving on."
 		else
 			echo " "
-		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
+			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
 			apt-get update
-		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
+			apt-get --no-install-recommends -y install openjdk-21-jre-headless
+	fi
+elif [ $JAVA_VERSION = "openjdk-25-jre" ]; then
+    echo "INFO ! $JAVA_VERSION Selected"
+	if [ dpkg -s openjdk-25-jre-headless &> /dev/null ]
+		then
+			echo "INFO ! $JAVA_VERSION installed ... moving on."
+		else
+			echo " "
+			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
+			apt-get update
+			apt-get --no-install-recommends -y install openjdk-25-jre-headless
+	fi
+elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
+    echo "INFO ! $JAVA_VERSION Selected"
+	if [ dpkg -s msopenjdk-21 &> /dev/null ]
+		then
+			echo "INFO ! $JAVA_VERSION installed ... moving on."
+		else
+			echo " "
+			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
+			wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO -O packages-microsoft-prod.deb
+			dpkg -i packages-microsoft-prod.deb
+			apt-get update && apt-get install -y msopenjdk-21
+			apt-get -y update && apt-get -y --fix-broken install
+	fi
+elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
+    echo "INFO ! $JAVA_VERSION Selected"
+	if [ dpkg -s msopenjdk-25 &> /dev/null ]
+		then
+			echo "INFO ! $JAVA_VERSION installed ... moving on."
+		else
+			echo " "
+			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
+			wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO -O packages-microsoft-prod.deb
+			dpkg -i packages-microsoft-prod.deb
+			apt-get update && apt-get install -y msopenjdk-25
+			apt-get -y update && apt-get -y --fix-broken install
+	fi
+else
+    echo "ERROR ! Java version must be set first run"
+    sleep infinity
 fi
-
-# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
-# 	then
-# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
-# 	else
-# 		echo " "
-# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
-# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 		dpkg -i packages-microsoft-prod.deb \
-# 		apt-get update && apt-get install -y msopenjdk-25 \
-# 		apt-get -y update && apt-get -y --fix-broken install
-# fi
 
 # Main install (Debian).
 # Check for server files and download if needed.
-
-# WORKING
 if [ $MC_TYPE = "vanilla" ]; then
     echo "INFO ! Vanilla Selected"
-	if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ]
-		then
-			echo " "
-			echo "INFO ! mcserver-$MC_VERSION.jar found starting now."
-		else
-			echo " "
-			echo "WARNING ! mcserver-$MC_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			cd $MC_DIR
-			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
-			mv -v *.log old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O mcserver-$MC_VERSION.jar
-			chmod +x mcserver-$MC_VERSION.jar
-			echo " "
-			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
-			mv -v run-*.sh old-server-versions/
-			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
-			#!/bin/bash
-			# Copyright (c) 2022 fithwum
-			# All rights reserved
+	# Fallback to default channel type if MC_TYPE or MC_VERSION is empty
+	: "${MC_VERSION:=latest}"
+	echo "Using server type: $MC_TYPE"
 
-			cd /mc_server
-			JAR=./mcserver-*.jar
+	# Get the currently installed Minecraft version from the filesystem
+	CUR_VERSION=$(find "$MC_DIR" -name "installed-*" | cut -d - -f2-)
+	echo "Current local version: '${CUR_VERSION:-None}'"
 
-			while [ true ]; do
-				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
+	# Fetch the global Minecraft version manifest cleanly
+	JSON=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json")
+	# Validate that we actually received valid JSON
+	if [ -z "$JSON" ] || ! echo "$JSON" | jq . >/dev/null 2>&1; then
+		echo "Error: Failed to fetch valid JSON from Mojang API"
+		exit 1
 	fi
-			done
-			EOF
-			chmod +x run-$MC_TYPE-$MC_VERSION.sh
+
+	# Resolve the target version dynamically
+	if [ ! -z "$MC_VERSION" ] && [ "$MC_VERSION" != "latest" ]; then
+		# User specified an exact version string (e.g., 1.20.1)
+		TARGET_VERSION=$(echo "$JSON" | jq -r --arg version "$MC_VERSION" '.versions[] | select(.id == $version) | .id')
+		if [ -z "$TARGET_VERSION" ]; then
+			echo "Error: Specified version '$MC_VERSION' not found in Mojang API."
+			exit 1
+		fi
+	else
+		# No version specified or "latest" chosen. Pull from the latest release
+		TARGET_VERSION=$(echo "$JSON" | jq -r '.latest.release')
+	fi
+	echo "Target version determined: '$TARGET_VERSION'"
+	# Update variable to match resolved target
+	MC_VERSION=$TARGET_VERSION
+
+	# Compare versions and only update if they do NOT match
+	if [ "$CUR_VERSION" != "$TARGET_VERSION" ]; then
+		echo "Versions differ ($CUR_VERSION vs $TARGET_VERSION). Fetching Minecraft server download URL..."
+		# Extract the target sub-manifest URL for this specific Minecraft version
+		VERSION_CHECK=$(echo "$JSON" | jq -r --arg version "$TARGET_VERSION" '.versions[] | select(.id == $version) | .url')
+		if [ "$VERSION_CHECK" == "null" ] || [ -z "$VERSION_CHECK" ]; then
+			echo "Error: Metadata URL link not found for version $TARGET_VERSION"
+			exit 1
+		fi
+		# Fetch the specific version's metadata JSON and extract the server jar link
+		MC_SERVER_FILE=$(curl -s "$VERSION_CHECK" | jq -r '.downloads.server.url')
+		if [ "$MC_SERVER_FILE" == "null" ] || [ -z "$MC_SERVER_FILE" ]; then
+			echo "Error: Server jar download URL not found for version $TARGET_VERSION"
+			exit 1
+		fi
+		echo "Ready to download: $MC_SERVER_FILE"
+		# Process Vanilla Minecraft downloads
+		echo " "
+		echo "WARNING ! Minecraft server is out of date/missing ... will download now."
+		echo "INFO ! Cleaning old files."
+		cd "$MC_DIR" || exit 1
+		mkdir -pv old-server-versions/
+		# Wipe old dependencies cleanly
+		rm -fr *.jar libraries defaultconfigs user_jvm_args.txt run.bat
+		# Safely preserve old logs
+		[ -f *.log ] && mv *.log old-server-versions/
+		# Download and fix execution modes
+		wget --no-cache --show-progress --progress=bar:force:noscroll "$MC_SERVER_FILE" -O "mcserver-$MC_VERSION.jar"
+		chmod +x "mcserver-$MC_VERSION.jar"
+		echo " "
+		echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now."
+		[ -f run-*.sh ] && mv -v run-*.sh old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll "$RUN_VANILLA" -O "run-$MC_TYPE-$MC_VERSION.sh"
+		chmod +x "run-$MC_TYPE-$MC_VERSION.sh"
+		# Drop updated marker file
+		rm -f installed-*
+		touch installed-$MC_VERSION
 		cd ..
+	else
+		echo "No update required. Local version matches target version."
 	fi
 elif [ $MC_TYPE = "bukkit" ]; then
     echo "INFO ! Bukkit Selected"
@@ -93,29 +164,14 @@ elif [ $MC_TYPE = "bukkit" ]; then
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
 			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
+			rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
 			mv -v *.log old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $BUKKIT_INSTALLER_FILE -O craftbukkit-$MC_VERSION.jar
 			chmod +x craftbukkit-$MC_VERSION.jar
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
 			mv -v run-*.sh old-server-versions/
-			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
-			#!/bin/bash
-			# Copyright (c) 2022 fithwum
-			# All rights reserved
-
-			cd /mc_server
-			JAR=./craftbukkit-*.jar
-			
-			while [ true ]; do
-				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
-				fi
-			done
-			EOF
+			wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_BUKKIT -O run-$MC_TYPE-$MC_VERSION.sh
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
 			cd ..
 	fi
@@ -132,29 +188,14 @@ elif [ $MC_TYPE = "fabric" ]; then
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
 			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
+			rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
 			mv -v *.log old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $FABRIC_SERVER_FILE -O fabric-$MC_VERSION-$FABRIC_VERSION.jar
 			chmod +x fabric-$MC_VERSION-$FABRIC_VERSION.jar
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
 			mv -v run-*.sh old-server-versions/
-			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
-			#!/bin/bash
-			# Copyright (c) 2022 fithwum
-			# All rights reserved
-
-			cd /mc_server
-			JAR=./fabric-*-*.jar
-			
-			while [ true ]; do
-				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
-				fi
-			done
-			EOF
+			wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_FABRIC -O run-$MC_TYPE-$MC_VERSION.sh
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
 			cd ..
 	fi
@@ -171,8 +212,7 @@ elif [ $MC_TYPE = "quilt" ]; then
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
 			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
+			rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
 			mv -v *.log old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $QUILT_INSTALLER_FILE -O quilt-installer-$QUILT_VERSION.jar
 			chmod +x quilt-installer-$QUILT_VERSION.jar
@@ -184,26 +224,10 @@ elif [ $MC_TYPE = "quilt" ]; then
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
 			mv -v run-*.sh old-server-versions/
-			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
-			#!/bin/bash
-			# Copyright (c) 2022 fithwum
-			# All rights reserved
-			
-			cd /mc_server
-			JAR=./quilt-server-launch.jar
-			
-			while [ true ]; do
-				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
-				fi
-			done
-			EOF
+			wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_QUILT -O run-$MC_TYPE-$MC_VERSION.sh
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
 			cd ..
 	fi
-
-# NOT WORKING
 elif [ $MC_TYPE = "forge" ]; then
     echo "INFO ! Forge Selected"
 	if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]
@@ -217,8 +241,7 @@ elif [ $MC_TYPE = "forge" ]; then
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
 			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
+			rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
 			mv -v *.log old-server-versions/
 			mv -v run-*.sh old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $FORGE_INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
@@ -246,8 +269,7 @@ elif [ $MC_TYPE = "neoforged" ]; then
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
 			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
+			rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
 			mv -v *.log old-server-versions/
 			mv -v run-*.sh old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $NEOFORGED_INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar
@@ -267,6 +289,13 @@ else
     sleep infinity
 fi
 
+if [ -f $MC_DIR/server.properties ]; then
+    echo "INFO ! server.properties found ... moving on."
+else
+	echo "WARNING ! server.properties missing ... downloading default file."
+    wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_PROPERTIES -O $MC_DIR/server.properties
+fi
+
 echo "INFO ! Setting game port."
 if [ -f $MC_DIR/server.properties ]; then
 	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties

minecraft/run-bukkit.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+cd /mcserver
+JAR=./craftbukkit-*.jar
+
+while [ true ]; do
+	java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+	EXIT_CODE=$?
+	echo "Minecraft exited with code $EXIT_CODE"
+	[ "$EXIT_CODE" -eq 0 ] && break
+	echo "Restarting server in 5 seconds..."
+	sleep 5
+done

minecraft/run-fabric.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+cd /mcserver
+JAR=./fabric-*-*.jar
+
+while [ true ]; do
+	java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+	EXIT_CODE=$?
+	echo "Minecraft exited with code $EXIT_CODE"
+	[ "$EXIT_CODE" -eq 0 ] && break
+	echo "Restarting server in 5 seconds..."
+	sleep 5
+done

minecraft/run-quilt.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+cd /mcserver
+JAR=./quilt-server-launch.jar
+
+while [ true ]; do
+	java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+	EXIT_CODE=$?
+	echo "Minecraft exited with code $EXIT_CODE"
+    [ "$EXIT_CODE" -eq 0 ] && break
+	echo "Restarting server in 5 seconds..."
+	sleep 5
+done

minecraft/run-vanilla.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+cd /mcserver
+JAR=./mcserver-*.jar
+
+while [ true ]; do
+	java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+	EXIT_CODE=$?
+	echo "Minecraft exited with code $EXIT_CODE"
+	[ "$EXIT_CODE" -eq 0 ] && break
+	echo "Restarting server in 5 seconds..."
+	sleep 5
+done

minecraft/server.properties

@@ -0,0 +1,44 @@
+#Minecraft server properties - for more information head over to: https://minecraft.gamepedia.com/Server.properties
+spawn-protection=16
+max-tick-time=60000
+query.port=25565
+generator-settings=
+force-gamemode=false
+allow-nether=true
+enforce-whitelist=false
+gamemode=survival
+broadcast-console-to-ops=true
+enable-query=false
+player-idle-timeout=0
+difficulty=easy
+broadcast-rcon-to-ops=true
+spawn-monsters=true
+op-permission-level=4
+pvp=true
+snooper-enabled=false
+level-type=default
+hardcore=false
+enable-command-block=false
+network-compression-threshold=256
+max-players=15
+max-world-size=29999984
+resource-pack-sha1=
+rcon.port=25575
+server-port=25565
+server-ip=
+spawn-npcs=true
+allow-flight=false
+level-name=world
+view-distance=10
+resource-pack=
+spawn-animals=true
+white-list=false
+rcon.password=Dockeradmin
+generate-structures=true
+online-mode=true
+max-build-height=256
+level-seed=
+prevent-proxy-connections=false
+use-native-transport=true
+motd=A Minecraft Server
+enable-rcon=false

neoforged/CHANGES.md

@@ -1,7 +0,0 @@
-## 2026-07-19T21:33:46Z
-
-- Merge changelog updates (fithwum)
-- Update changelogs on 2026-07-19T21:33:38Z [skip ci] (fithwum)
-- Merge changelog updates (fithwum)
-- Update changelogs on 2026-07-19T21:33:28Z [skip ci] (fithwum)
-- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:b405854d9dbfb510af67cd8d949a488c86d05c3ac1890558c40a6bf993d82703 (fithwum)

neoforged/Dockerfile

@@ -1,37 +0,0 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:trixie
-LABEL maintainer="fithwum"
-
-ENV ACCEPT_EULA=""
-ENV GAME_PORT=""
-ENV NEOFORGED_VERSION=""
-ENV JAVA_VERSION="25"
-ENV XMX_SIZE=""
-ENV XMS_SIZE=""
-ENV XMN_SIZE=""
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neoforged/Install_Script.sh
-
-# Install Java & Dependencies.
-RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
-	&& apt-get -y --fix-broken install \
-	&& apt-get -y autoclean \
-	&& apt-get -y autoremove \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& update-ca-certificates -f;
-
-# Folder creation.
-RUN mkdir -p /mc_server /mc_temp \
-	&& chmod 777 -R /mc_server /mc_temp \
-	&& chown 99:100 -R /mc_server /mc_temp
-
-# Main script
-RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
-	&& chmod +x /mc_temp/install_script.sh
-
-# Directory where data is stored
-VOLUME /mc_server
-
-# Run command
-CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]

neoforged/Install_Script.sh

@@ -1,118 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_DIR_OLD=/MCserver
-MC_DIR=/mc_server
-
-if [ -d "$MC_DIR_OLD" ]; then
-    mkdir -p "$MC_DIR"
-    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
-fi
-
-EULA_FILE=$MC_DIR/eula.txt
-EULA_MARKER=$MC_DIR/.eula_accepted
-
-# Main Install Links
-INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar
-
-# Install java
-if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
-	then
-		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
-	else
-		echo " "
-		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
-		apt-get update
-		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
-fi
-
-# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
-# 	then
-# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
-# 	else
-# 		echo " "
-# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
-# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 		dpkg -i packages-microsoft-prod.deb \
-# 		apt-get update && apt-get install -y msopenjdk-25 \
-# 		apt-get -y update && apt-get -y --fix-broken install
-# fi
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $MC_DIR/neoforge-$NEOFORGED_VERSION-installer.jar ]
-	then
-		echo " "
-		echo "INFO ! neoforge-$NEOFORGED_VERSION-installer.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! neoforge-$NEOFORGED_VERSION-installer.jar is out of date/missing ... will download now."
-		echo " "
-		echo "INFO ! Cleaning old files."
-		cd $MC_DIR
-		mkdir -p /old-server-versions/
-		mv neoforge-*.jar old-server-versions/
-		mv run-*.sh old-server-versions/ 
-		mv /libraries /libraries_OLD
-		mv /libraries_OLD old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar
-		chmod +x neoforge-$NEOFORGED_VERSION-installer.jar
-		java -jar neoforge-$NEOFORGED_VERSION-installer.jar --installServer
-		mv run.sh run-$NEOFORGED_VERSION.sh
-		chmod +x run-$NEOFORGED_VERSION.sh
-		cd ..
-fi
-
-echo "INFO ! Setting game port."
-if [ -f $MC_DIR/server.properties ]; then
-	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
-fi
-
-echo "INFO ! Setting java settings."
-tee $MC_DIR/user_jvm_args.txt <<-EOF
--Xmx${XMX_SIZE}
--Xms${XMS_SIZE}
--Xmn${XMN_SIZE}
-EOF
-
-# Wait briefly for installer/server to generate eula.txt
-if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
-    echo "INFO ! Waiting for EULA generation..."
-    sleep 5
-fi
-
-# If EULA already accepted once, never touch it again
-if [ -f "$EULA_MARKER" ]; then
-    echo "INFO ! EULA previously accepted"
-    return 0 2>/dev/null || true
-fi
-
-# First-time decision
-if [ "$ACCEPT_EULA" = "true" ]; then
-    echo "INFO ! Accepting EULA (one-time)"
-    sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
-    || echo "eula=true" > "$EULA_FILE"
-    touch "$EULA_MARKER"
-elif [ "$ACCEPT_EULA" = "false" ]; then
-    echo "WARNING ! EULA not accepted on first run"
-    echo "WARNING ! Set ACCEPT_EULA=true to proceed"
-    sleep infinity
-else
-    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
-    sleep infinity
-fi
-
-# Set permissions.
-chown 99:100 -R $MC_DIR
-chmod 777 -R $MC_DIR
-
-sleep 1
-
-# Run Minecraft server.
-echo " "
-echo "INFO ! Starting Minecraft Server $NEOFORGED_VERSION"
-cd $MC_DIR
-exec ./run-$NEOFORGED_VERSION.sh
-
-exit

neoforged/build-info.json

@@ -1,9 +0,0 @@
-{
-  "version": "neoforged",
-  "commit": "f4881cb9f068ce446df462210b75c6ce8ca0fab1",
-  "build_time": "2026-07-19T21:34:23Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:neoforged",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:5347012c16a5ec24e014e6caf014225c80715db0ecb8cd35d9d6b472518a6704",
-  "image_size": "302MB",
-  "image_size_bytes": 317411300
-}

quilt/CHANGES.md

@@ -1,6 +0,0 @@
-## 2026-07-19T21:33:38Z
-
-- Merge changelog updates (fithwum)
-- Update changelogs on 2026-07-19T21:33:28Z [skip ci] (fithwum)
-- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:b405854d9dbfb510af67cd8d949a488c86d05c3ac1890558c40a6bf993d82703 (fithwum)
-- files (fithwum)

quilt/Dockerfile

@@ -1,38 +0,0 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:trixie
-LABEL maintainer="fithwum"
-
-ENV ACCEPT_EULA=""
-ENV GAME_PORT=""
-ENV MC_VERSION=""
-ENV QUILT_VERSION=""
-ENV JAVA_VERSION="25"
-ENV XMX_SIZE=""
-ENV XMS_SIZE=""
-ENV XMN_SIZE=""
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/quilt/Install_Script.sh
-
-# Install Java & Dependencies.
-RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
-	&& apt-get -y --fix-broken install \
-	&& apt-get -y autoclean \
-	&& apt-get -y autoremove \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& update-ca-certificates -f;
-
-# Folder creation.
-RUN mkdir -p /mc_server /mc_temp \
-	&& chmod 777 -R /mc_server /mc_temp \
-	&& chown 99:100 -R /mc_server /mc_temp
-
-# Main script
-RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
-	&& chmod +x /mc_temp/install_script.sh
-
-# Directory where data is stored
-VOLUME /mc_server
-
-# Run command
-CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]

quilt/Install_Script.sh

@@ -1,151 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_DIR_OLD=/MCserver
-MC_DIR=/mc_server
-
-if [ -d "$MC_DIR_OLD" ]; then
-    mkdir -p "$MC_DIR"
-    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
-fi
-
-EULA_FILE=$MC_DIR/eula.txt
-EULA_MARKER=$MC_DIR/.eula_accepted
-
-# Main Install Links
-INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
-
-# Install java
-if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
-	then
-		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
-	else
-		echo " "
-		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
-		apt-get update
-		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
-fi
-
-# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
-# 	then
-# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
-# 	else
-# 		echo " "
-# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
-# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 		dpkg -i packages-microsoft-prod.deb \
-# 		apt-get update && apt-get install -y msopenjdk-25 \
-# 		apt-get -y update && apt-get -y --fix-broken install
-# fi
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ] && [ -e "$MC_DIR/run-$MC_VERSION.sh" ]
-	then
-		echo " "
-		echo "INFO ! quilt-installer-$QUILT_VERSION.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! quilt-installer-$QUILT_VERSION.jar is out of date/missing ... will download now."
-		echo " "
-		echo "INFO ! Cleaning old files."
-		cd $MC_DIR
-		mkdir -p /old-server-versions/
-		mv quilt-installer-*.jar old-server-versions/
-		mv /libraries /libraries_OLD
-		mv /libraries_OLD old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O quilt-installer-$QUILT_VERSION.jar
-		chmod +x quilt-installer-$QUILT_VERSION.jar
-		java -jar quilt-installer-$QUILT_VERSION.jar install server $MC_VERSION --download-server
-		cd server
-		mv * /$MC_DIR
-		cd ..
-		rm -fr server
-		echo " "
-		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now."
-		mv -v run-*.sh old-server-versions/
-		cat > run-$MC_VERSION.sh <<- "EOF"
-		#!/bin/bash
-		# Copyright (c) 2022 fithwum
-		# All rights reserved
-
-		cd /mc_server
-		JAR=./quilt-server-launch.jar
-
-		while [ true ]; do
-			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-			if [ $? -eq 0 ]; then
-				break
-			fi
-		done
-		EOF
-		chmod +x run-$MC_VERSION.sh
-		cd ..
-fi
-
-# Looking for run.sh
-if [ -e $MC_DIR/run-$MC_VERSION.sh ]
-	then
-		echo " "
-		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
-	else
-		echo " "
-		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
-		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh
-		chmod +x $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh
-fi
-
-echo "INFO ! Setting game port."
-if [ -f $MC_DIR/server.properties ]; then
-	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
-fi
-
-echo "INFO ! Setting java settings."
-tee $MC_DIR/user_jvm_args.txt <<-EOF
--Xmx${XMX_SIZE}
--Xms${XMS_SIZE}
--Xmn${XMN_SIZE}
-EOF
-
-# Wait briefly for installer/server to generate eula.txt
-if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
-    echo "INFO ! Waiting for EULA generation..."
-    sleep 5
-fi
-
-# If EULA already accepted once, never touch it again
-if [ -f "$EULA_MARKER" ]; then
-    echo "INFO ! EULA previously accepted"
-    return 0 2>/dev/null || true
-fi
-
-# First-time decision
-if [ "$ACCEPT_EULA" = "true" ]; then
-    echo "INFO ! Accepting EULA (one-time)"
-    sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
-    || echo "eula=true" > "$EULA_FILE"
-    touch "$EULA_MARKER"
-elif [ "$ACCEPT_EULA" = "false" ]; then
-    echo "WARNING ! EULA not accepted on first run"
-    echo "WARNING ! Set ACCEPT_EULA=true to proceed"
-    sleep infinity
-else
-    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
-    sleep infinity
-fi
-
-# Set permissions.
-chown 99:100 -R $MC_DIR
-chmod 777 -R $MC_DIR
-
-sleep 1
-
-# Run Minecraft server.
-echo " "
-echo "INFO ! Starting Minecraft Server $MC_VERSION-$QUILT_VERSION"
-cd $MC_DIR
-exec ./run-$MC_VERSION-$QUILT_VERSION.sh
-
-exit

quilt/build-info.json

@@ -1,9 +0,0 @@
-{
-  "version": "quilt",
-  "commit": "6c0712d202df3c173e2086f9e38032fe47400c54",
-  "build_time": "2026-07-19T21:34:10Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:quilt",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:b16c6d763638ff431a87c74c81ec11b8b210de60834881ca22ec1acb2cb725fa",
-  "image_size": "302MB",
-  "image_size_bytes": 317397617
-}

testing/CHANGES.md

@@ -1,6 +1,7 @@
-## 2026-07-18T01:37:59Z
+## 2026-08-09T21:31:42Z
 
+- Merge build-info updates (fithwum)
+- Update build-info on 2026-08-02T21:36:06Z [skip ci] (fithwum)
 - Merge changelog updates (fithwum)
-- Update changelogs on 2026-07-18T01:36:49Z [skip ci] (fithwum)
-- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:6c804614be0dd3b2ba235d0386b1ef4bf8047765e44135421ed9a1f4ac96dff4 (fithwum)
-- update workflows to handle parallel building (fithwum)
+- Update changelogs on 2026-08-02T21:35:55Z [skip ci] (fithwum)
+- Merge build-info updates (fithwum)

testing/Dockerfile

@@ -2,10 +2,9 @@ FROM gitea.fithwum.tech/fithwum/debian-base:trixie
 LABEL maintainer="fithwum"
 
 # Environment Variables.
+# Minecarft settings.
 ENV ACCEPT_EULA=""
 ENV GAME_PORT=""
-
-# Minecarft versions.
 ENV MC_TYPE=""
 ENV MC_VERSION=""
 ENV QUILT_VERSION=""
@@ -14,9 +13,13 @@ ENV NEOFORGED_VERSION=""
 ENV FABRIC_VERSION=""
 ENV FABRIC_INSTALLER_VERSION=""
 
+# RCON settings.
+ENV ENABLE_RCON=""
+ENV RCON_PORT=""
+ENV RCON_PASSWORD=""
+
 # Java settings.
 ENV JAVA_VERSION=""
-
 ENV XMX_SIZE=""
 ENV XMS_SIZE=""
 ENV XMN_SIZE=""
@@ -26,7 +29,7 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install Java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq screen \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
@@ -34,16 +37,16 @@ RUN apt-get -y update \
 	&& update-ca-certificates -f;
 
 # Folder creation.
-RUN mkdir -p /mc_server /mc_temp \
-	&& chmod 777 -R /mc_server /mc_temp \
-	&& chown 99:100 -R /mc_server /mc_temp
+RUN mkdir -p /mcserver /mctemp \
+	&& chmod 777 -R /mcserver /mctemp \
+	&& chown 99:100 -R /mcserver /mctemp
 
 # Main script
-RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
-	&& chmod +x /mc_temp/install_script.sh
+RUN wget "$INSTALL_SCRIPT" -O /mctemp/install_script.sh \
+	&& chmod +x /mctemp/install_script.sh
 
 # Directory where data is stored
-VOLUME /mc_server
+VOLUME /mcserver
 
 # Run command
-CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]
+CMD [ "/bin/bash", "./mctemp/install_script.sh" ]

testing/build-info.json

@@ -1,9 +1,9 @@
 {
   "version": "testing",
-  "commit": "655d86c3ccfbee4a5786bee68436b1eb531e6888",
-  "build_time": "2026-07-18T01:38:57Z",
+  "commit": "c69d6ee0c3134f7d659fe54d12fc4e9f92d625aa",
+  "build_time": "2026-08-09T21:31:55Z",
   "image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:2f618f75546e90dfe1f14a2eb4b329a29331252027657bde42fbd253455f4be6",
-  "image_size": "302MB",
-  "image_size_bytes": 317403510
+  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:32acbdb28577d8aecbfbb4c26dc0f9d5ec1b4294f92baec63ead71354d486d07",
+  "image_size": "304MB",
+  "image_size_bytes": 319001396
 }

testing/install_script.sh

@@ -1,20 +1,20 @@
 #!/bin/bash
-# Copyright (c) 2022 fithwum
+# Copyright (c) 2026 fithwum
 # All rights reserved
 
-MC_DIR_OLD=/MCserver
-MC_DIR=/mc_server
-
-if [ -d "$MC_DIR_OLD" ]; then
-    mkdir -p "$MC_DIR"
-    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
-fi
-
+MC_DIR=/mcserver
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
-VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
-MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
+MS_REPO=https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb
+SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/server.properties
+START_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/start.sh
+
+RUN_VANILLA=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-vanilla.sh
+RUN_BUKKIT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-bukkit.sh
+RUN_FABRIC=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-fabric.sh
+RUN_QUILT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-quilt.sh
+
 BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
 FABRIC_SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$FABRIC_INSTALLER_VERSION/server/jar
 QUILT_INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
@@ -22,70 +22,135 @@ FORGE_INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$
 NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar
 
 # Install java
-if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
+if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
+    echo "INFO ! $JAVA_VERSION Selected"
+	if [ dpkg -s openjdk-21-jre-headless &> /dev/null ]
 		then
-		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
+			echo "INFO ! $JAVA_VERSION installed ... moving on."
 		else
 			echo " "
-		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
+			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
 			apt-get update
-		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
+			apt-get --no-install-recommends -y install openjdk-21-jre-headless
+	fi
+elif [ $JAVA_VERSION = "openjdk-25-jre" ]; then
+    echo "INFO ! $JAVA_VERSION Selected"
+	if [ dpkg -s openjdk-25-jre-headless &> /dev/null ]
+		then
+			echo "INFO ! $JAVA_VERSION installed ... moving on."
+		else
+			echo " "
+			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
+			apt-get update
+			apt-get --no-install-recommends -y install openjdk-25-jre-headless
+	fi
+elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
+    echo "INFO ! $JAVA_VERSION Selected"
+	if [ dpkg -s msopenjdk-21 &> /dev/null ]
+		then
+			echo "INFO ! $JAVA_VERSION installed ... moving on."
+		else
+			echo " "
+			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
+			wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO -O packages-microsoft-prod.deb
+			dpkg -i packages-microsoft-prod.deb
+			apt-get update && apt-get install -y msopenjdk-21
+			apt-get -y update && apt-get -y --fix-broken install
+	fi
+elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
+    echo "INFO ! $JAVA_VERSION Selected"
+	if [ dpkg -s msopenjdk-25 &> /dev/null ]
+		then
+			echo "INFO ! $JAVA_VERSION installed ... moving on."
+		else
+			echo " "
+			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
+			wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO -O packages-microsoft-prod.deb
+			dpkg -i packages-microsoft-prod.deb
+			apt-get update && apt-get install -y msopenjdk-25
+			apt-get -y update && apt-get -y --fix-broken install
+	fi
+else
+	echo "ERROR ! Java version must be set first run"
+	sleep infinity
 fi
-
-# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
-# 	then
-# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
-# 	else
-# 		echo " "
-# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
-# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 		dpkg -i packages-microsoft-prod.deb \
-# 		apt-get update && apt-get install -y msopenjdk-25 \
-# 		apt-get -y update && apt-get -y --fix-broken install
-# fi
 
 # Main install (Debian).
 # Check for server files and download if needed.
-
-# WORKING
 if [ $MC_TYPE = "vanilla" ]; then
     echo "INFO ! Vanilla Selected"
-	if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ]
-		then
-			echo " "
-			echo "INFO ! mcserver-$MC_VERSION.jar found starting now."
-		else
-			echo " "
-			echo "WARNING ! mcserver-$MC_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			cd $MC_DIR
-			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
-			mv -v *.log old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O mcserver-$MC_VERSION.jar
-			chmod +x mcserver-$MC_VERSION.jar
-			echo " "
-			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
-			mv -v run-*.sh old-server-versions/
-			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
-			#!/bin/bash
-			# Copyright (c) 2022 fithwum
-			# All rights reserved
+	# Fallback to default channel type if MC_TYPE or MC_VERSION is empty
+	: "${MC_VERSION:=latest}"
+	echo "Using server type: $MC_TYPE"
 
-			cd /mc_server
-			JAR=./mcserver-*.jar
+	# Get the currently installed Minecraft version from the filesystem
+	CUR_VERSION=$(find "$MC_DIR" -name "installed-*" | cut -d - -f2-)
+	echo "Current local version: '${CUR_VERSION:-None}'"
 
-			while [ true ]; do
-				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
+	# Fetch the global Minecraft version manifest cleanly
+	JSON=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json")
+	# Validate that we actually received valid JSON
+	if [ -z "$JSON" ] || ! echo "$JSON" | jq . >/dev/null 2>&1; then
+		echo "Error: Failed to fetch valid JSON from Mojang API"
+		exit 1
 	fi
-			done
-			EOF
-			chmod +x run-$MC_TYPE-$MC_VERSION.sh
+
+	# Resolve the target version dynamically
+	if [ ! -z "$MC_VERSION" ] && [ "$MC_VERSION" != "latest" ]; then
+		# User specified an exact version string (e.g., 1.20.1)
+		TARGET_VERSION=$(echo "$JSON" | jq -r --arg version "$MC_VERSION" '.versions[] | select(.id == $version) | .id')
+		if [ -z "$TARGET_VERSION" ]; then
+			echo "Error: Specified version '$MC_VERSION' not found in Mojang API."
+			exit 1
+		fi
+	else
+		# No version specified or "latest" chosen. Pull from the latest release
+		TARGET_VERSION=$(echo "$JSON" | jq -r '.latest.release')
+	fi
+	echo "Target version determined: '$TARGET_VERSION'"
+	# Update variable to match resolved target
+	MC_VERSION=$TARGET_VERSION
+
+	# Compare versions and only update if they do NOT match
+	if [ "$CUR_VERSION" != "$TARGET_VERSION" ]; then
+		echo "Versions differ ($CUR_VERSION vs $TARGET_VERSION). Fetching Minecraft server download URL..."
+		# Extract the target sub-manifest URL for this specific Minecraft version
+		VERSION_CHECK=$(echo "$JSON" | jq -r --arg version "$TARGET_VERSION" '.versions[] | select(.id == $version) | .url')
+		if [ "$VERSION_CHECK" == "null" ] || [ -z "$VERSION_CHECK" ]; then
+			echo "Error: Metadata URL link not found for version $TARGET_VERSION"
+			exit 1
+		fi
+		# Fetch the specific version's metadata JSON and extract the server jar link
+		MC_SERVER_FILE=$(curl -s "$VERSION_CHECK" | jq -r '.downloads.server.url')
+		if [ "$MC_SERVER_FILE" == "null" ] || [ -z "$MC_SERVER_FILE" ]; then
+			echo "Error: Server jar download URL not found for version $TARGET_VERSION"
+			exit 1
+		fi
+		echo "Ready to download: $MC_SERVER_FILE"
+		# Process Vanilla Minecraft downloads
+		echo " "
+		echo "WARNING ! Minecraft server is out of date/missing ... will download now."
+		echo "INFO ! Cleaning old files."
+		cd "$MC_DIR" || exit 1
+		mkdir -pv old-server-versions/
+		# Wipe old dependencies cleanly
+		rm -fr *.jar libraries defaultconfigs user_jvm_args.txt run.bat
+		# Safely preserve old logs
+		[ -f *.log ] && mv *.log old-server-versions/
+		# Download and fix execution modes
+		wget --no-cache --show-progress --progress=bar:force:noscroll "$MC_SERVER_FILE" -O "mcserver-$MC_VERSION.jar"
+		chmod +x "mcserver-$MC_VERSION.jar"
+		echo " "
+		echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now."
+		[ -f run-*.sh ] && mv -v run-*.sh old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll "$RUN_VANILLA" -O "run-$MC_TYPE-$MC_VERSION.sh"
+		chmod +x "run-$MC_TYPE-$MC_VERSION.sh"
+		# Drop updated marker file
+		rm -f installed-*
+		touch installed-$MC_VERSION
 		cd ..
+	else
+		echo "No update required. Local version matches target version."
 	fi
 elif [ $MC_TYPE = "bukkit" ]; then
     echo "INFO ! Bukkit Selected"
@@ -100,29 +165,14 @@ elif [ $MC_TYPE = "bukkit" ]; then
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
 			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
+			rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
 			mv -v *.log old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $BUKKIT_INSTALLER_FILE -O craftbukkit-$MC_VERSION.jar
 			chmod +x craftbukkit-$MC_VERSION.jar
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
 			mv -v run-*.sh old-server-versions/
-			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
-			#!/bin/bash
-			# Copyright (c) 2022 fithwum
-			# All rights reserved
-
-			cd /mc_server
-			JAR=./craftbukkit-*.jar
-			
-			while [ true ]; do
-				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
-				fi
-			done
-			EOF
+			wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_BUKKIT -O run-$MC_TYPE-$MC_VERSION.sh
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
 			cd ..
 	fi
@@ -139,29 +189,14 @@ elif [ $MC_TYPE = "fabric" ]; then
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
 			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
+			rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
 			mv -v *.log old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $FABRIC_SERVER_FILE -O fabric-$MC_VERSION-$FABRIC_VERSION.jar
 			chmod +x fabric-$MC_VERSION-$FABRIC_VERSION.jar
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
 			mv -v run-*.sh old-server-versions/
-			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
-			#!/bin/bash
-			# Copyright (c) 2022 fithwum
-			# All rights reserved
-
-			cd /mc_server
-			JAR=./fabric-*-*.jar
-			
-			while [ true ]; do
-				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
-				fi
-			done
-			EOF
+			wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_FABRIC -O run-$MC_TYPE-$MC_VERSION.sh
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
 			cd ..
 	fi
@@ -178,8 +213,7 @@ elif [ $MC_TYPE = "quilt" ]; then
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
 			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
+			rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
 			mv -v *.log old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $QUILT_INSTALLER_FILE -O quilt-installer-$QUILT_VERSION.jar
 			chmod +x quilt-installer-$QUILT_VERSION.jar
@@ -191,26 +225,10 @@ elif [ $MC_TYPE = "quilt" ]; then
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
 			mv -v run-*.sh old-server-versions/
-			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
-			#!/bin/bash
-			# Copyright (c) 2022 fithwum
-			# All rights reserved
-			
-			cd /mc_server
-			JAR=./quilt-server-launch.jar
-			
-			while [ true ]; do
-				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
-				fi
-			done
-			EOF
+			wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_QUILT -O run-$MC_TYPE-$MC_VERSION.sh
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
 			cd ..
 	fi
-
-# NOT WORKING
 elif [ $MC_TYPE = "forge" ]; then
     echo "INFO ! Forge Selected"
 	if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]
@@ -224,8 +242,7 @@ elif [ $MC_TYPE = "forge" ]; then
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
 			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
+			rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
 			mv -v *.log old-server-versions/
 			mv -v run-*.sh old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $FORGE_INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
@@ -253,8 +270,7 @@ elif [ $MC_TYPE = "neoforged" ]; then
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
 			mkdir -pv old-server-versions/
-			rm -fr *.jar
-			rm -fr libraries
+			rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
 			mv -v *.log old-server-versions/
 			mv -v run-*.sh old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $NEOFORGED_INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar
@@ -274,6 +290,20 @@ else
     sleep infinity
 fi
 
+if [ -f $MC_DIR/server.properties ]; then
+    echo "INFO ! server.properties found ... moving on."
+else
+	echo "WARNING ! server.properties missing ... downloading default file."
+    wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_PROPERTIES -O $MC_DIR/server.properties
+fi
+
+echo "INFO ! Setting RCON settings."
+if [ -f $MC_DIR/server.properties ]; then
+	sed -i '/enable-rcon='*'/c\enable-rcon='$ENABLE_RCON'' $MC_DIR/server.properties
+	sed -i '/rcon.port='*'/c\rcon.port='$RCON_PORT'' $MC_DIR/server.properties
+	sed -i '/rcon.password='*'/c\rcon.password='$RCON_PASSWORD'' $MC_DIR/server.properties
+fi
+
 echo "INFO ! Setting game port."
 if [ -f $MC_DIR/server.properties ]; then
 	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
@@ -306,6 +336,15 @@ else
     sleep infinity
 fi
 
+# Download the start file for the screen session
+if [ -f $MC_DIR/start.sh ]; then
+    echo "INFO ! start.sh found ... moving on."
+else
+	echo "WARNING ! start.sh missing ... downloading default file."
+    wget --no-cache --show-progress --progress=bar:force:noscroll $START_FILE -O $MC_DIR/start.sh
+	chmod +x $MC_DIR/start.sh
+fi
+
 # Set permissions.
 chown 99:100 -R $MC_DIR
 chmod 776 -R $MC_DIR
@@ -316,6 +355,6 @@ sleep 1
 echo " "
 echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION"
 cd $MC_DIR
-exec ./run-$MC_TYPE-$MC_VERSION.sh
+exec ./start.sh
 
 exit

testing/run-bukkit.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+cd /mcserver
+JAR=./craftbukkit-*.jar
+
+while [ true ]; do
+	java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+	EXIT_CODE=$?
+	echo "Minecraft exited with code $EXIT_CODE"
+	[ "$EXIT_CODE" -eq 0 ] && break
+	echo "Restarting server in 5 seconds..."
+	sleep 5
+done

testing/run-fabric.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+cd /mcserver
+JAR=./fabric-*-*.jar
+
+while [ true ]; do
+	java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+	EXIT_CODE=$?
+	echo "Minecraft exited with code $EXIT_CODE"
+	[ "$EXIT_CODE" -eq 0 ] && break
+	echo "Restarting server in 5 seconds..."
+	sleep 5
+done

testing/run-quilt.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+cd /mcserver
+JAR=./quilt-server-launch.jar
+
+while [ true ]; do
+	java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+	EXIT_CODE=$?
+	echo "Minecraft exited with code $EXIT_CODE"
+    [ "$EXIT_CODE" -eq 0 ] && break
+	echo "Restarting server in 5 seconds..."
+	sleep 5
+done

testing/run-vanilla.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+cd /mcserver
+JAR=./mcserver-*.jar
+
+while [ true ]; do
+	java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+	EXIT_CODE=$?
+	echo "Minecraft exited with code $EXIT_CODE"
+	[ "$EXIT_CODE" -eq 0 ] && break
+	echo "Restarting server in 5 seconds..."
+	sleep 5
+done

testing/run.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2020 fithwum
-# All rights reserved
-
-cd /MCserver
-JAR=./MCserver-*.jar
-
-# Check if a screen session is already running
-if screen -list | grep -q "mcserver"; then
-  echo "INFO ! A screen session for the Minecraft server is already running."
-else
-  # Start the Minecraft server in a detached screen session
-  echo "INFO ! Starting Minecraft Server in a screen session."
-  screen -mS mcserver bash -c 'while true; do
-    java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
-    if [ $? -eq 0 ]; then
-      break
-    fi
-  done'
-fi

testing/server.properties

@@ -0,0 +1,44 @@
+#Minecraft server properties - for more information head over to: https://minecraft.gamepedia.com/Server.properties
+spawn-protection=16
+max-tick-time=60000
+query.port=25565
+generator-settings=
+force-gamemode=false
+allow-nether=true
+enforce-whitelist=false
+gamemode=survival
+broadcast-console-to-ops=true
+enable-query=false
+player-idle-timeout=0
+difficulty=easy
+broadcast-rcon-to-ops=true
+spawn-monsters=true
+op-permission-level=4
+pvp=true
+snooper-enabled=false
+level-type=default
+hardcore=false
+enable-command-block=false
+network-compression-threshold=256
+max-players=15
+max-world-size=29999984
+resource-pack-sha1=
+rcon.port=25575
+server-port=25565
+server-ip=
+spawn-npcs=true
+allow-flight=false
+level-name=world
+view-distance=10
+resource-pack=
+spawn-animals=true
+white-list=false
+rcon.password=Dockeradmin
+generate-structures=true
+online-mode=true
+max-build-height=256
+level-seed=
+prevent-proxy-connections=false
+use-native-transport=true
+motd=A Minecraft Server
+enable-rcon=false

testing/start.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+LOGFILE=/mcserver/logs/latest.log
+SESSION=mcserver
+
+cd /mcserver
+
+echo "INFO ! A screen session for the Minecraft server is already running."
+cleanup() {
+    echo "[INFO] Stopping Minecraft..."
+    screen -S "$SESSION" -X $SESSION "stop$(printf '\r')"
+    # Wait up to 60 seconds
+    for i in {1..60}; do
+        if ! screen -list | grep -q "$SESSION"; then
+            break
+        fi
+        sleep 1
+    done
+    # Kill it if it's still alive
+    screen -S "$SESSION" -X quit 2>/dev/null || true
+    exit 0
+}
+trap cleanup SIGINT SIGTERM
+
+# Start the Minecraft server in a detached screen session
+echo "INFO ! Starting Minecraft Server in a screen session."
+touch "$LOGFILE"
+screen -L -Logfile "$LOGFILE" -dmS "$SESSION" bash -c ./run-$MC_TYPE-$MC_VERSION.sh
+exec tail -F "$LOGFILE"

vanilla/CHANGES.md

@@ -1,5 +0,0 @@
-## 2026-07-19T21:33:28Z
-
-- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:b405854d9dbfb510af67cd8d949a488c86d05c3ac1890558c40a6bf993d82703 (fithwum)
-- files (fithwum)
-- Merge build-info updates (fithwum)

vanilla/Dockerfile

@@ -1,38 +0,0 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:trixie
-LABEL maintainer="fithwum"
-
-# Environment Variables
-ENV ACCEPT_EULA=""
-ENV GAME_PORT=""
-ENV MC_VERSION=""
-ENV JAVA_VERSION="25"
-ENV XMX_SIZE=""
-ENV XMS_SIZE=""
-ENV XMN_SIZE=""
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/vanilla/install_script.sh
-
-# Install Java & Dependencies.
-RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
-	&& apt-get -y --fix-broken install \
-	&& apt-get -y autoclean \
-	&& apt-get -y autoremove \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& update-ca-certificates -f;
-
-# Folder creation.
-RUN mkdir -p /mc_server /mc_temp \
-	&& chmod 777 -R /mc_server /mc_temp \
-	&& chown 99:100 -R /mc_server /mc_temp
-
-# Main script
-RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
-	&& chmod +x /mc_temp/install_script.sh
-
-# Directory where data is stored
-VOLUME /mc_server
-
-# Run command
-CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]

vanilla/build-info.json

@@ -1,9 +0,0 @@
-{
-  "version": "vanilla",
-  "commit": "733b859faaee0b909035a4f62b110ed1a98f56b2",
-  "build_time": "2026-07-19T21:34:06Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:vanilla",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:204298988edada2628aae17093ba1df131abb5aba2543cbe69743e2664edf40c",
-  "image_size": "302MB",
-  "image_size_bytes": 317396878
-}

vanilla/install_script.sh

@@ -1,121 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_DIR_OLD=/MCserver
-MC_DIR=/mc_server
-
-if [ -d "$MC_DIR_OLD" ]; then
-    mkdir -p "$MC_DIR"
-    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
-fi
-
-EULA_FILE=$MC_DIR/eula.txt
-EULA_MARKER=$MC_DIR/.eula_accepted
-
-VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
-MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
-
-# Install java
-if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
-	then
-		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
-	else
-		echo " "
-		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
-		apt-get update
-		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
-fi
-
-# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
-# 	then
-# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
-# 	else
-# 		echo " "
-# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
-# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 		dpkg -i packages-microsoft-prod.deb \
-# 		apt-get update && apt-get install -y msopenjdk-25 \
-# 		apt-get -y update && apt-get -y --fix-broken install
-# fi
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ] && [ -e "$MC_DIR/run-$MC_VERSION.sh" ]
-	then
-		echo " "
-		echo "INFO ! mcserver-$MC_VERSION.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! mcserver-$MC_VERSION.jar is out of date/missing ... will download now."
-		echo " "
-		echo "INFO ! Cleaning old files."
-		mkdir -p $MC_DIR/old-server-versions/
-		mv $MC_DIR/*.jar $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O $MC_DIR/mcserver-$MC_VERSION.jar
-		chmod +x $MC_DIR/mcserver-$MC_VERSION.jar
-		echo " "
-		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now."
-		mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		cat > $MC_DIR/run-$MC_VERSION.sh <<- "EOF"
-		#!/bin/bash
-		# Copyright (c) 2022 fithwum
-		# All rights reserved
-
-		cd /mc_server
-		JAR=./mcserver-*.jar
-
-		while [ true ]; do
-			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-			if [ $? -eq 0 ]; then
-				break
-			fi
-		done
-		EOF
-		chmod +x $MC_DIR/run-$MC_VERSION.sh
-fi
-
-echo "INFO ! Setting game port."
-if [ -f $MC_DIR/server.properties ]; then
-	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
-fi
-
-# Wait briefly for installer/server to generate eula.txt
-if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
-    echo "INFO ! Waiting for EULA generation..."
-    sleep 5
-fi
-
-# If EULA already accepted once, never touch it again
-if [ -f "$EULA_MARKER" ]; then
-    echo "INFO ! EULA previously accepted"
-    return 0 2>/dev/null || true
-fi
-
-# First-time decision
-if [ "$ACCEPT_EULA" = "true" ]; then
-    echo "INFO ! Accepting EULA (one-time)"
-    sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
-    || echo "eula=true" > "$EULA_FILE"
-    touch "$EULA_MARKER"
-elif [ "$ACCEPT_EULA" = "false" ]; then
-    echo "WARNING ! EULA not accepted on first run"
-    echo "WARNING ! Set ACCEPT_EULA=true to proceed"
-    sleep infinity
-else
-    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
-    sleep infinity
-fi
-
-# Set permissions.
-chown 99:100 -R $MC_DIR
-chmod 777 -R $MC_DIR
-
-sleep 1
-
-# Run Minecraft server.
-echo " "
-echo "INFO ! Starting Minecraft Server $MC_VERSION"
-exec $MC_DIR/run-$MC_VERSION.sh --dataPath=$MC_DIR
-
-exit