diff --git a/.github/workflows/manager.yml b/.github/workflows/manager.yml index 955727d..fa95448 100644 --- a/.github/workflows/manager.yml +++ b/.github/workflows/manager.yml @@ -15,6 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Repository Dispatch + if: ${{ github.repository == 'MCXboxBroadcast/Broadcaster' && github.ref_name == 'master' }} uses: peter-evans/repository-dispatch@v3 with: token: ${{ secrets.TRIGGER_PAT }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6dc117..9bfa547 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,20 +62,20 @@ jobs: - name: Bump version and push tag id: tag_version uses: mathieudutour/github-tag-action@v6.2 - if: success() + if: ${{ success() && github.ref_name == 'master' }} with: github_token: ${{ secrets.GITHUB_TOKEN }} tag_prefix: '' custom_tag: ${{ steps.getCurrentBuild.outputs.result }} - name: Generate release diff - if: success() + if: ${{ success() && github.ref_name == 'master' }} 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() + if: ${{ success() && github.ref_name == 'master' }} with: artifacts: "bootstrap/geyser/build/libs/MCXboxBroadcastExtension.jar,bootstrap/standalone/build/libs/MCXboxBroadcastStandalone.jar,egg-m-c-xbox-broadcast.json" allowUpdates: true diff --git a/core/src/main/java/com/rtm516/mcxboxbroadcast/core/webrtc/SctpAssociationListener.java b/core/src/main/java/com/rtm516/mcxboxbroadcast/core/webrtc/SctpAssociationListener.java index 090bec7..01d933e 100644 --- a/core/src/main/java/com/rtm516/mcxboxbroadcast/core/webrtc/SctpAssociationListener.java +++ b/core/src/main/java/com/rtm516/mcxboxbroadcast/core/webrtc/SctpAssociationListener.java @@ -2,7 +2,7 @@ import com.rtm516.mcxboxbroadcast.core.Logger; import com.rtm516.mcxboxbroadcast.core.SessionInfo; -import org.cloudburstmc.protocol.bedrock.codec.v712.Bedrock_v712; +import org.cloudburstmc.protocol.bedrock.codec.v729.Bedrock_v729; import pe.pi.sctp4j.sctp.Association; import pe.pi.sctp4j.sctp.AssociationListener; import pe.pi.sctp4j.sctp.SCTPStream; @@ -36,7 +36,7 @@ public void onDCEPStream(SCTPStream sctpStream, String label, int i) { logger.debug("Received DCEP SCTP stream: " + sctpStream.toString()); if ("ReliableDataChannel".equals(label)) { - sctpStream.setSCTPStreamListener(new MinecraftDataHandler(sctpStream, Bedrock_v712.CODEC, sessionInfo, logger)); + sctpStream.setSCTPStreamListener(new MinecraftDataHandler(sctpStream, Bedrock_v729.CODEC, sessionInfo, logger)); } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c043678..cee3f67 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -protocol = "3.0.0.Beta3-20240814.133201-7" +protocol = "3.0.0.Beta5-20240916.181041-6" geyser ="2.4.1-SNAPSHOT" jackson = "2.14.0" java-websocket = "1.5.3" @@ -12,7 +12,7 @@ minecraftauth = "4.1.1-20240822.193417-8" gson = "2.11.0" ice4j = "15836a645f" bouncycastle = "1.78.1" -sctp4j = "c0c23cd1c8" +sctp4j = "de0117f737" shadow = "8.3.0" indra = "3.1.3"