From 5c271422b36253f0edb5554326d1e79bc475dc6a Mon Sep 17 00:00:00 2001 From: cech12 Date: Mon, 16 Oct 2023 23:07:06 +0200 Subject: [PATCH] update and move back to Forge 1.20.2-48.0.23 (from NeoForge) until it is stable --- .github/workflows/cicd-workflow.yml | 6 ++---- CHANGELOG.md | 4 ++++ build.gradle | 4 ++-- gradle.properties | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 3 +-- settings.gradle | 4 ++-- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml index 11708b0..10841af 100644 --- a/.github/workflows/cicd-workflow.yml +++ b/.github/workflows/cicd-workflow.yml @@ -42,10 +42,9 @@ jobs: java-version: 17 curseforge-id: 363799 game-versions: | - 1.20.1 + 1.20.2 release-type: release loaders: | - neoforge forge secrets: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -59,10 +58,9 @@ jobs: java-version: 17 modrinth-id: M9G5zpf1 game-versions: | - 1.20.1 + 1.20.2 release-type: release loaders: | - neoforge forge secrets: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index f506422..874010c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/). +## [1.20.2-4.2.0.0] - 2023-10-16 +### Changed +- update and move back to Forge 1.20.2-48.0.23 (from NeoForge) until it is stable + ## [1.20.1-4.1.0.0] - 2023-08-09 ### Changed - Changed Forge to NeoForge 1.20.1-47.1.54 (compatible with Forge 47.1.0) diff --git a/build.gradle b/build.gradle index 4235adc..61bd249 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.gradle' version '[6.0,6.2)' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' } version = "${minecraft_version}-${mod_version}" @@ -104,7 +104,7 @@ repositories { } dependencies { - minecraft "net.neoforged:forge:${project.minecraft_version}-${project.forge_version}" + minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}" // compile against the BucketLib API but do not include it at runtime compileOnly fg.deobf("com.github.cech12:BucketLib:${project.bucketlib_version}:api") diff --git a/gradle.properties b/gradle.properties index 84af258..c148328 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false ## Environment Properties -minecraft_version=1.20.1 -minecraft_version_range=[1.20.1,1.21) -forge_version=47.1.54 -forge_version_range=[47.1.0,) -loader_version_range=[47,) +minecraft_version=1.20.2 +minecraft_version_range=[1.20.2,1.21) +forge_version=48.0.23 +forge_version_range=[48.0.23,) +loader_version_range=[48,) ## Mod Properties mod_id=ceramicbucket -mod_version=4.1.0.0 +mod_version=4.2.0.0 mod_group_id=cech12.ceramicbucket mod_name=Ceramic Bucket mod_authors=Cech12 @@ -22,5 +22,5 @@ mod_issue_tracker=https://github.com/cech12/CeramicBucket/issues mod_description=A mod which adds a Ceramic Bucket. #Bucket Lib -bucketlib_version=1.20.1-2.3.0.0 -bucketlib_version_range=[1.20.1-2.3.0.0,) +bucketlib_version=1.20.2-2.4.0.0 +bucketlib_version_range=[1.20.2-2.4.0.0,) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 46671ac..80187ac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 09a3d08..291d399 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,8 +2,8 @@ pluginManagement { repositories { gradlePluginPortal() maven { - name = 'NeoForge' - url = 'https://maven.neoforged.net' + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' } } }