From 2d6dcf5071aa1465eb105ba15197f7117bafb8c2 Mon Sep 17 00:00:00 2001 From: TexTrue <65154269+TexBlock@users.noreply.github.com> Date: Fri, 23 Feb 2024 21:47:50 +0800 Subject: [PATCH] use modpublisher, clean --- .github/workflows/release.yml | 2 +- .../ho/artisan/azusaconfig/impl/config/AzusaConfigImpl.java | 6 +++--- fabric/build.gradle | 2 -- fabric/src/main/resources/fabric.mod.json | 1 - gradle.properties | 3 --- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 02d622b..be456d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: - uses: gradle/wrapper-validation-action@v1 - run: | chmod +x gradlew - ./gradlew build publishUnified --stacktrace -Porg.gradle.parallel.threads=4 + ./gradlew build publishMod --stacktrace -Porg.gradle.parallel.threads=4 env: CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/common/src/main/java/ho/artisan/azusaconfig/impl/config/AzusaConfigImpl.java b/common/src/main/java/ho/artisan/azusaconfig/impl/config/AzusaConfigImpl.java index 65a183d..8d1318a 100644 --- a/common/src/main/java/ho/artisan/azusaconfig/impl/config/AzusaConfigImpl.java +++ b/common/src/main/java/ho/artisan/azusaconfig/impl/config/AzusaConfigImpl.java @@ -31,7 +31,7 @@ public final class AzusaConfigImpl { private static ConfigEnvironment ENV; - private static final Path configDir = AzusaConfigExpectPlatform.getConfigDirectory(); + private static final Path CONFIG_DIR = AzusaConfigExpectPlatform.getConfigDirectory(); private static Logger LOGGER = AzusaConfigMod.LOGGER; private AzusaConfigImpl() { @@ -65,13 +65,13 @@ public static void init() { } if (defaultConfigExtension == null) { - ENV = new ConfigEnvironment(configDir, globalConfigExtension, serializers[0]); + ENV = new ConfigEnvironment(CONFIG_DIR, globalConfigExtension, serializers[0]); for (int i = 1; i < serializers.length; ++i) { ENV.registerSerializer(serializers[i]); } } else { - ENV = new ConfigEnvironment(configDir, globalConfigExtension, serializerMap.get(defaultConfigExtension)); + ENV = new ConfigEnvironment(CONFIG_DIR, globalConfigExtension, serializerMap.get(defaultConfigExtension)); for (Serializer serializer : serializers) { ENV.registerSerializer(serializer); diff --git a/fabric/build.gradle b/fabric/build.gradle index 9997f7e..6a6ca55 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -19,8 +19,6 @@ configurations { dependencies { modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" - modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" - modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}" include "org.quiltmc:quilt-config:${rootProject.quiltconfig_version}" include "org.quiltmc.parsers:json:${rootProject.quiltparsers_version}" diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 5aeedfc..2786a22 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -20,7 +20,6 @@ ] }, "depends": { - "fabric": "*", "minecraft": "1.20.x" } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index bf8c840..af3f9f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,10 +8,7 @@ archives_base_name=AzusaConfig mod_version=0.1.1 maven_group=ho.artisan.azusaconfig -architectury_version=9.1.12 - fabric_loader_version=0.15.2 -fabric_api_version=0.91.0+1.20.1 forge_version=1.20.1-47.2.20