Merge branch 'master' into zb/more-molds

Author: Zorbatron

build.gradle

@@ -1,4 +1,4 @@
-//version: 1723428048
+//version: 1743737794
 /*
  * DO NOT CHANGE THIS FILE!
  * Also, you may replace this file at any time if there is an update available.
@@ -80,6 +80,7 @@ propertyDefaultIfUnset("includeWellKnownRepositories", true)
 propertyDefaultIfUnset("includeCommonDevEnvMods", true)
 propertyDefaultIfUnset("stripForgeRequirements", false)
 propertyDefaultIfUnset("noPublishedSources", false)
+propertyDefaultIfUnset("mixinProviderSpec", "zone.rong:mixinbooter:10.6")
 propertyDefaultIfUnset("forceEnableMixins", false)
 propertyDefaultIfUnset("mixinConfigRefmap", "mixins.${project.modId}.refmap.json")
 propertyDefaultIfUnsetWithEnvVar("enableCoreModDebug", false, "CORE_MOD_DEBUG")
@@ -518,7 +519,6 @@ configurations {
     testRuntimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
 }
 
-String mixinProviderSpec = 'zone.rong:mixinbooter:9.1'
 dependencies {
     if (usesMixins.toBoolean()) {
         annotationProcessor 'org.ow2.asm:asm-debug-all:5.2'
@@ -1009,7 +1009,7 @@ abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
 
         if (project.usesMixins.toBoolean()) {
             this.extraJvmArgs.addAll(project.provider(() -> {
-                def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec))
+                def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(mixinProviderSpec))
                 mixinCfg.canBeConsumed = false
                 mixinCfg.canBeResolved = true
                 mixinCfg.transitive = false

dependencies.gradle

@@ -40,8 +40,9 @@
 dependencies {
     // Published dependencies
     api("codechicken:codechickenlib:3.2.3.358")
-    api("com.cleanroommc:modularui:2.5.0-rc1") { transitive = false }
+    api("com.cleanroommc:modularui:2.5.0-rc4") { transitive = false }
     api("com.cleanroommc:groovyscript:1.2.0-hotfix1") { transitive = false }
+    api("curse.maven:inventory-bogosorter-632327:4951607-deobf-4951608-sources-4951609")
     api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700")
     api("appeng:ae2-uel:v0.56.4") { transitive = false }
     api rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31

gradle.properties

@@ -26,6 +26,7 @@ minecraftVersion = 1.12.2
 # Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
 # Alternatively this can be set with the 'DEV_USERNAME' environment variable.
 developmentEnvironmentUserName = Developer
+
 # Additional arguments applied to the JVM when launching minecraft
 # Syntax: -arg1=value1;-arg2=value2;...
 # Example value: -Dmixin.debug.verify=true;-XX:+UnlockExperimentalVMOptions
@@ -35,6 +36,7 @@ additionalJavaArguments=
 # See https://github.com/bsideup/jabel for details on how this works.
 # Using this requires that you use a Java 17 JDK for development.
 enableModernJavaSyntax = true
+
 # Enables runClient/runServer tasks for Java 17 and Java 21 using LWJGL3ify.
 # This is primarily used to test if your mod is compatible with platforms running
 # Minecraft 1.12.2 on modern versions of Java and LWJGL, and assist in fixing any problems with it.
@@ -62,6 +64,8 @@ accessTransformersFile = gregtech_at.cfg
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = true
+# Mixin Provider to use. Primarily changed when needing to use a different version.
+mixinProviderSpec=zone.rong:mixinbooter:10.6
 # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
 mixinsPackage = mixins
 # Location of the mixin config refmap. If left, blank, defaults to "mixins.${modId}.refmap.json". Target file must have the "json" extension.
@@ -90,6 +94,7 @@ includeWellKnownRepositories=true
 # be available at compiletime and runtime for your mod (in-game and in-code).
 # Overrides the above setting to be always true, as these repositories are needed to fetch the mods
 includeCommonDevEnvMods = true
+
 # Some mods require a specific forge version to launch in. When you need to use one of those mods as a dependency,
 # and cannot launch with the forge version required, enable this to strip the forge version requirements from that mod.
 # This will add 'strip-latest-forge-requirements' as 'runtimeOnlyNonPublishable'.

src/api/java/meldexun/nothirium/api/renderer/chunk/ChunkRenderPass.java

@@ -0,0 +1,12 @@
+package meldexun.nothirium.api.renderer.chunk;
+
+/**
+ * Adapted and minimized from <a
+ * href="https://github.com/Meldexun/Nothirium/blob/main/src/main/java/meldexun/nothirium/api/renderer/chunk/ChunkRenderPass.java">ChunkRenderPass.java</a>
+ */
+public enum ChunkRenderPass {
+    ;
+
+    public static final ChunkRenderPass[] ALL = ChunkRenderPass.values();
+
+}

