refinedmods · raoulvdberge · Jun 29, 2024 · Jun 15, 2024 · Jun 29, 2024 · Jun 29, 2024
diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml
@@ -5,11 +5,11 @@ runs:
   steps:
     - name: Validate Gradle wrapper
       uses: gradle/wrapper-validation-action@v1
-    - name: Setup JDK 17
+    - name: Setup JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
         cache: 'gradle'
     - name: Make Gradle wrapper executable
       if: ${{ runner.os != 'Windows' }}

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -29,6 +29,10 @@ on:
         required: false
         type: boolean
         default: true
+      gametests:
+        required: false
+        type: boolean
+        default: false
 jobs:
   extract-version-number:
     name: Extract version number
@@ -77,6 +81,7 @@ jobs:
       version: ${{ needs.extract-version-number.outputs.version }}
       mutation-testing: ${{ inputs.mutation-testing }}
       sonarqube: ${{ inputs.sonarqube }}
+      gametests: ${{ inputs.gametests }}
     secrets: inherit
 
   publish-maven:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.14.0] - 2024-06-29
+
+### Changed
+
+-   Ported to Minecraft 1.21.
+
 ## [0.13.4] - 2024-06-15
 
 ### Fixed
@@ -247,7 +253,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   Gradle helpers for Fabric and Forge projects.
 -   CI workflows.
 
-[Unreleased]: https://github.com/refinedmods/refinedarchitect/compare/v0.13.4...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedarchitect/compare/v0.14.0...HEAD
+
+[0.14.0]: https://github.com/refinedmods/refinedarchitect/compare/v0.13.4...v0.14.0
 
 [0.13.4]: https://github.com/refinedmods/refinedarchitect/compare/v0.13.3...v0.13.4
 

diff --git a/config/intellij-code-style.xml b/config/intellij-code-style.xml
@@ -0,0 +1,66 @@
+<code_scheme name="Refined Mods" version="173">
+  <JavaCodeStyleSettings>
+    <option name="GENERATE_FINAL_LOCALS" value="true" />
+    <option name="GENERATE_FINAL_PARAMETERS" value="true" />
+    <option name="SPACE_INSIDE_ONE_LINE_ENUM_BRACES" value="true" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="com.refinedmods" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="java" withSubpackages="true" static="false" />
+        <package name="javax" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+      </value>
+    </option>
+  </JavaCodeStyleSettings>
+  <ScalaCodeStyleSettings>
+    <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+  </ScalaCodeStyleSettings>
+  <codeStyleSettings language="Cookie">
+    <indentOptions>
+      <option name="USE_TAB_CHARACTER" value="false" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JAVA">
+    <option name="RIGHT_MARGIN" value="120" />
+    <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
+    <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="RESOURCE_LIST_WRAP" value="1" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="THROWS_LIST_WRAP" value="1" />
+    <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+    <option name="THROWS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="BINARY_OPERATION_WRAP" value="1" />
+    <option name="TERNARY_OPERATION_WRAP" value="1" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+    <option name="ASSIGNMENT_WRAP" value="1" />
+    <option name="ASSERT_STATEMENT_WRAP" value="1" />
+    <option name="IF_BRACE_FORCE" value="3" />
+    <option name="DOWHILE_BRACE_FORCE" value="3" />
+    <option name="WHILE_BRACE_FORCE" value="3" />
+    <option name="FOR_BRACE_FORCE" value="3" />
+    <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
+    <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+    <option name="ENUM_CONSTANTS_WRAP" value="1" />
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="NBTT">
+    <indentOptions>
+      <option name="USE_TAB_CHARACTER" value="false" />
+    </indentOptions>
+  </codeStyleSettings>
+</code_scheme>
diff --git 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.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/helper.gradle b/helper.gradle
@@ -22,8 +22,8 @@ buildscript {
         classpath 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.15.0'
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.4.1.3373'
         classpath 'org.spongepowered:vanillagradle:0.2.1-SNAPSHOT'
-        classpath 'net.neoforged.gradle:userdev:7.0.134'
-        classpath 'fabric-loom:fabric-loom.gradle.plugin:1.6-SNAPSHOT'
+        classpath 'net.neoforged.gradle:userdev:7.0.152'
+        classpath 'fabric-loom:fabric-loom.gradle.plugin:1.7-SNAPSHOT'
         classpath 'net.darkhax.curseforgegradle:CurseForgeGradle:1.1.18'
         classpath 'com.modrinth.minotaur:Minotaur:2.+'
     }
