diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68f7c50..2a0d4c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,11 +27,6 @@ jobs: chmod +x gradlew ./gradlew build - - name: Merge Fabric & Forge & NeoForge JARs - run: | - chmod +x gradlew - ./gradlew fusejars - - name: Upload fabric artifacts uses: actions/upload-artifact@v4 with: @@ -49,9 +44,3 @@ jobs: with: name: neoforge-artifacts path: ${{ github.workspace }}/neoforge/build/libs - - - name: Upload merged artifacts - uses: actions/upload-artifact@v4 - with: - name: merged-artifacts - path: ${{ github.workspace }}/build/merged/* diff --git a/build.gradle b/build.gradle index 85fc7a4..7cb5e5f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false - id "com.hypherionmc.modutils.modfusioner" version "1.0.+" id "com.github.johnrengelman.shadow" version "8.+" apply false } @@ -39,26 +38,4 @@ allprojects { java { withSourcesJar() } - - fusioner { - packageGroup = rootProject.maven_group - mergedJarName = "${rootProject.archives_base_name}" - outputDirectory = "build/merged" - jarVersion = rootProject.version - - forge { - projectName = "forge" - inputTaskName = "remapJar" - } - - neoforge { - projectName = "neoforge" - inputTaskName = "remapJar" - } - - fabric { - projectName = "fabric" - inputTaskName = "remapJar" - } - } } diff --git a/fabric/build.gradle b/fabric/build.gradle index ae7299f..f7e001b 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -20,22 +20,16 @@ configurations { } repositories { - maven { url "https://maven.terraformersmc.com/releases/" } - maven { url "https://maven.nucleoid.xyz/" } } dependencies { modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" - // Remove the next line if you don't want to depend on the API modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}" + modApi "me.shedaniel.cloth:cloth-config-fabric:${rootProject.clothconfig_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowBundle(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } - - modApi "me.shedaniel.cloth:cloth-config-fabric:${rootProject.clothconfig_version}" - modApi "com.terraformersmc:modmenu:${rootProject.modmenu_version}" - modApi "eu.pb4:placeholder-api:${rootProject.placeholder_api_version}" } processResources { diff --git a/fabric/src/main/java/com/wulian/chatimpressiveanimation/fabric/ModMenuCompat.java b/fabric/src/main/java/com/wulian/chatimpressiveanimation/fabric/ModMenuCompat.java deleted file mode 100644 index 370777b..0000000 --- a/fabric/src/main/java/com/wulian/chatimpressiveanimation/fabric/ModMenuCompat.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.wulian.chatimpressiveanimation.fabric; - -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; -import com.wulian.chatimpressiveanimation.config.ModConfigs; -import me.shedaniel.autoconfig.AutoConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -class ModMenuCompat implements ModMenuApi { - @Override - public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> AutoConfig.getConfigScreen(ModConfigs.class, parent).get(); - } -} - - diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 5121151..66aff47 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -17,10 +17,7 @@ "environment": "client", "entrypoints": { "client": [ - "com.wulian.chatimpressiveanimation.fabric.ChatImpressiveAnimationClientFabric" - ], - "modmenu": [ - "com.wulian.chatimpressiveanimation.fabric.ModMenuCompat" + "com.wulian.chatimpressiveanimation.fabric.ChatImpressiveAnimationClientFabric" ] }, "mixins": [ @@ -29,8 +26,7 @@ ], "depends": { "fabricloader": ">=0.15.0", - "minecraft": ">=1.20", - "architectury": "*", + "minecraft": "<1.20.4", "cloth-config": "*" } } diff --git a/gradle.properties b/gradle.properties index 197151e..5781be7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,12 +5,10 @@ enabled_platforms=fabric,forge,neoforge yarn_mappings=1.20.4+build.3 archives_base_name=ChatImpressiveAnimation -mod_version=1.1.0 +mod_version=1.2.0 maven_group=com.wulian.chatimpressiveanimation architectury_version=11.1.17 -modmenu_version=9.2.0 -placeholder_api_version=2.4.0-pre.1+1.20.4 clothconfig_version=13.0.138 fabric_loader_version=0.16.7 diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml index ec0e650..ba5068e 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -34,13 +34,6 @@ versionRange = "[1.20.3,1.20.4]" ordering = "NONE" side = "BOTH" -[[dependencies.chatimpressiveanimation]] -modId = "architectury" -type = "required" -versionRange = "*" -ordering = "AFTER" -side = "BOTH" - [[dependencies.chatimpressiveanimation]] modId = "cloth_config" type = "required" diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta index 85ca9ee..d947fe4 100644 --- a/neoforge/src/main/resources/pack.mcmeta +++ b/neoforge/src/main/resources/pack.mcmeta @@ -1,6 +1,7 @@ { "pack": { "description": "Chat Impressive Animation", - "pack_format": 15 + "pack_format": 22, + "supported_formats": [19, 22] } }