diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0e1e805..9b97b0f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,41 +31,41 @@ jobs: uses: gradle/actions/setup-gradle@v3 - name: Build with Gradle run: ./gradlew build -# - name: Publish Forge to CurseForge and Modrinth -# uses: Kir-Antipov/mc-publish@v3.3 -# with: -# modrinth-id: 4sQDl6he -# modrinth-featured: true -# modrinth-unfeature-mode: intersection -# modrinth-token: ${{ secrets.MODRINTH_TOKEN }} -# -# curseforge-id: 658780 -# curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }} -# -# files: | -# forge/build/libs/!(*-@(dev|dev-shadow|sources|javadoc)).jar -# forge/build/libs/*-@(dev|dev-shadow|sources|javadoc).jar + - name: Publish Forge to CurseForge and Modrinth + uses: Kir-Antipov/mc-publish@v3.3 + with: + modrinth-id: 4sQDl6he + modrinth-featured: true + modrinth-unfeature-mode: intersection + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} -# name: "" -# version-type: release -# -# dependencies: | -# jei(optional){modrinth:jei}{curseforge:238222} -# rei(optional){modrinth:rei}{curseforge:310111} + curseforge-id: 658780 + curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }} -# loaders: | -# forge -# modrinth-game-versions: | -# 1.21 -# curseforge-game-versions: | -# 1.21 -# java: | -# 22 -# 21 -# -# retry-attempts: 2 -# retry-delay: 10000 -# fail-mode: fail + files: | + forge/build/libs/!(*-@(dev|dev-shadow|sources|javadoc)).jar + forge/build/libs/*-@(dev|dev-shadow|sources|javadoc).jar + + name: "" + version-type: release + + dependencies: | + jei(optional){modrinth:jei}{curseforge:238222} + rei(optional){modrinth:rei}{curseforge:310111} + + loaders: | + forge + modrinth-game-versions: | + 1.21.1 + curseforge-game-versions: | + 1.21.1 + java: | + 22 + 21 + + retry-attempts: 2 + retry-delay: 10000 + fail-mode: fail - name: Publish NeoForge to CurseForge and Modrinth uses: Kir-Antipov/mc-publish@v3.3 with: @@ -91,9 +91,9 @@ jobs: loaders: | neoforge modrinth-game-versions: | - 1.21 + 1.21.1 curseforge-game-versions: | - 1.21 + 1.21.1 java: | 22 21 @@ -127,9 +127,9 @@ jobs: loaders: | fabric modrinth-game-versions: | - >=1.21 + >=1.21.1 curseforge-game-versions: | - >=1.21 + >=1.21.1 java: | 22 21 @@ -163,9 +163,9 @@ jobs: # loaders: | # quilt # modrinth-game-versions: | -# >=1.21 +# >=1.21.1 # curseforge-game-versions: | -# >=1.21 +# >=1.21.1 # java: | # 22 # 21 diff --git a/LICENSE b/LICENSE index 5ecf7d6..e08e6ae 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 PanSzelescik +Copyright (c) 2022-2024 PanSzelescik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/gradle.properties b/gradle.properties index 6031aca..deba03c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,26 +1,26 @@ org.gradle.jvmargs=-Xmx8G -minecraft_version=1.21 +minecraft_version=1.21.1 //enabled_platforms=fabric,forge,neoforge,quilt enabled_platforms=fabric,forge,neoforge archives_base_name=colorize -mod_version=1.10.4 +mod_version=1.10.5 maven_group=pl.panszelescik.colorize //architectury_version=9.1.12 -fabric_loader_version=0.15.11 -fabric_api_version=0.100.8+1.21 +fabric_loader_version=0.16.3 +fabric_api_version=0.103.0+1.21.1 -forge_version=1.21-51.0.29 +forge_version=1.21.1-52.0.9 -neoforge_version=21.0.146 +neoforge_version=21.1.31 quilt_loader_version=0.26.3 -quilt_fabric_api_version=11.0.0-alpha.3+0.100.7-1.21 +quilt_fabric_api_version=11.0.0-alpha.3+0.102.0-1.21 -jei_minecraft_version=1.21 -jei_version=19.5.2.66 +jei_minecraft_version=1.21.1 +jei_version=19.11.0.130 loom.allowMismatchedPlatformVersion = true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2617362..707e499 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 932c0a3..c00546e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,7 @@ pluginManagement { include("common") include("fabric") -//include("forge") +include("forge") include("neoforged") //include("quilt")