From 639d6249c83348a0c1b36b27e45204a58c7337c0 Mon Sep 17 00:00:00 2001 From: R2turnTrue <46389044+R2turnTrue@users.noreply.github.com> Date: Sun, 12 Jun 2022 17:44:50 +0900 Subject: [PATCH 1/3] Kpaperweight & Paperclip Update --- build.gradle.kts | 7 +++++-- settings.gradle.kts | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9cccd5a..9281bb2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,11 @@ +import io.papermc.paperweight.tasks.CreatePaperclipJar + plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.2" apply false - id("io.papermc.paperweight.patcher") version "1.3.6" + //id("io.papermc.paperweight.patcher") version "1.3.6" + id("tech.norhu1130.kpaperweight.patcher") version "1.3.7-LOCAL-SNAPSHOT" } val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/" @@ -18,7 +21,7 @@ repositories { dependencies { remapper("net.fabricmc:tiny-remapper:0.8.2:fat") decompiler("net.minecraftforge:forgeflower:1.5.498.29") - paperclip("com.github.KPaperMC:Paperclip:1825ad41c4") + paperclip("com.github.KPaperMC:Paperclip:a53910c536") } allprojects { diff --git a/settings.gradle.kts b/settings.gradle.kts index aabdd3e..2498b6f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,8 @@ pluginManagement { repositories { gradlePluginPortal() - maven("https://papermc.io/repo/repository/maven-public/") + //maven("https://papermc.io/repo/repository/maven-public/") + mavenLocal() } } From 4730b7d5958af21f08bd9aec3d1ab40bb8c2863e Mon Sep 17 00:00:00 2001 From: R2turnTrue <46389044+R2turnTrue@users.noreply.github.com> Date: Sun, 12 Jun 2022 18:20:48 +0900 Subject: [PATCH 2/3] Jitpack --- build.gradle.kts | 15 ++++++++++++++- settings.gradle.kts | 3 ++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9281bb2..58e9e72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,9 +5,22 @@ plugins { `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.2" apply false //id("io.papermc.paperweight.patcher") version "1.3.6" - id("tech.norhu1130.kpaperweight.patcher") version "1.3.7-LOCAL-SNAPSHOT" + //id("tech.norhu1130.kpaperweight.patcher") version "1.3.7-LOCAL-SNAPSHOT" + //id("com.github.KPaperMC.paperweight.patcher") version "1.3.7-SNAPSHOT" } +buildscript { + repositories { + maven("https://jitpack.io") + } + + dependencies { + classpath("com.github.KPaperMC.paperweight:paperweight-patcher:1.3.7.1-SNAPSHOT") + } +} + +apply(plugin = "com.github.KPaperMC.paperweight.patcher") + val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/" repositories { diff --git a/settings.gradle.kts b/settings.gradle.kts index 2498b6f..0a97d6a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,7 +2,8 @@ pluginManagement { repositories { gradlePluginPortal() //maven("https://papermc.io/repo/repository/maven-public/") - mavenLocal() + //mavenLocal() + maven("https://jitpack.io") } } From 13654aa0f7fa641944010981e7a6202126134d7b Mon Sep 17 00:00:00 2001 From: R2turnTrue <46389044+R2turnTrue@users.noreply.github.com> Date: Sun, 12 Jun 2022 18:22:09 +0900 Subject: [PATCH 3/3] Revert "Jitpack" This reverts commit 4730b7d5958af21f08bd9aec3d1ab40bb8c2863e. --- build.gradle.kts | 15 +-------------- settings.gradle.kts | 3 +-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 58e9e72..9281bb2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,22 +5,9 @@ plugins { `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.2" apply false //id("io.papermc.paperweight.patcher") version "1.3.6" - //id("tech.norhu1130.kpaperweight.patcher") version "1.3.7-LOCAL-SNAPSHOT" - //id("com.github.KPaperMC.paperweight.patcher") version "1.3.7-SNAPSHOT" + id("tech.norhu1130.kpaperweight.patcher") version "1.3.7-LOCAL-SNAPSHOT" } -buildscript { - repositories { - maven("https://jitpack.io") - } - - dependencies { - classpath("com.github.KPaperMC.paperweight:paperweight-patcher:1.3.7.1-SNAPSHOT") - } -} - -apply(plugin = "com.github.KPaperMC.paperweight.patcher") - val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/" repositories { diff --git a/settings.gradle.kts b/settings.gradle.kts index 0a97d6a..2498b6f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,8 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() //maven("https://papermc.io/repo/repository/maven-public/") - //mavenLocal() - maven("https://jitpack.io") + mavenLocal() } }