Reset to 1.18

This commit is contained in:
Cryptite
2022-02-27 09:30:51 -06:00
parent 34286527e1
commit 032462c78b

View File

@@ -3,8 +3,8 @@ import io.papermc.paperweight.util.constants.*
plugins { plugins {
java java
`maven-publish` `maven-publish`
id("com.github.johnrengelman.shadow") version "7.0.0" apply false id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.1.11" id("io.papermc.paperweight.patcher") version "1.3.4"
} }
repositories { repositories {
@@ -15,9 +15,9 @@ repositories {
} }
dependencies { dependencies {
remapper("org.quiltmc:tiny-remapper:0.4.3:fat") remapper("net.fabricmc:tiny-remapper:0.8.1:fat")
decompiler("net.minecraftforge:forgeflower:1.5.498.12") decompiler("net.minecraftforge:forgeflower:1.5.498.22")
paperclip("io.papermc:paperclip:2.0.1") paperclip("io.papermc:paperclip:3.0.2")
} }
allprojects { allprojects {
@@ -26,7 +26,7 @@ allprojects {
java { java {
toolchain { toolchain {
languageVersion.set(JavaLanguageVersion.of(16)) languageVersion.set(JavaLanguageVersion.of(17))
} }
} }
} }
@@ -34,7 +34,7 @@ allprojects {
subprojects { subprojects {
tasks.withType<JavaCompile> { tasks.withType<JavaCompile> {
options.encoding = Charsets.UTF_8.name() options.encoding = Charsets.UTF_8.name()
options.release.set(16) options.release.set(17)
} }
tasks.withType<Javadoc> { tasks.withType<Javadoc> {
options.encoding = Charsets.UTF_8.name() options.encoding = Charsets.UTF_8.name()
@@ -45,28 +45,23 @@ subprojects {
repositories { repositories {
mavenCentral() mavenCentral()
maven("https://oss.sonatype.org/content/groups/public/")
maven("https://papermc.io/repo/repository/maven-public/") maven("https://papermc.io/repo/repository/maven-public/")
maven("https://ci.emc.gs/nexus/content/groups/aikar/")
maven("https://repo.aikar.co/content/groups/aikar")
maven("https://repo.md-5.net/content/repositories/releases/")
maven("https://hub.spigotmc.org/nexus/content/groups/public/")
} }
} }
paperweight { paperweight {
serverProject.set(project(":Slice-Server")) serverProject.set(project(":slice-server"))
remapRepo.set("https://maven.quiltmc.org/repository/release/") remapRepo.set("https://maven.fabricmc.net/")
decompileRepo.set("https://files.minecraftforge.net/maven/") decompileRepo.set("https://files.minecraftforge.net/maven/")
usePaperUpstream(providers.gradleProperty("paperRef")) { usePaperUpstream(providers.gradleProperty("paperRef")) {
withPaperPatcher { withPaperPatcher {
apiPatchDir.set(layout.projectDirectory.dir("patches/api")) apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
apiOutputDir.set(layout.projectDirectory.dir("Slice-API")) apiOutputDir.set(layout.projectDirectory.dir("slice-api"))
serverPatchDir.set(layout.projectDirectory.dir("patches/server")) serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
serverOutputDir.set(layout.projectDirectory.dir("Slice-Server")) serverOutputDir.set(layout.projectDirectory.dir("slice-server"))
} }
} }
} }
@@ -76,16 +71,15 @@ paperweight {
// //
tasks.generateDevelopmentBundle { tasks.generateDevelopmentBundle {
apiCoordinates.set("com.lokamc.slice:slice-api") apiCoordinates.set("com.example.paperfork:slice-api")
mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi") mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
libraryRepositories.set( libraryRepositories.set(
listOf( listOf(
"https://repo.maven.apache.org/maven2/",
"https://libraries.minecraft.net/", "https://libraries.minecraft.net/",
"https://papermc.io/repo/repository/maven-public/",
"https://maven.quiltmc.org/repository/release/", "https://maven.quiltmc.org/repository/release/",
"https://repo.aikar.co/content/groups/aikar", "http://ysera.dyndns.org:8090/releases", // This should be a repo hosting your API (in this example, 'com.example.paperfork:slice-api')
"https://ci.emc.gs/nexus/content/groups/aikar/",
"https://papermc.io/repo/repository/maven-public/", // for paper-mojangapi
"https://ysera.dyndns.org:444/releases/"
) )
) )
} }
@@ -96,8 +90,8 @@ allprojects {
publishing { publishing {
repositories { repositories {
maven { maven {
name = "Ysera" name = "Slice"
url = uri("https://ysera.dyndns.org:444/releases") url = uri("http://ysera.dyndns.org:8090/releases")
// See Gradle docs for how to provide credentials to PasswordCredentials // See Gradle docs for how to provide credentials to PasswordCredentials
// https://docs.gradle.org/current/samples/sample_publishing_credentials.html // https://docs.gradle.org/current/samples/sample_publishing_credentials.html
credentials(PasswordCredentials::class) credentials(PasswordCredentials::class)