From 694605ffb275fcea54c8469759b9a388f4ff0d79 Mon Sep 17 00:00:00 2001
From: NanaChiyo0721 <nanachiyo0721@163.com>
Date: Sun, 12 Jul 2026 15:10:57 +0800
Subject: [PATCH] Fall back to paperweight and paperclip

---
 build.gradle.kts                       |  2 +-
 camellia-server/build.gradle.kts.patch | 13 +------------
 gradle.properties                      |  4 ++--
 settings.gradle.kts                    |  4 ++--
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 45d5bcd..540bbde 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     java // TODO java launcher tasks
-    id("moe.monnairealms.irisweight.patcher")
+    id("io.papermc.paperweight.patcher")
 }
 
 paperweight {
diff --git a/camellia-server/build.gradle.kts.patch b/camellia-server/build.gradle.kts.patch
index 09aefe8..fb6a19d 100644
--- a/camellia-server/build.gradle.kts.patch
+++ b/camellia-server/build.gradle.kts.patch
@@ -1,12 +1,6 @@
 --- a/folia-server/build.gradle.kts
 +++ b/folia-server/build.gradle.kts
-@@ -7,15 +_,16 @@
-     `java-library`
-     `maven-publish`
-     idea
--    id("io.papermc.paperweight.core")
-+    id("moe.monnairealms.irisweight.core")
-     id("io.papermc.fill.gradle") version "1.0.12"
+@@ -12,6 +_,7 @@
  }
  
  val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
@@ -14,11 +8,6 @@
  
  dependencies {
      mache("io.papermc:mache:26.2+build.1")
--    paperclip("io.papermc:paperclip:3.0.4")
-+    irisclip("io.papermc:paperclip:3.0.4")
- }
- 
- paperweight {
 @@ -24,6 +_,7 @@
      gitFilePatches = false
  
diff --git a/gradle.properties b/gradle.properties
index 67fddf1..2ffbf74 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,8 +2,8 @@ group=moe.monnairealms.camellia
 mcVersion=26.2
 apiVersion=26.2
 channel=STABLE
-clipVersion=3.0.18
-weightVersion=2.0.0721
+clipVersion=3.0.4
+weightVersion=2.0.0-beta.21
 # true for release, false for skip release, pre for pre-release
 release=pre
 # true for push to repo, false for skip push repo, auto for detect by release value
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5f0c1db..168f051 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,8 +9,8 @@ pluginManagement {
     }
 
     plugins {
-        id("moe.monnairealms.irisweight.patcher") version weightVersion
-        id("moe.monnairealms.irisweight.core") version weightVersion
+        id("io.papermc.paperweight.patcher") version weightVersion
+        id("io.papermc.paperweight.core") version weightVersion
     }
 }