Gradle & Paperclip updates

This commit is contained in:
Kyle Wood 2021-06-14 23:17:16 -05:00
parent 6b738c8252
commit 847628bbea
2 changed files with 6 additions and 9 deletions

View file

@ -4,9 +4,6 @@ plugins {
id("io.papermc.paperweight.core") version "1.0.0-SNAPSHOT" id("io.papermc.paperweight.core") version "1.0.0-SNAPSHOT"
} }
val mcVersion = providers.gradleProperty("mcVersion")
val packageVersion = providers.gradleProperty("packageVersion")
subprojects { subprojects {
apply(plugin = "java") apply(plugin = "java")
@ -39,7 +36,7 @@ subprojects {
repositories { repositories {
mavenCentral() mavenCentral()
maven("https://wav.jfrog.io/artifactory/repo/") { // TODO replace with "https://papermc.io/repo/repository/maven-public/" once paperclip is deplyoed there maven("https://papermc.io/repo/repository/maven-public/") {
content { content {
onlyForConfigurations("paperclip") onlyForConfigurations("paperclip")
} }
@ -59,13 +56,13 @@ repositories {
dependencies { dependencies {
paramMappings("org.quiltmc:yarn:1.17+build.2:mergedv2") paramMappings("org.quiltmc:yarn:1.17+build.2:mergedv2")
remapper("org.quiltmc:tiny-remapper:0.4.1") remapper("org.quiltmc:tiny-remapper:0.4.1")
decompiler("net.minecraftforge:forgeflower:1.5.498.12@jar") decompiler("net.minecraftforge:forgeflower:1.5.498.12")
paperclip("io.papermc:paperclip:2.0.0-SNAPSHOT@jar") paperclip("io.papermc:paperclip:2.0.0@jar")
} }
paperweight { paperweight {
minecraftVersion.set(mcVersion) minecraftVersion.set(providers.gradleProperty("mcVersion"))
versionPackage.set(packageVersion) versionPackage.set(providers.gradleProperty("packageVersion"))
serverProject.set(project(":Paper-Server")) serverProject.set(project(":Paper-Server"))
paper { paper {

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.0.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists