Merge remote-tracking branch 'origin/1.19.x' into release/1.19.x

Author: thiakil

.github/ISSUE_TEMPLATE/general_issue.yml

@@ -33,7 +33,7 @@ body:
     attributes:
       label: Forge version
       description: What version of Forge are you using?
-      placeholder: e.g. 43.1.61
+      placeholder: e.g. 43.2.8
     validations:
       required: true
   - type: dropdown
@@ -43,11 +43,10 @@ body:
       description: What version of Mekanism are you using?
       options:
         - Current Dev Branch (Manually Compiled)
-        - 10.3.8 (Latest)
+        - 10.3.9 (Latest)
+        - 10.3.8
         - 10.3.7
         - 10.3.6
-        - 10.3.5
-        - 10.3.4
         - Older
     validations:
       required: true

build.gradle

@@ -4,7 +4,7 @@ Mekanism is developed for Minecraft 1.19.2 using Minecraft Forge.
 
 ## Prerequisites
 
-* Gradle - Version 7.5.1 is known to work, your mileage with other versions may vary
+* Gradle - Version 8.1.1 is known to work, your mileage with other versions may vary
 * JDK - Version 17 is the target as that is what Mojang ships, but to run gradle you must use a minimum of JDK 11.
 
 ## Directory Structure

docs/Development.md

@@ -1,6 +1,6 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
+org.gradle.jvmargs=-Xmx2G
 
 java_version=17
 resource_pack_format=9
@@ -12,54 +12,56 @@ previous_minor_minecraft_version=1.19.1
 mappings_version=2022.11.27-1.19.2
 mappings_channel=parchment
 loader_version_range=[43,)
-forge_version=43.2.3
-mod_version=10.3.8
+forge_version=43.2.14
+mod_version=10.3.9
 #This determines the minimum version of forge required to use Mekanism
 # Only bump it whenever we need access to a feature in forge that is not available in earlier versions
-forge_version_range=[43.1.61,)
+forge_version_range=[43.2.8,)
 minecraft_version_range=[1.19.2]
 #This specifies what type of release it will be uploaded to CurseForge and Modrinth as
 # options are: alpha, beta, release
 release_type=release
 
 #JUnit/Testing dependencies
-junit_version=5.9.1
+junit_version=5.9.2
 quicktheories_version=0.26
 
 #Mod dependencies
-cc_tweaked_version=1.101.1
-crafttweaker_version=10.0.24
-curios_version=5.1.1.0
-flux_networks_id=4095070
-jade_api_id=4318620
-jade_id=4318618
-jei_version=11.5.2.1007
+cc_tweaked_version=1.101.2
+crafttweaker_version=10.1.44
+ctm_version=1.1.7+11
+curios_version=5.1.4.1
+flux_networks_id=4353161
+jade_api_id=4433885
+jade_id=4433884
+jei_version=11.6.0.1015
+jeitweaker_version=4.0.11
 projecte_api_id=3955049
 recipe_stages_version=4.0.0.4
 top_version=1.19-6.2.0-6
 wildfire_gender_mod_id=3920268
-wthit_id=4090703
+wthit_id=4544617
 
 #Mod dependency min version ranges
 crafttweaker_version_range=[10.0.6,)
 curios_version_range=[1.19-5.1.0.0,)
+dme_version_range=[1.19.2-1.1.2,)
 jei_version_range=[11.2.0.241,)
 recipe_stages_version_range=[4.0.0.4,)
 
 #Mod dependencies for recipes (only used by our data generators)
-ae2_version=12.9.1
+ae2_version=12.9.5
 biomesoplenty_api_id=4034265
-biomesoplenty_id=4128419
+biomesoplenty_id=4473556
 byg_id=4027228
-ilikewood_id=4068507
+farmers_delight_id=4525646
+ilikewood_id=4463114
 ilikewood_bop_id=4068509
 ilikewood_byg_id=4068511
 projecte_id=3955047
 terrablender_id=4205732
 
 #Outdated mod dependencies
-ctm_version=1.1.4+4
-jeitweaker_version=3.0.0.9
 oc2_id=3896581
 
 #Outdated mod dependencies for recipes

gradle.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradle/wrapper/gradle-wrapper.properties

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

gradlew

@@ -12,4 +12,8 @@ pluginManagement {
     }
 }
 
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+}
+
 include 'annotation-processor'

gradlew.bat

@@ -3,7 +3,6 @@
 import mekanism.additions.common.registries.AdditionsBlockTypes;
 import mekanism.api.text.EnumColor;
 import mekanism.common.block.attribute.Attribute;
-import mekanism.common.block.attribute.AttributeStateFacing;
 import mekanism.common.block.interfaces.IColoredBlock;
 import mekanism.common.block.prefab.BlockBase.BlockBaseModel;
 import mekanism.common.content.blocktype.BlockType;
@@ -48,7 +47,7 @@ public EnumColor getColor() {
     @Deprecated
     public BlockState updateShape(BlockState state, @NotNull Direction facing, @NotNull BlockState facingState, @NotNull LevelAccessor world,
           @NotNull BlockPos currentPos, @NotNull BlockPos facingPos) {
-        if (facing.getOpposite() == Attribute.get(state, AttributeStateFacing.class).getDirection(state) && !state.canSurvive(world, currentPos)) {
+        if (facing.getOpposite() == Attribute.getFacing(state) && !state.canSurvive(world, currentPos)) {
             return Blocks.AIR.defaultBlockState();
         }
         return super.updateShape(state, facing, facingState, world, currentPos, facingPos);
@@ -57,7 +56,7 @@ public BlockState updateShape(BlockState state, @NotNull Direction facing, @NotN
     @Override
     @Deprecated
     public boolean canSurvive(@NotNull BlockState state, @NotNull LevelReader world, @NotNull BlockPos pos) {
-        Direction side = Attribute.get(state, AttributeStateFacing.class).getDirection(state);
+        Direction side = Attribute.getFacing(state);
         Direction sideOn = side.getOpposite();
         BlockPos offsetPos = pos.relative(sideOn);
         VoxelShape projected = world.getBlockState(offsetPos).getBlockSupportShape(world, offsetPos).getFaceShape(side);

settings.gradle

@@ -1,4 +1,14 @@
 {
+  "advancements.mekanismadditions.balloon.description": "Vyrob libovolný barevný balón",
+  "advancements.mekanismadditions.balloon.title": "Dosáhni nebes",
+  "advancements.mekanismadditions.glow_in_the_dark.description": "Vyrob jakýkoliv Svítící Panel",
+  "advancements.mekanismadditions.glow_in_the_dark.title": "Svítí ve tmě",
+  "advancements.mekanismadditions.hurt_by_babies.description": "Buď zraněn malými stvořenímí z Mekanism Addition's",
+  "advancements.mekanismadditions.hurt_by_babies.title": "Nesnaž se brát cukrovinky z těchto dětí",
+  "advancements.mekanismadditions.not_the_babies.description": "Zabij jakéhokoliv Moba z Mekanism Addition's",
+  "advancements.mekanismadditions.not_the_babies.title": "Ne, ty děti",
+  "advancements.mekanismadditions.pop_pop.description": "Praskni balón",
+  "advancements.mekanismadditions.pop_pop.title": "Prásk prásk",
   "block.mekanismadditions.aqua_glow_panel": "Tyrkysový Svítící Panel",
   "block.mekanismadditions.aqua_plastic": "Tyrkysový Plastový Blok",
   "block.mekanismadditions.aqua_plastic_fence": "Tyrkysová Plastová Bariéra",