diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2475a38..2e2e3f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,5 +36,4 @@ jobs: name: build-artifacts path: | src/fabric/build/libs/ - src/forge/build/libs/ src/neoforge/build/libs/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 60b9f6a..a556ead 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,17 +41,6 @@ jobs: curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }} - - name: Upload Forge assets to GitHub, Modrinth, and CurseForge - uses: Kir-Antipov/mc-publish@v3.3 - with: - name: "" - files: | - src/forge/build/libs/!(*-@(dev|shadow|sources|javadoc).jar) - src/forge/build/libs/*-@(dev|sources|javadoc).jar - modrinth-token: ${{ secrets.MODRINTH_TOKEN }} - curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} - github-token: ${{ secrets.GITHUB_TOKEN }} - - name: Upload NeoForge assets to GitHub, Modrinth, and CurseForge uses: Kir-Antipov/mc-publish@v3.3 with: diff --git a/gradle.properties b/gradle.properties index bb31c89..60cbb40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,26 +3,27 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Minecraft Properties -minecraft_version=1.19 -next_minecraft_version=1.19.3 -yarn_mappings=1.19+build.4 -yarn_mappings_patch_neoforge_version=1.20.5+build.4 +minecraft_version=1.21.2 +next_minecraft_version=1.21.3 +yarn_mappings=1.21.2+build.1 +yarn_mappings_patch_neoforge_version=1.21+build.4 +loom.ignoreDependencyLoomVersionValidation=true # Mod Properties mod_version=3.0.0 maven_group=dev.kir archives_name=cwb -enabled_platforms=fabric,forge,neoforge +enabled_platforms=fabric,neoforge java_version=21 # Loaders fabric_loader_version=0.15.0 -forge_version=1.19-41.1.0 -neoforge_version=20.5.21-beta +forge_version=1.21.3-53.0.2 +neoforge_version=21.2.1-beta # Dependencies -fabric_api_version=0.58.0+1.19 -sodium_version=1.21-0.6.0-beta.2 -cloth_config_version=7.0.72 -modmenu_version=4.0.0 -placeholder_api_version=2.4.1+1.21 +fabric_api_version=0.106.1+1.21.2 +sodium_version=1.21.2-0.6.0-beta.3 +cloth_config_version=16.0.141 +modmenu_version=12.0.0-beta.1 +placeholder_api_version=2.5.0+1.21.2 diff --git a/settings.gradle b/settings.gradle index 439b67d..ea7370d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,10 +12,8 @@ rootProject.name = "cubes-without-borders" include "common" include "fabric" -include "forge" include "neoforge" project(":common").projectDir = file("src/common") project(":fabric").projectDir = file("src/fabric") -project(":forge").projectDir = file("src/forge") project(":neoforge").projectDir = file("src/neoforge")