Skip to content

Commit

Permalink
prepare update part1
Browse files Browse the repository at this point in the history
  • Loading branch information
Wulian233 authored Jul 15, 2024
1 parent 30e51f3 commit 9a99da0
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 24 deletions.
23 changes: 17 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -27,20 +27,31 @@ jobs:
chmod +x gradlew
./gradlew build
- name: Merge Fabric & Forge & NeoForge JARs
run: |
chmod +x gradlew
./gradlew mergeJars
- name: Upload artifacts (fabric)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: fabric
path: ${{ github.workspace }}/fabric/build/libs

- name: Upload artifacts (forge)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: forge
path: ${{ github.workspace }}/forge/build/libs

- name: Upload artifacts (neoforge)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: neoforge
path: ${{ github.workspace }}/neoforge/build/libs

- name: Upload artifacts (Forgix merged jar)
uses: actions/upload-artifact@v4
with:
name: merged
path: ${{ github.workspace }}/build/libs/forgix
33 changes: 27 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
id "io.github.pacifistmc.forgix" version "1.+"
id "com.github.johnrengelman.shadow" version "8.+" apply false
}

architectury {
Expand All @@ -9,6 +11,7 @@ architectury {

subprojects {
apply plugin: "dev.architectury.loom"
apply plugin: "com.github.johnrengelman.shadow"

dependencies {
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
Expand All @@ -26,11 +29,6 @@ allprojects {
group = rootProject.maven_group

repositories {
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.
}

tasks.withType(JavaCompile) {
Expand All @@ -41,4 +39,27 @@ allprojects {
java {
withSourcesJar()
}

forgix {
group = rootProject.maven_group
mergedJarName = "${rootProject.archives_base_name}-${rootProject.version}.jar"
outputDir = "build/libs/forgix"

forge {
projectName = "forge"
jarLocation = "build/libs/${rootProject.archives_base_name}-forge-${rootProject.version}.jar"
}

fabric {
projectName = "fabric"
jarLocation = "build/libs/${rootProject.archives_base_name}-fabric-${rootProject.version}.jar"
}

custom {
projectName = "neoforge"
jarLocation = "build/libs/${rootProject.archives_base_name}-neoforge-${ rootProject.version }.jar"
}
}

mergeJars.dependsOn(build)
}
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
modApi "dev.architectury:architectury:${rootProject.architectury_version}"

compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.5"))
compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.0"))
}

publishing {
Expand Down
8 changes: 5 additions & 3 deletions fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@
"Wulian233, TexTrue"
],
"contact": {
"sources": "https://github.com/Wulian233/Chat-Impressive-Animation"
},
"homepage": "https://www.curseforge.com/minecraft/mc-mods/chat-impressive-animation",
"sources": "https://github.com/Wulian233/Chat-Impressive-Animation",
"issues": "https://github.com/Wulian233/Chat-Impressive-Animation/issues"
},
"license": "MIT",
"icon": "icon.png",
"environment": "client",
"entrypoints": {
"client": [
"com.wulian.chatimpressiveanimation.fabric.ChatImpressiveAnimationClientFabric"
]
]
},
"mixins": [
"chatimpressiveanimation.mixins.json",
Expand Down
2 changes: 1 addition & 1 deletion forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ logoFile = "icon.png"
[[dependencies.chatimpressiveanimation]]
modId = "minecraft"
mandatory = true
versionRange = "[1.19,)"
versionRange = "[1.20,1.20.4]"
ordering = "NONE"
side = "BOTH"

Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ archives_base_name=ChatImpressiveAnimation
mod_version=1.0
maven_group=com.wulian.chatimpressiveanimation

architectury_version=11.0.11
architectury_version=11.1.17

fabric_loader_version=0.15.6
fabric_api_version=0.95.4+1.20.4
fabric_loader_version=0.16.0
fabric_api_version=0.97.1+1.20.4

forge_version=1.20.4-49.0.30
forge_version=1.20.4-49.1.4

neoforge_version=20.4.160-beta
neoforge_version=20.4.237
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015-2024 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion neoforge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ config = "chatimpressiveanimation.neoforge.mixins.json"
[[dependencies.chatimpressiveanimation]]
modId = "minecraft"
type = "required"
versionRange = "[1.20.1,)"
versionRange = "[1.20.2,1.20.4]"
ordering = "NONE"
side = "BOTH"

Expand Down

0 comments on commit 9a99da0

Please sign in to comment.