From 76f12e0cb86e6645520db0928e46db677f5688ea Mon Sep 17 00:00:00 2001
From: daoge_cmd <3523206925@qq.com>
Date: Wed, 18 Sep 2024 12:59:30 +0800
Subject: [PATCH] build: prepare for merging

---
 .github/workflows/gradle-build.yml                              | 2 +-
 .../bukkit/{build.gradle.kts.disabled => build.gradle.kts}      | 0
 .../common/{build.gradle.kts.disabled => build.gradle.kts}      | 0
 .../v1_20_R3/{build.gradle.kts.disabled => build.gradle.kts}    | 0
 platforms/cli/{build.gradle.kts.disabled => build.gradle.kts}   | 0
 .../fabric/{build.gradle.kts.disabled => build.gradle.kts}      | 0
 .../merged/{build.gradle.kts.disabled => build.gradle.kts}      | 0
 .../{build.gradle.kts.disabled => build.gradle.kts}             | 0
 .../{build.gradle.kts.disabled => build.gradle.kts}             | 0
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename platforms/bukkit/{build.gradle.kts.disabled => build.gradle.kts} (100%)
 rename platforms/bukkit/common/{build.gradle.kts.disabled => build.gradle.kts} (100%)
 rename platforms/bukkit/nms/v1_20_R3/{build.gradle.kts.disabled => build.gradle.kts} (100%)
 rename platforms/cli/{build.gradle.kts.disabled => build.gradle.kts} (100%)
 rename platforms/fabric/{build.gradle.kts.disabled => build.gradle.kts} (100%)
 rename platforms/merged/{build.gradle.kts.disabled => build.gradle.kts} (100%)
 rename platforms/mixin-common/{build.gradle.kts.disabled => build.gradle.kts} (100%)
 rename platforms/mixin-lifecycle/{build.gradle.kts.disabled => build.gradle.kts} (100%)

diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index 18fa0d7e42..746083e5c6 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -51,4 +51,4 @@ jobs:
         if: success() && contains(github.ref_name, 'allay')
         with:
           name: Terra-Allay
-          path: platforms/allay/build/libs/*.jar
+          path: platforms/allay/build/libs/*-shaded.jar
diff --git a/platforms/bukkit/build.gradle.kts.disabled b/platforms/bukkit/build.gradle.kts
similarity index 100%
rename from platforms/bukkit/build.gradle.kts.disabled
rename to platforms/bukkit/build.gradle.kts
diff --git a/platforms/bukkit/common/build.gradle.kts.disabled b/platforms/bukkit/common/build.gradle.kts
similarity index 100%
rename from platforms/bukkit/common/build.gradle.kts.disabled
rename to platforms/bukkit/common/build.gradle.kts
diff --git a/platforms/bukkit/nms/v1_20_R3/build.gradle.kts.disabled b/platforms/bukkit/nms/v1_20_R3/build.gradle.kts
similarity index 100%
rename from platforms/bukkit/nms/v1_20_R3/build.gradle.kts.disabled
rename to platforms/bukkit/nms/v1_20_R3/build.gradle.kts
diff --git a/platforms/cli/build.gradle.kts.disabled b/platforms/cli/build.gradle.kts
similarity index 100%
rename from platforms/cli/build.gradle.kts.disabled
rename to platforms/cli/build.gradle.kts
diff --git a/platforms/fabric/build.gradle.kts.disabled b/platforms/fabric/build.gradle.kts
similarity index 100%
rename from platforms/fabric/build.gradle.kts.disabled
rename to platforms/fabric/build.gradle.kts
diff --git a/platforms/merged/build.gradle.kts.disabled b/platforms/merged/build.gradle.kts
similarity index 100%
rename from platforms/merged/build.gradle.kts.disabled
rename to platforms/merged/build.gradle.kts
diff --git a/platforms/mixin-common/build.gradle.kts.disabled b/platforms/mixin-common/build.gradle.kts
similarity index 100%
rename from platforms/mixin-common/build.gradle.kts.disabled
rename to platforms/mixin-common/build.gradle.kts
diff --git a/platforms/mixin-lifecycle/build.gradle.kts.disabled b/platforms/mixin-lifecycle/build.gradle.kts
similarity index 100%
rename from platforms/mixin-lifecycle/build.gradle.kts.disabled
rename to platforms/mixin-lifecycle/build.gradle.kts