Merge branch 'master' into dev

# Conflicts:
#	dependencies.gradle
#	settings.gradle

dependencies.gradle

@@ -34,8 +34,8 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-    api('com.github.GTNewHorizons:NotEnoughItems:2.6.14-GTNH:dev')
-    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-416-GTNH-pre:dev")
+    api('com.github.GTNewHorizons:NotEnoughItems:2.6.19-GTNH:dev')
+    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-419-GTNH-pre:dev")
     api('curse.maven:cofh-core-69162:2388751')
     api('com.github.GTNewHorizons:waila:1.8.1:dev')
 
@@ -46,15 +46,15 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.34:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.7:dev')
     compileOnly('com.github.GTNewHorizons:EnderIO:2.8.17:dev')
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.105:dev') {
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.113:dev') {
         exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
     }
 
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.16-GTNH:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.19-GTNH-pre:dev') { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.36:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.38:dev") { transitive = false }
 
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.2:dev")
 	runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.3.3:dev")

gradle.properties

@@ -85,6 +85,11 @@ accessTransformersFile = ae2fc_at.cfg
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
 
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false
 

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.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.24'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.25'
 }
 
 

src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java

@@ -134,6 +134,12 @@ public static void init() {}
             8,
             1,
             5).register();
+    public static ItemFluidExtremeStorageCell ARTIFICIAL_UNIVERSE_CELL = new ItemFluidExtremeStorageCell(
+            NameConst.ITEM_ARTIFICIAL_UNIVERSE_STORAGE,
+            Long.MAX_VALUE / 2048,
+            16384,
+            5,
+            600000D).register();
     public static ItemCreativeFluidStorageCell CREATIVE_CELL = new ItemCreativeFluidStorageCell().register();
     public static ItemInfinityWaterStorageCell INFINITY_WATER_CELL = new ItemInfinityWaterStorageCell().register();
     public static ItemBasicFluidStoragePart CELL_PART = new ItemBasicFluidStoragePart().register();

src/main/java/com/glodblock/github/util/NameConst.java

@@ -40,6 +40,7 @@ public class NameConst {
     public static final String ITEM_MULTI_FLUID_STORAGE = "multi_fluid_storage";
     public static final String ITEM_QUANTUM_FLUID_STORAGE = ITEM_FLUID_STORAGE + ".quantum";
     public static final String ITEM_SINGULARITY_FLUID_STORAGE = ITEM_FLUID_STORAGE + ".singularity";
+    public static final String ITEM_ARTIFICIAL_UNIVERSE_STORAGE = ITEM_FLUID_STORAGE + ".Universe";
     public static final String ITEM_INFINITY_FLUID_STORAGE = ITEM_FLUID_STORAGE + ".infinity";
     public static final String ITEM_INFINITY_WATER_FLUID_STORAGE = ITEM_INFINITY_FLUID_STORAGE + ".water";
     public static final String ITEM_CREATIVE_FLUID_STORAGE = "creative_" + ITEM_FLUID_STORAGE;

src/main/resources/assets/ae2fc/lang/en_US.lang

@@ -46,6 +46,7 @@ item.multi_fluid_storage.4096.name=%s4096k%s ME Multi-Fluid Storage Cell
 item.multi_fluid_storage.16384.name=%s16384k%s ME Multi-Fluid Storage Cell
 item.fluid_storage.quantum.name=ME Fluid Quantum Storage Cell
 item.fluid_storage.singularity.name=ME Fluid Digital Singularity Storage Cell
+item.fluid_storage.Universe.name=ME Fluid Artificial Universe Storage Cell
 item.fluid_storage.infinity.water.name=ME Fluid Infinity Water Storage Cell
 item.fluid_part.0.name=%s1k%s ME Fluid Storage Component
 item.fluid_part.1.name=%s4k%s ME Fluid Storage Component

src/main/resources/assets/ae2fc/lang/zh_CN.lang

@@ -41,6 +41,7 @@ item.multi_fluid_storage.4096.name=%s4096k%s-ME多重流体存储元件
 item.multi_fluid_storage.16384.name=%s16384k%s-ME多重流体存储元件
 item.fluid_storage.quantum.name=ME流体量子存储元件
 item.fluid_storage.singularity.name=ME流体数字奇点元件
+item.fluid_storage.Universe.name=ME流体寰宇存储元件
 item.fluid_part.0.name=%s1k%s-ME流体存储组件
 item.fluid_part.1.name=%s4k%s-ME流体存储组件
 item.fluid_part.2.name=%s16k%s-ME流体存储组件

src/main/resources/assets/ae2fc/textures/items/fluid_storage.Universe.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}