Merge branch 'rtm516:master' into master

Author: howard12721

.github/workflows/pullrequest.yml

@@ -0,0 +1,45 @@
+name: Build Pull Request
+
+on: 
+  pull_request:
+    paths-ignore:
+      - '.gitignore'
+      - 'egg-m-c-xbox-broadcast.json'
+      - 'LICENSE'
+      - 'README.md'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: temurin
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: temurin
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build
+          gradle-home-cache-cleanup: true
+      - uses: actions/upload-artifact@v3
+        if: success()
+        with:
+          name: MCXboxBroadcastExtension
+          path: bootstrap/geyser/build/libs/MCXboxBroadcastExtension.jar
+          if-no-files-found: error
+      - uses: actions/upload-artifact@v3
+        if: success()
+        with:
+          name: MCXboxBroadcastStandalone
+          path: bootstrap/standalone/build/libs/MCXboxBroadcastStandalone.jar
+          if-no-files-found: error

.github/workflows/release.yml

@@ -0,0 +1,79 @@
+name: Build Release
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "master"
+    paths-ignore:
+      - '.gitignore'
+      - 'LICENSE'
+      - 'README.md'
+
+jobs:
+    build:
+      runs-on: ubuntu-latest
+      steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: temurin
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build
+          gradle-home-cache-cleanup: true
+      - uses: actions/upload-artifact@v3
+        if: success()
+        with:
+          name: MCXboxBroadcastExtension
+          path: bootstrap/geyser/build/libs/MCXboxBroadcastExtension.jar
+          if-no-files-found: error
+      - uses: actions/upload-artifact@v3
+        if: success()
+        with:
+          name: MCXboxBroadcastStandalone
+          path: bootstrap/standalone/build/libs/MCXboxBroadcastStandalone.jar
+          if-no-files-found: error
+      - name: Get previous build number
+        id: getPreviousBuild
+        run: | 
+          PREVIOUS_TAG=$(git for-each-ref --sort=-version:refname --count 1 --format="%(refname:short)" "refs/tags/*")
+          echo result=${PREVIOUS_TAG} >> $GITHUB_OUTPUT
+      - name: Get current build number
+        id: getCurrentBuild
+        if: success()
+        env:
+          PREVIOUS_BUILD: ${{ steps.getPreviousBuild.outputs.result }}
+        run: echo result=$((++PREVIOUS_BUILD)) >> $GITHUB_OUTPUT
+      - name: Bump version and push tag
+        id: tag_version
+        uses: mathieudutour/github-tag-action@v6.1
+        if: success()
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          tag_prefix: ''
+          custom_tag: ${{ steps.getCurrentBuild.outputs.result }}
+      - name: Generate release diff
+        if: success()
+        env:
+          BEGIN_COMMIT: ${{ steps.getPreviousBuild.outputs.result }}
+          END_COMMIT: ${{ steps.getCurrentBuild.outputs.result }}
+        run: git fetch --tags --force && git log --pretty=format:"* %s (%h)" ${BEGIN_COMMIT}..${END_COMMIT} > release_notes.md
+      - name: Create release
+        uses: ncipollo/release-action@v1
+        if: success()
+        with:
+          artifacts: "bootstrap/geyser/build/libs/MCXboxBroadcastExtension.jar,bootstrap/standalone/build/libs/MCXboxBroadcastStandalone.jar,egg-m-c-xbox-broadcast.json"
+          allowUpdates: true
+          bodyFile: "release_notes.md"
+          draft: false
+          prerelease: false
+          name: Build ${{ steps.getCurrentBuild.outputs.result }} (${{ github.ref_name }})
+          tag: ${{ steps.getCurrentBuild.outputs.result }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,6 +1,6 @@
 
-# Created by https://www.toptal.com/developers/gitignore/api/git,java,maven,eclipse,netbeans,jetbrains+all,visualstudiocode
-# Edit at https://www.toptal.com/developers/gitignore?templates=git,java,maven,eclipse,netbeans,jetbrains+all,visualstudiocode
+# Created by https://www.toptal.com/developers/gitignore/api/git,java,gradle,eclipse,netbeans,jetbrains+all,visualstudiocode
+# Edit at https://www.toptal.com/developers/gitignore?templates=git,java,gradle,eclipse,netbeans,jetbrains+all,visualstudiocode
 
 ### Eclipse ###
 .metadata
@@ -197,25 +197,6 @@ fabric.properties
 !.idea/codeStyles
 !.idea/runConfigurations
 
-### Maven ###
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-# https://github.com/takari/maven-wrapper#usage-without-binary-jar
-.mvn/wrapper/maven-wrapper.jar
-
-# Eclipse m2e generated files
-# Eclipse Core
-.project
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
 ### NetBeans ###
 **/nbproject/private/
 **/nbproject/Makefile-*.mk
@@ -245,9 +226,33 @@ nbdist/
 .history
 .ionide
 
-# Support for Project snippet scope
+### Gradle ###
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+### Gradle Patch ###
+# Java heap dump
+*.hprof
 
-# End of https://www.toptal.com/developers/gitignore/api/git,java,maven,eclipse,netbeans,jetbrains+all,visualstudiocode
+# End of https://www.toptal.com/developers/gitignore/api/git,java,gradle,eclipse,netbeans,jetbrains+all,visualstudiocode
 
-cache/
-/config.yml
+run/

Jenkinsfile

@@ -2,7 +2,7 @@
 [![forthebadge made-with-java](https://forthebadge.com/images/badges/made-with-java.svg)](https://java.com/)
 
 [![License: GPL-3.0](https://img.shields.io/github/license/rtm516/MCXboxBroadcast)](LICENSE)
-[![Build Status](https://ci.rtm516.co.uk/job/MCXboxBroadcast/job/master/badge/icon)](https://ci.rtm516.co.uk/job/MCXboxBroadcast/job/master/)
+[![Build Release](https://github.com/rtm516/MCXboxBroadcast/actions/workflows/release.yml/badge.svg)](https://github.com/rtm516/MCXboxBroadcast/releases)
 [![HitCount](https://hits.dwyl.com/rtm516/MCXboxBroadcast.svg?style=flat)](http://hits.dwyl.com/rtm516/MCXboxBroadcast)
 
 A simple [Geyser](https://github.com/GeyserMC/Geyser) extension that broadcasts the server over Xbox Live.

README.md

@@ -0,0 +1,20 @@
+plugins {
+    id("com.rtm516.mcxboxbroadcast.shadow-conventions")
+}
+
+relocate("org.yaml.snakeyaml")
+relocate("com.fasterxml.jackson")
+
+dependencies {
+    api(project(":core"))
+    api(libs.bundles.jackson.yaml)
+    compileOnly(libs.bundles.geyser)
+    compileOnly(libs.floodgate.spigot) {
+        exclude("dev.folia")
+        exclude("com.mojang")
+    }
+}
+
+nameJar("MCXboxBroadcastExtension")
+
+description = "bootstrap-geyser"