src/main/java/gregtech/GregTechMod.java

@@ -31,7 +31,8 @@
      acceptedMinecraftVersions = "[1.12.2,1.13)",
      version = GTInternalTags.VERSION,
      dependencies = "required:forge@[14.23.5.2847,);" + "required-after:codechickenlib@[3.2.3,);" +
-             "required-after:modularui@[2.3,);" + "required-after:mixinbooter@[8.0,);" + "after:appliedenergistics2;" +
+             "required-after:modularui@[2.5.0-rc,);" + "required-after:mixinbooter@[8.0,);" +
+             "after:appliedenergistics2;" +
              "after:forestry;" + "after:extrabees;" + "after:extratrees;" + "after:genetics;" + "after:magicbees;" +
              "after:jei@[4.15.0,);" + "after:crafttweaker@[4.1.20,);" + "after:groovyscript@[1.2.0,);" +
              "after:theoneprobe;" + "after:hwyla;")

src/main/java/gregtech/api/GTValues.java

@@ -1,14 +1,12 @@
 package gregtech.api;
 
-import gregtech.api.util.XSTR;
+import gregtech.api.util.random.XoShiRo256PlusPlusRandom;
 import gregtech.common.ConfigHolder;
 
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.relauncher.FMLLaunchHandler;
 import net.minecraftforge.oredict.OreDictionary;
 
-import org.jetbrains.annotations.ApiStatus;
-
 import java.time.LocalDate;
 import java.util.Random;
 import java.util.function.Supplier;