@@ -46,11 +46,11 @@ allprojects {
     }
 
     apply plugin: 'java'
-    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
     tasks.withType(JavaCompile).configureEach {
         it.options.encoding = 'UTF-8'
-        it.options.release.set(17)
+        it.options.release.set(21)
         it.options.deprecation = true
         it.options.compilerArgs << "-Xmaxerrs" << "999"
     }
@@ -77,16 +77,16 @@ allprojects {
     processResources {
         inputs.property 'version', project.version
 
-        filesMatching(['fabric.mod.json', 'META-INF/mods.toml']) {
+        filesMatching(['fabric.mod.json', 'META-INF/neoforge.mods.toml']) {
             expand 'version': project.version
         }
     }
 
     ext {
-        minecraftVersion = "1.20.4"
-        forgeVersion = "20.4.234"
+        minecraftVersion = "1.21"
+        forgeVersion = "21.0.42"
         fabricLoaderVersion = "0.15.11"
-        fabricApiVersion = "0.97.0+1.20.4"
+        fabricApiVersion = "0.100.4+1.21"
     }
 
     ext.enableMutationTesting = {

diff --git a/refinedarchitect-catalog/build.gradle b/refinedarchitect-catalog/build.gradle
@@ -6,37 +6,37 @@ catalog {
     versionCatalog {
         // Use the same slf4j API as MC to not break logging in the development environment:
         // https://launchermeta.mojang.com/mc/game/version_manifest_v2.json
-        def slf4j = version("slf4j", "2.0.7")
+        def slf4j = version("slf4j", "2.22.1")
         library("slf4j-api", "org.slf4j", "slf4j-api").versionRef(slf4j)
         library("slf4j-impl", "org.slf4j", "slf4j-simple").versionRef(slf4j)
 
         def apiGuardian = version("apiGuardian", "1.1.2")
         library("apiguardian", "org.apiguardian", "apiguardian-api").versionRef(apiGuardian)
 
-        def junit5 = version("junit5", "5.10.1")
+        def junit5 = version("junit5", "5.10.3")
         library("junit-api", "org.junit.jupiter", "junit-jupiter-api").versionRef(junit5)
         library("junit-engine", "org.junit.jupiter", "junit-jupiter-engine").versionRef(junit5)
         library("junit-params", "org.junit.jupiter", "junit-jupiter-params").versionRef(junit5)
 
-        def assertJ = version("assertJ", "3.24.2")
+        def assertJ = version("assertJ", "3.26.0")
         library("assertj", "org.assertj", "assertj-core").versionRef(assertJ)
 
-        def mockito = version("mockito", "5.8.0")
+        def mockito = version("mockito", "5.12.0")
         library("mockito", "org.mockito", "mockito-core").versionRef(mockito)
 
-        def equalsVerifier = version("equalsverifier", "3.15.5")
+        def equalsVerifier = version("equalsverifier", "3.16.1")
         library("equalsverifier", "nl.jqno.equalsverifier", "equalsverifier").versionRef(equalsVerifier)
 
         // https://www.curseforge.com/minecraft/mc-mods/cloth-config/files
-        def clothConfig = version("cloth-config-fabric", "13.0.121")
+        def clothConfig = version("cloth-config-fabric", "15.0.127")
         library("cloth-config", "me.shedaniel.cloth", "cloth-config-fabric").versionRef(clothConfig)
 
         // https://github.com/TechReborn/Energy (https://maven.fabricmc.net/teamreborn/energy/)
-        def energy = version("teamreborn-energy", "3.0.0")
+        def energy = version("teamreborn-energy", "4.1.0")
         library("teamreborn-energy", "teamreborn", "energy").versionRef(energy)
 
         // https://modrinth.com/mod/modmenu
-        def modmenu = version("modmenu", "9.0.0")
+        def modmenu = version("modmenu", "11.0.1")
         library("modmenu", "com.terraformersmc", "modmenu").versionRef(modmenu)
     }
 }