Skip to content

Commit

Permalink
1.2 update
Browse files Browse the repository at this point in the history
  • Loading branch information
Wulian233 authored Oct 26, 2024
1 parent aeefb90 commit d41e218
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 76 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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/*
23 changes: 0 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
}

Expand Down Expand Up @@ -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"
}
}
}
8 changes: 1 addition & 7 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

This file was deleted.

8 changes: 2 additions & 6 deletions fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -29,8 +26,7 @@
],
"depends": {
"fabricloader": ">=0.15.0",
"minecraft": ">=1.20",
"architectury": "*",
"minecraft": "<1.20.4",
"cloth-config": "*"
}
}
4 changes: 1 addition & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions neoforge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion neoforge/src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"pack": {
"description": "Chat Impressive Animation",
"pack_format": 15
"pack_format": 22,
"supported_formats": [19, 22]
}
}

0 comments on commit d41e218

Please sign in to comment.