Skip to content

Commit

Permalink
feat: 1.21 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Apehum committed Jul 19, 2024
1 parent d190a08 commit 8deeb92
Show file tree
Hide file tree
Showing 43 changed files with 379 additions and 1,369 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/publish-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file
distribution: temurin
java-version: |
8
16
17
21
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
Expand Down
23 changes: 15 additions & 8 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file
distribution: temurin
java-version: |
8
16
17
21
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
Expand All @@ -31,12 +33,17 @@ jobs:
- name: Publish to Modrinth
uses: Apehum/mc-publish@v1.1
with:
name: 'pv-addon-replaymod'
split-releases: true
files-primary: build/libs/*.jar
version-resolver: 'exact'

changelog-file: client/changelog.md

modrinth-unfeature-mode: 'subset'
modrinth-id: 4iTfB0AP
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

files-primary: build/libs/!(*-@(dev|sources|javadoc)).jar
files-secondary: ""

- name: Publish to GitHub
uses: Apehum/mc-publish@v1.1
with:
Expand Down
141 changes: 0 additions & 141 deletions build.gradle

This file was deleted.

9 changes: 9 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
plugins {
kotlin("jvm") version libs.versions.kotlin.get()
id("com.github.johnrengelman.shadow") version libs.versions.shadow.get() apply false
id("gg.essential.multi-version.root") apply false
}

tasks.jar {
enabled = false
}
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- 1.21 support
28 changes: 3 additions & 25 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
org.gradle.jvmargs=-Xmx4G

java_version=8

minecraft_dependency=>=1.16
minecraft_version=1.20.1
loader_version=0.15.6

fabric_version=0.91.0+1.20.1
version=2.0.1

pv_dependency=2.0.7
pv_version=2.0.0+ALPHA

replaymod_dependency=1.16.4-2.6.9

mod_name=Replay Voice Chat
mod_version=1.16+-2.0.1
maven_group=su.plo.replayvoicechat
archives_base_name=pv-addon-replaymod

minecraft_display_version=1.16+
release_type=beta
curse_id=605799
curse_supported_versions=1.16,1.16.1,1.16.2.1.16.3,1.16.4,1.16.5,1.17,1.17.1,1.18,1.18.1,1.18.2,Java 8, Java 11,Java 16,Java 17,Java 18
modrinth_id=yI6ANuOK
modrinth_supported_version=1.16,1.16.1,1.16.2.1.16.3,1.16.4,1.16.5,1.17,1.17.1,1.18,1.18.1,1.18.2
org.gradle.jvmargs=-Xmx4G
kotlin.stdlib.default.dependency=false
10 changes: 10 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[versions]
kotlin = "1.9.23"
shadow = "8.1.1"

plasmovoice = "2.0.3"
lombok = "1.18.30"

[libraries]
plasmovoice = { module = "su.plo.voice.api:client", version.ref = "plasmovoice" }
lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
1 change: 0 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@ Both Fabric and Forge are supported. The same add-on file works on both platform
## Credits

- [Replay Voice Chat](https://github.com/henkelmax/replay-voice-chat)
- [Sonic](https://github.com/waywardgeek/sonic)
- [ReplayMod](https://github.com/ReplayMod/ReplayMod)
Loading

0 comments on commit 8deeb92

Please sign in to comment.