Merge branch 'master' into dev

# Conflicts:
#	.github/workflows/publish.yml
This commit is contained in:
Nassim Jahnke 2024-03-22 20:55:44 +01:00
commit 51561d143c
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
6 changed files with 24 additions and 23 deletions

View File

@ -12,7 +12,7 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/wrapper-validation-action@v2
- name: Set up JDK 17
uses: actions/setup-java@v4
with:

View File

@ -13,7 +13,7 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/wrapper-validation-action@v2
- name: Set up JDK 17
uses: actions/setup-java@v4
with:

View File

@ -86,6 +86,9 @@ public class EnchantmentRewriter {
while (iterator.hasNext()) {
CompoundTag enchantmentEntry = iterator.next();
StringTag idTag = enchantmentEntry.getStringTag("id");
if (idTag == null) {
continue;
}
String enchantmentId = idTag.getValue();
String remappedName = enchantmentMappings.get(enchantmentId);

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View File

@ -1,7 +1,5 @@
import io.papermc.hangarpublishplugin.model.Platforms
plugins {
id("io.papermc.hangar-publish-plugin") version "0.1.0"
id("io.papermc.hangar-publish-plugin") version "0.1.2"
id("com.modrinth.minotaur") version "2.+"
}
@ -65,36 +63,36 @@ if (!isRelease || isMainBranch) { // Only publish releases from the main branch
hangarPublish {
publications.register("plugin") {
version.set(suffixedVersion)
id.set("ViaBackwards")
channel.set(if (isRelease) "Release" else if (isMainBranch) "Snapshot" else "Alpha")
changelog.set(changelogContent)
apiKey.set(System.getenv("HANGAR_TOKEN"))
version = suffixedVersion
id = "ViaBackwards"
channel = if (isRelease) "Release" else if (isMainBranch) "Snapshot" else "Alpha"
changelog = changelogContent
apiKey = System.getenv("HANGAR_TOKEN")
platforms {
register(Platforms.PAPER) {
jar.set(tasks.shadowJar.flatMap { it.archiveFile })
platformVersions.set(listOf(property("mcVersionRange") as String))
paper {
jar = tasks.shadowJar.flatMap { it.archiveFile }
platformVersions = listOf(property("mcVersionRange") as String)
dependencies {
hangar("ViaVersion") {
required.set(true)
required = true
}
}
}
register(Platforms.VELOCITY) {
jar.set(tasks.shadowJar.flatMap { it.archiveFile })
platformVersions.set(listOf(property("velocityVersion") as String))
velocity {
jar = tasks.shadowJar.flatMap { it.archiveFile }
platformVersions = listOf(property("velocityVersion") as String)
dependencies {
hangar("ViaVersion") {
required.set(true)
required = true
}
}
}
register(Platforms.WATERFALL) {
jar.set(tasks.shadowJar.flatMap { it.archiveFile })
platformVersions.set(listOf(property("waterfallVersion") as String))
waterfall {
jar = tasks.shadowJar.flatMap { it.archiveFile }
platformVersions = listOf(property("waterfallVersion") as String)
dependencies {
hangar("ViaVersion") {
required.set(true)
required = true
}
}
}