[ci skip] Misc updates

This commit is contained in:
Dreeam
2022-10-21 10:39:35 -04:00
committed by nostalgic853
parent 4e386ecd20
commit a94ef8c5be
4 changed files with 19 additions and 20 deletions

View File

@@ -8,7 +8,7 @@ env:
MC_VERSION: "1.19.2" MC_VERSION: "1.19.2"
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
steps: steps:
- name: Set env - name: Set env
run: | run: |
@@ -17,9 +17,9 @@ jobs:
echo "BUILD_NUMBER=$GITHUB_RUN_NUMBER" >> $GITHUB_ENV echo "BUILD_NUMBER=$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
export BUILD_NUMBER=${{ env.workflow }} export BUILD_NUMBER=${{ env.workflow }}
- name: Checkout Git Repository - name: Checkout Git Repository
uses: actions/checkout@v3.0.2 uses: actions/checkout@v3
- name: Validate Gradle Wrapper - name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1.0.4 uses: gradle/wrapper-validation-action@master
- name: Set up JDK - name: Set up JDK
uses: graalvm/setup-graalvm@v1 uses: graalvm/setup-graalvm@v1
with: with:

View File

@@ -4,37 +4,36 @@ plugins {
java java
`maven-publish` `maven-publish`
id("com.github.johnrengelman.shadow") version "7.1.2" apply false id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.3.8" id("io.papermc.paperweight.patcher") version "1.3.9-SNAPSHOT"
} }
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
repositories { repositories {
mavenCentral() mavenCentral()
maven("https://papermc.io/repo/repository/maven-public/") { maven(paperMavenPublicUrl) {
content { content { onlyForConfigurations(configurations.paperclip.name) }
onlyForConfigurations(PAPERCLIP_CONFIG)
}
} }
} }
dependencies { dependencies {
remapper("net.fabricmc:tiny-remapper:0.8.2:fat") remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
decompiler("net.minecraftforge:forgeflower:1.5.605.7") decompiler("org.quiltmc:quiltflower:1.8.1")
paperclip("io.papermc:paperclip:3.0.2") paperclip("io.papermc:paperclip:3.0.3-SNAPSHOT")
} }
subprojects { subprojects {
apply(plugin = "java") apply(plugin = "java")
apply(plugin = "maven-publish")
java { java {
toolchain { toolchain {
languageVersion.set(JavaLanguageVersion.of(17)) languageVersion.set(JavaLanguageVersion.of(17))
} }
} }
}
subprojects { tasks.withType<JavaCompile> {
tasks.withType<JavaCompile>().configureEach { options.encoding = Charsets.UTF_8.name()
options.encoding = "UTF-8"
options.release.set(17) options.release.set(17)
} }
@@ -48,14 +47,14 @@ subprojects {
repositories { repositories {
mavenCentral() mavenCentral()
maven(paperMavenPublicUrl)
maven("https://oss.sonatype.org/content/groups/public/") maven("https://oss.sonatype.org/content/groups/public/")
maven("https://papermc.io/repo/repository/maven-public/")
maven("https://ci.emc.gs/nexus/content/groups/aikar/") maven("https://ci.emc.gs/nexus/content/groups/aikar/")
maven("https://repo.aikar.co/content/groups/aikar") maven("https://repo.aikar.co/content/groups/aikar")
maven("https://repo.md-5.net/content/repositories/releases/") maven("https://repo.md-5.net/content/repositories/releases/")
maven("https://hub.spigotmc.org/nexus/content/groups/public/") maven("https://hub.spigotmc.org/nexus/content/groups/public/")
maven("https://jitpack.io") maven("https://jitpack.io")
maven("https://oss.sonatype.org/content/repositories/snapshots/") maven("https://repo.codemc.io/repository/maven-public/")
} }
} }
@@ -64,7 +63,7 @@ paperweight {
serverProject.set(project(":keyi-server")) serverProject.set(project(":keyi-server"))
remapRepo.set("https://maven.fabricmc.net/") remapRepo.set("https://maven.fabricmc.net/")
decompileRepo.set("https://files.minecraftforge.net/maven/") decompileRepo.set("https://maven.quiltmc.org/")
useStandardUpstream("purpur") { useStandardUpstream("purpur") {
url.set(github("PurpurMC", "Purpur")) url.set(github("PurpurMC", "Purpur"))

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@@ -3,7 +3,7 @@ import java.util.Locale
pluginManagement { pluginManagement {
repositories { repositories {
gradlePluginPortal() gradlePluginPortal()
maven("https://papermc.io/repo/repository/maven-public/") maven("https://repo.papermc.io/repository/maven-public/")
} }
} }