[Draft] Port to 1.21.11, implement Inventory/Container Sync & fix bugs

.github/workflows/build.yml

@@ -0,0 +1,79 @@
+name: CI Build
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'img/**'
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'img/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'gradle'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew build --no-daemon --stacktrace
+
+      - name: Test
+        run: ./gradlew test --no-daemon --stacktrace || true
+
+      - name: List build artifacts
+        run: |
+          echo "=== Fabric artifacts ==="
+          find fabric/fabric-*/build/libs -name "*.jar" 2>/dev/null || echo "No Fabric artifacts found"
+          echo ""
+          echo "=== Paper artifacts ==="
+          find paper/paper-*/build/libs -name "*.jar" 2>/dev/null || echo "No Paper artifacts found"
+
+      - name: Upload Fabric artifacts
+        uses: actions/upload-artifact@v4
+        if: success()
+        with:
+          name: fabric-builds
+          path: |
+            fabric/fabric-*/build/libs/*.jar
+            !fabric/fabric-*/build/libs/*-dev.jar
+            !fabric/fabric-*/build/libs/*-sources.jar
+          retention-days: 7
+
+      - name: Upload Paper artifacts
+        uses: actions/upload-artifact@v4
+        if: success()
+        with:
+          name: paper-builds
+          path: |
+            paper/paper-*/build/libs/*.jar
+            !paper/paper-*/build/libs/*-dev.jar
+            !paper/paper-*/build/libs/*-sources.jar
+          retention-days: 7
+
+      - name: Check build reports
+        if: failure()
+        run: |
+          echo "Build failed. Checking for error reports..."
+          find . -name "*.log" -type f 2>/dev/null | head -20

.github/workflows/release.yml

@@ -0,0 +1,142 @@
+name: Build and Release
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version number (e.g., 1.2.3)'
+        required: false
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'gradle'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Extract version from tag or input
+        id: version
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ] && [ -n "${{ github.event.inputs.version }}" ]; then
+            VERSION="${{ github.event.inputs.version }}"
+          else
+            VERSION=${GITHUB_REF#refs/tags/v}
+          fi
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+          echo "Building version: $VERSION"
+
+      - name: Update version in gradle.properties
+        run: |
+          sed -i "s/^version=.*/version=${{ steps.version.outputs.VERSION }}/" gradle.properties
+          cat gradle.properties
+
+      - name: Build with Gradle
+        run: ./gradlew build --no-daemon --stacktrace
+
+      - name: List build artifacts
+        run: |
+          echo "=== Fabric artifacts ==="
+          find fabric/fabric-*/build/libs -name "*.jar" 2>/dev/null || echo "No Fabric artifacts found"
+          echo ""
+          echo "=== Paper artifacts ==="
+          find paper/paper-*/build/libs -name "*.jar" 2>/dev/null || echo "No Paper artifacts found"
+
+      - name: Prepare release artifacts
+        id: artifacts
+        run: |
+          mkdir -p release-artifacts
+
+          # Copy Fabric builds from subprojects
+          find fabric/fabric-*/build/libs -type f -name "*.jar" -not -name "*-dev.jar" -not -name "*-sources.jar" 2>/dev/null | while read jar; do
+            cp "$jar" release-artifacts/
+            echo "Copied: $(basename $jar)"
+          done
+
+          # Copy Paper builds from subprojects
+          find paper/paper-*/build/libs -type f -name "*.jar" -not -name "*-dev.jar" -not -name "*-sources.jar" 2>/dev/null | while read jar; do
+            cp "$jar" release-artifacts/
+            echo "Copied: $(basename $jar)"
+          done
+
+          echo ""
+          echo "=== Release artifacts ==="
+          ls -lh release-artifacts/ || echo "No artifacts prepared!"
+
+          # Generate artifact list for release notes
+          echo "ARTIFACTS<<EOF" >> $GITHUB_OUTPUT
+          ls -1 release-artifacts/ 2>/dev/null >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Generate changelog
+        id: changelog
+        run: |
+          if [ -f "CHANGELOG.md" ]; then
+            # Extract changelog for current version
+            sed -n "/^## \[*${{ steps.version.outputs.VERSION }}\]/,/^## \[/p" CHANGELOG.md | sed '$d' > current_changelog.txt
+            if [ -s current_changelog.txt ]; then
+              echo "CHANGELOG_CONTENT<<EOF" >> $GITHUB_OUTPUT
+              cat current_changelog.txt >> $GITHUB_OUTPUT
+              echo "EOF" >> $GITHUB_OUTPUT
+            else
+              echo "CHANGELOG_CONTENT=No changelog available for this version." >> $GITHUB_OUTPUT
+            fi
+          else
+            echo "CHANGELOG_CONTENT=No changelog file found." >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ github.event_name == 'workflow_dispatch' && format('v{0}', steps.version.outputs.VERSION) || github.ref_name }}
+          name: SpectatorPlus v${{ steps.version.outputs.VERSION }}
+          body: |
+            # SpectatorPlus v${{ steps.version.outputs.VERSION }}
+
+            ## What's Changed
+            ${{ steps.changelog.outputs.CHANGELOG_CONTENT }}
+
+            ## Downloads
+
+            ### Fabric
+            - For Minecraft 1.21.10: `spectatorplus-fabric-${{ steps.version.outputs.VERSION }}-mc1.21.10.jar`
+            - For Minecraft 1.21.11: `spectatorplus-fabric-${{ steps.version.outputs.VERSION }}-mc1.21.11.jar`
+
+            ### Paper
+            - For Paper servers: `spectatorplus-paper-${{ steps.version.outputs.VERSION }}.jar`
+
+            ---
+
+            **Full Changelog**: https://github.com/${{ github.repository }}/commits/v${{ steps.version.outputs.VERSION }}
+          files: release-artifacts/*
+          draft: false
+          prerelease: false
+          fail_on_unmatched_files: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: build-artifacts-${{ steps.version.outputs.VERSION }}
+          path: |
+            fabric/build/libs/*.jar
+            paper/build/libs/*.jar
+            !**/*-dev.jar
+            !**/*-sources.jar
+          retention-days: 30

.gitignore

@@ -3,6 +3,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+run
 
 ### IntelliJ IDEA ###
 .idea/
@@ -34,3 +35,5 @@ bin/
 
 ### Mac OS ###
 .DS_Store
+/SpectatorPlus_Structure_old.md
+/SpectatorPlus_Structure.md

CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 1.3.0 - 2026-02-07
+
+### Added
+- Added support for Minecraft 1.21.11.
+- GitHub Actions workflows for automated building and releasing
+  - CI build workflow for continuous integration
+  - Release workflow for automatic GitHub releases
+- Potion effect synchronization, allowing spectators to view the target player's potion effects.
+- Container synchronization in spectator mode, displaying the container currently opened by the target player (e.g., chests, furnace, etc.).
+- Cursor synchronization in spectator mode, displaying the hotbar slot and item currently selected by the target player (requires server-side installation and the target player to have the mod installed).
+- Player inventory synchronization in spectator mode, displaying the target player's full inventory (requires server-side installation).
+- Inventory screen state synchronization in spectator mode, reflecting when the target player opens or closes their inventory GUI (requires server-side installation and the target player to have the mod installed).
+
+### Fixed
+- Fixed an issue with view rotate calculations in spectator mode that caused incorrect arm positioning.
+- Fixed an issue where spectators would not correctly receive hotbar item updates from the target player.
+
+### Changed
+- Upgraded the project structure to a multi-module architecture to support building for multiple Minecraft versions.
+
+### Chores
+- Merged upstream changes regarding the update from 1.21.10 to 1.21.11.

fabric/build.gradle.kts

@@ -1,67 +1,15 @@
 plugins {
-    id("fabric-loom") version "1.9-SNAPSHOT"
-    id("spectatorplus.platform")
+    id("fabric-loom") version "1.14-SNAPSHOT" apply false
+    id("spectatorplus.platform") apply false
 }
 
-description = "A Fabric mod that improves spectator mode by showing the hotbar, health, and held item of the spectated player"
+subprojects {
+    apply(plugin = "java")
 
-repositories {
-    maven("https://maven.parchmentmc.org")
-    maven("https://oss.sonatype.org/content/repositories/snapshots")
-    maven("https://maven.shedaniel.me/")
-    maven("https://maven.terraformersmc.com/releases/")
-}
-
-loom {
-    splitEnvironmentSourceSets()
-
-    mods {
-        register("spectatorplus") {
-            sourceSet(sourceSets.getByName("main"))
-            sourceSet(sourceSets.getByName("client"))
-        }
-    }
-
-    accessWidenerPath = file("src/main/resources/spectatorplus.accesswidener")
-}
-
-dependencies {
-    minecraft("com.mojang:minecraft:${property("minecraft_version")}")
-    modImplementation("net.fabricmc:fabric-loader:${property("loader_version")}")
-    mappings(loom.layered {
-        officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-${property("parchment_minecraft_version")}:${property("parchment_version")}@zip")
-    })
-
-    modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
-
-    include(modImplementation("me.lucko:fabric-permissions-api:${property("fabric_permissions_api_version")}")!!)
-
-    modImplementation("me.shedaniel.cloth:cloth-config-fabric:${property("cloth_config_version")}") {
-        exclude("net.fabricmc.fabric-api")
-    }
-
-    modImplementation("com.terraformersmc:modmenu:${property("modmenu_version")}")
-}
-
-tasks {
-    processResources {
-        inputs.property("version", project.version)
-        filesMatching("fabric.mod.json") {
-            expand(
-                mapOf(
-                    "version" to project.version,
-                    "description" to project.description,
-                )
-            )
-        }
-    }
-
-    jar {
-        from("../LICENSE")
-    }
-
-    remapJar {
-        archiveVersion = getByName<Jar>("jar").archiveVersion
+    repositories {
+        maven("https://maven.parchmentmc.org")
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
+        maven("https://maven.shedaniel.me/")
+        maven("https://maven.terraformersmc.com/releases/")
     }
 }

fabric/fabric-1.21.10/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    id("fabric-loom")
+    id("spectatorplus.platform")
+}
+
+dependencies {
+    minecraft("com.mojang:minecraft:${property("minecraft_version")}")
+    mappings(loom.layered {
+        officialMojangMappings()
+        parchment("org.parchmentmc.data:parchment-${property("parchment_minecraft_version")}:${property("parchment_version")}@zip")
+    })
+    modImplementation("net.fabricmc:fabric-loader:${property("loader_version")}")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
+
+    implementation(project(":fabric:fabric-core"))
+}

fabric/fabric-1.21.10/gradle.properties

@@ -0,0 +1,13 @@
+minecraft_version=1.21.10
+yarn_mappings=1.21.10+build.1
+loader_version=0.17.2
+
+# Fabric API
+fabric_version=0.138.3+1.21.10
+
+parchment_minecraft_version=1.21.10
+parchment_version=2025.10.12
+
+fabric_permissions_api_version=0.4.0
+cloth_config_version=20.0.149
+modmenu_version=16.0.0-rc.1

fabric/fabric-1.21.11/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    id("fabric-loom")
+    id("spectatorplus.platform")
+}
+
+dependencies {
+    minecraft("com.mojang:minecraft:${property("minecraft_version")}")
+    mappings(loom.layered {
+        officialMojangMappings()
+        parchment("org.parchmentmc.data:parchment-${property("parchment_minecraft_version")}:${property("parchment_version")}@zip")
+    })
+    modImplementation("net.fabricmc:fabric-loader:${property("loader_version")}")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
+
+    implementation(project(":fabric:fabric-core"))
+}