@@ -45,7 +43,7 @@ public class GTValues {
      */
     public static final short W = OreDictionary.WILDCARD_VALUE;
 
-    public static final Random RNG = new XSTR();
+    public static final Random RNG = new XoShiRo256PlusPlusRandom();
 
     /** Current time on the Client. Will always be zero on the server. */
     public static long CLIENT_TIME = 0;
@@ -71,7 +69,7 @@ public class GTValues {
     /**
      * The Voltage Tiers adjusted for cable loss, divided by 2.
      */
-    public static final int[] VHA = { 7, 16, 60, 240, 960, 3840, 15360, 61440, 245760, 983040, 3932160, 15728640,
+    public static final int[] VHA = { 4, 16, 60, 240, 960, 3840, 15360, 61440, 245760, 983040, 3932160, 15728640,
             62914560, 251658240, 1006632960 };
 
     /**
@@ -83,6 +81,13 @@ public class GTValues {
             9007199254740992L, 36028797018963968L, 144115188075855872L, 576460752303423488L, 2305843009213693952L,
             Long.MAX_VALUE };
 
+    public static final long[] VAOC = { 7, 30, 120, 480, 1920, 7680, 30720, 123880, 491520, 1966080, 7864320,
+            31457280, 125829120, 503316480, 2013265920, 8053063680L, 32212254720L, 128849018880L, 515396075520L,
+            2061584302080L, 8246337208320L, 32985348833280L, 131948427333120L, 527865581332480L, 2111062325297920L,
+            8444249301319680L, 33777097205278720L, 135108988821415880L, 540431751284459520L, 2161727821137838080L,
+            8646911284550352320L
+    };
+
     public static final int ULV = 0;
     public static final int LV = 1;
     public static final int MV = 2;
@@ -115,28 +120,28 @@ public class GTValues {
             "MAX+9", "MAX+10", "MAX+11", "MAX+12", "MAX+13", "MAX+14", "MAX+15", "MAX+16",
     };
 
-    private static final String MAX_PLUS = RED.toString() + BOLD + "M" + YELLOW + BOLD + "A" + GREEN + BOLD + "X" +
-            AQUA + BOLD + "+" + LIGHT_PURPLE + BOLD;
-
     /**
      * The short names for the voltages, formatted for text
      */
     public static final String[] VNF = new String[] {
             DARK_GRAY + "ULV", GRAY + "LV", AQUA + "MV",
-            GOLD + "HV", DARK_PURPLE + "EV", DARK_BLUE + "IV",
+            GOLD + "HV", DARK_PURPLE + "EV", BLUE + "IV",
             LIGHT_PURPLE + "LuV", RED + "ZPM", DARK_AQUA + "UV",
             DARK_RED + "UHV", GREEN + "UEV", DARK_GREEN + "UIV",
-            YELLOW + "UXV", BLUE + "OpV", RED.toString() + BOLD + "MAX" };
+            YELLOW + "UXV", BLUE.toString() + BOLD + "OpV", RED.toString() + BOLD + "MAX" };
+
+    private static final String MAX_PLUS = RED.toString() + BOLD + "M" + YELLOW + BOLD + "A" + GREEN + BOLD + "X" +
+            AQUA + BOLD + "+" + LIGHT_PURPLE + BOLD;
 
     /**
      * The short names for the voltages, up to max Long, formatted for text
      */
     public static final String[] VOCNF = new String[] {
             DARK_GRAY + "ULV", GRAY + "LV", AQUA + "MV",
-            GOLD + "HV", DARK_PURPLE + "EV", DARK_BLUE + "IV",
+            GOLD + "HV", DARK_PURPLE + "EV", BLUE + "IV",
             LIGHT_PURPLE + "LuV", RED + "ZPM", DARK_AQUA + "UV",
             DARK_RED + "UHV", GREEN + "UEV", DARK_GREEN + "UIV",
-            YELLOW + "UXV", BLUE + "OpV", RED.toString() + BOLD + "MAX",
+            YELLOW + "UXV", BLUE.toString() + BOLD + "OpV", RED.toString() + BOLD + "MAX",
             MAX_PLUS + "1", MAX_PLUS + "2", MAX_PLUS + "3", MAX_PLUS + "4",
             MAX_PLUS + "5", MAX_PLUS + "6", MAX_PLUS + "7", MAX_PLUS + "8",
             MAX_PLUS + "9", MAX_PLUS + "10", MAX_PLUS + "11", MAX_PLUS + "12",
@@ -166,48 +171,6 @@ public class GTValues {
      */
     public static final String MOD_NAME = "GregTech";
 
-    /** @deprecated Use {@link gregtech.api.util.Mods} instead */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    public static final String MODID_FR = "forestry",
-            MODID_CT = "crafttweaker",
-            MODID_TOP = "theoneprobe",
-            MODID_CTM = "ctm",
-            MODID_CC = "cubicchunks",
-            MODID_AR = "advancedrocketry",
-            MODID_ECORE = "endercore",
-            MODID_EIO = "enderio",
-            MODID_BC = "buildcraftcore",
-            MODID_COFH = "cofhcore",
-            MODID_APPENG = "appliedenergistics2",
-            MODID_JEI = "jei",
-            MODID_GROOVYSCRIPT = "groovyscript",
-            MODID_NC = "nuclearcraft",
-            MODID_IE = "immersiveengineering",
-            MODID_OC = "opencomputers",
-            MODID_JOURNEYMAP = "journeymap",
-            MODID_VOXELMAP = "voxelmap",
-            MODID_XAERO_MINIMAP = "xaerominimap",
-            MODID_HWYLA = "hwyla",
-            MODID_BAUBLES = "baubles",
-            MODID_TOP_ADDONS = "topaddons",
-            MODID_IC2 = "ic2",
-            MODID_GTFO = "gregtechfoodoption",
-            MODID_BINNIE = "binniecore",
-            MODID_XU2 = "extrautils2",
-            MODID_TR = "techreborn",
-            MODID_MB = "magicbees",
-            MODID_EB = "extrabees",
-            MODID_ET = "extratrees",
-            MODID_GENETICS = "genetics",
-            MODID_BOP = "biomesoplenty",
-            MODID_TCON = "tconstruct",
-            MODID_PROJRED_CORE = "projectred-core",
-            MODID_RC = "railcraft",
-            MODID_CHISEL = "chisel",
-            MODID_RS = "refinedstorage",
-            MODID_LITTLETILES = "littletiles";
-
     private static Boolean isClient;
 
     public static boolean isClientSide() {

src/main/java/gregtech/api/block/IWalkingSpeedBonus.java

@@ -26,14 +26,12 @@
 import java.util.Collections;
 import java.util.List;
 
-@SuppressWarnings("deprecation")
-public class VariantBlock<T extends Enum<T> & IStringSerializable> extends Block implements IWalkingSpeedBonus {
+public class VariantBlock<T extends Enum<T> & IStringSerializable> extends Block {
 
     protected PropertyEnum<T> VARIANT;
     protected T[] VALUES;
 
-    @SuppressWarnings("DataFlowIssue")
-    public VariantBlock(Material materialIn) {
+    public VariantBlock(@NotNull Material materialIn) {
         super(materialIn);
         if (VALUES.length > 0 && VALUES[0] instanceof IStateHarvestLevel) {
             for (T t : VALUES) {