Merge remote-tracking branch 'origin/main'

Phoenixvine32908 · Phoenixvine32908 · commit bff95c19b589 · 2025-11-11T17:22:00.000-05:00
diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@ Current features:
 * 64A Energy Converters
 * The Wireless Active Transformer (WAT)
   * Has an opt-in coolant system, where the WAT requires coolant to be used, or it'll explode (or just stop if GTm is set to have harmless active transformers)
+* Automatically set placed Parallel Hatches to their maximum parallels
 
 All features can be enabled or disabled in the config.
 
diff --git a/build.gradle b/build.gradle
@@ -14,6 +14,11 @@ sourceSets {
     }
 }
 
+mixin {
+    add sourceSets.main, "mixins.${mod_id}.refmap.json"
+    config "${mod_id}.mixins.json"
+}
+
 repositories {
     mavenLocal()
     mavenCentral()
@@ -138,6 +143,9 @@ apply from: "$rootDir/gradle/scripts/spotless.gradle"
 dependencies {
     compileOnly("org.jetbrains:annotations:26.0.1")
 
+    // Apply Mixin AP
+    annotationProcessor('org.spongepowered:mixin:0.8.5:processor')
+
     // JEI, EMI, Jade
     modCompileOnly("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
     modCompileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,3 @@
-# GregTech Modern Utilities version 2.2.3
+# GregTech Modern Utilities version 2.3.2
 
-* Update to GTm version 7.1.4
-* Add forgotten lang for the new "watfrequency" placeholder (hotfix to add missing newline from 2.2.2)
+* add option to make parallel hatches start at max parallels, courtesy of iluha
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G
     mapping_version=2023.09.03
 
 # Mod Properties
-    mod_version=2.2.3
+    mod_version=2.3.2
     maven_group=net.neganote.gtmutils
     archives_base_name=gtmutils
     mod_id=gtmutils
diff --git a/run/config/gtmutils.yaml b/run/config/gtmutils.yaml
diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/sterile_cleaning_maintenance_hatch.json b/src/generated/resources/assets/gtmutils/models/block/machine/sterile_cleaning_maintenance_hatch.json
@@ -8,7 +8,17 @@
     "side"
   ],
   "variants": {
-    "": {
+    "is_formed=false": {
+      "model": {
+        "parent": "gtmutils:block/machine/part/sterile_cleaning_maintenance_hatch",
+        "textures": {
+          "bottom": "gtceu:block/casings/voltage/uhv/bottom",
+          "side": "gtceu:block/casings/voltage/uhv/side",
+          "top": "gtceu:block/casings/voltage/uhv/top"
+        }
+      }
+    },
+    "is_formed=true": {
       "model": {
         "parent": "gtmutils:block/machine/part/sterile_cleaning_maintenance_hatch",
         "textures": {
diff --git a/src/main/java/net/neganote/gtutilities/common/item/UtilItems.java b/src/main/java/net/neganote/gtutilities/common/item/UtilItems.java
@@ -1,5 +1,6 @@
 package net.neganote.gtutilities.common.item;
 
+import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.item.IComponentItem;
 import com.gregtechceu.gtceu.api.item.component.ElectricStats;
 import com.gregtechceu.gtceu.api.item.component.IItemComponent;
@@ -38,7 +39,7 @@ public class UtilItems {
     public static ItemEntry<Item> SILVER_CREDIT = null;
 
     static {
-        if (UtilConfig.INSTANCE.features.omnibreakerEnabled) {
+        if (UtilConfig.INSTANCE.features.omnibreakerEnabled || GTCEu.isDataGen()) {
             OMNIBREAKER = REGISTRATE
                     .item("omnibreaker", (p) -> OmniBreakerItem.create(p, OMNIBREAKER_TIER))
                     .lang("Omni-breaker")
@@ -65,7 +66,7 @@ public class UtilItems {
                     .register();
         }
 
-        if (UtilConfig.INSTANCE.features.coinsEnabled) {
+        if (UtilConfig.INSTANCE.features.coinsEnabled || GTCEu.isDataGen()) {
             ANCIENT_GOLD_COIN = registerBasicItem("ancient_gold_coin");
             CHOCOLATE_COIN = registerBasicItem("chocolate_coin");
             COPPER_CREDIT = registerBasicItem("copper_credit");
diff --git a/src/main/java/net/neganote/gtutilities/common/item/UtilToolItems.java b/src/main/java/net/neganote/gtutilities/common/item/UtilToolItems.java
@@ -1,5 +1,6 @@
 package net.neganote.gtutilities.common.item;
 
+import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.GTValues;
 import com.gregtechceu.gtceu.api.item.ComponentItem;
 import com.gregtechceu.gtceu.api.item.component.ElectricStats;
@@ -20,7 +21,7 @@ public class UtilToolItems {
 
     static {
 
-        if (UtilConfig.INSTANCE.features.customLuVToolsEnabled) {
+        if (UtilConfig.INSTANCE.features.customLuVToolsEnabled || GTCEu.isDataGen()) {
             POWER_UNIT_LUV = REGISTRATE.item("luv_power_unit", ComponentItem::create)
                     .lang("LuV Power Unit")
                     .properties(p -> p.stacksTo(8))
@@ -29,7 +30,7 @@ public class UtilToolItems {
                     .register();
         }
 
-        if (UtilConfig.INSTANCE.features.customZPMToolsEnabled) {
+        if (UtilConfig.INSTANCE.features.customZPMToolsEnabled || GTCEu.isDataGen()) {
             POWER_UNIT_ZPM = REGISTRATE.item("zpm_power_unit", ComponentItem::create)
                     .lang("ZPM Power Unit")
                     .properties(p -> p.stacksTo(8))
diff --git a/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java b/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java
@@ -10,6 +10,7 @@
 import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
 import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType;
 import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility;
+import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
 import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern;
 import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder;
 import com.gregtechceu.gtceu.common.data.GTMaterials;
@@ -47,7 +48,7 @@ public class UtilMachines {
     public static MachineDefinition STERILE_CLEANING_MAINTENANCE_HATCH = null;
 
     static {
-        if (UtilConfig.INSTANCE.features.sterileHatchEnabled) {
+        if (UtilConfig.INSTANCE.features.sterileHatchEnabled || GTCEu.isDataGen()) {
             STERILE_CLEANING_MAINTENANCE_HATCH = REGISTRATE
                     .machine("sterile_cleaning_maintenance_hatch",
                             holder -> new CleaningMaintenanceHatchPartMachine(holder, CleanroomType.STERILE_CLEANROOM))
@@ -61,6 +62,7 @@ public class UtilMachines {
                             .translatable(CleanroomType.STERILE_CLEANROOM.getTranslationKey())
                             .withStyle(ChatFormatting.GREEN))))
                     .tier(UHV)
+                    .modelProperty(GTMachineModelProperties.IS_FORMED, false)
                     .overlayTieredHullModel(
                             GregTechModernUtilities.id("block/machine/part/sterile_cleaning_maintenance_hatch"))
                     // Tier can always be changed later
@@ -111,16 +113,16 @@ public static MachineDefinition[] registerTieredMachines(String name,
     public static MachineDefinition[] ENERGY_CONVERTER_64A = null;
 
     static {
-        if (UtilConfig.INSTANCE.features.converters64aEnabled &&
-                ConfigHolder.INSTANCE.compat.energy.enableFEConverters) {
+        if ((UtilConfig.INSTANCE.features.converters64aEnabled &&
+                ConfigHolder.INSTANCE.compat.energy.enableFEConverters) || GTCEu.isDataGen()) {
             ENERGY_CONVERTER_64A = registerConverter(64);
         }
     }
 
     public static MultiblockMachineDefinition PTERB_MACHINE = null;
 
     static {
-        if (UtilConfig.INSTANCE.features.pterbEnabled) {
+        if (UtilConfig.INSTANCE.features.pterbEnabled || GTCEu.isDataGen()) {
             PTERB_MACHINE = REGISTRATE
                     .multiblock("pterb_machine", PTERBMachine::new)
                     .langValue("Wireless Active Transformer")
diff --git a/src/main/java/net/neganote/gtutilities/config/UtilConfig.java b/src/main/java/net/neganote/gtutilities/config/UtilConfig.java
@@ -1,5 +1,6 @@
 package net.neganote.gtutilities.config;
 
+import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.GTValues;
 
 import net.neganote.gtutilities.GregTechModernUtilities;
@@ -48,6 +49,11 @@ public static class FeatureConfigs {
         @Configurable.Comment({ "Whether the Wireless Active Transformer is enabled." })
         public boolean pterbEnabled = true;
 
+        @Configurable
+        @Configurable.Comment({
+                "Whether placed Parallel Hatches should be automatically set to their maximum parallels." })
+        public boolean parallelHatchAutoConfigure = false;
+
         @Configurable
         @Configurable.Comment({ "Base amount of WAT coolant to drain every second.",
                 "(Setting both this amount and the IO multiplier to 0 disables the coolant mechanic.)" })
@@ -89,6 +95,6 @@ public static class FeatureConfigs {
 
     public static boolean coolantEnabled() {
         return UtilConfig.INSTANCE.features.pterbCoolantBaseDrain != 0 ||
-                UtilConfig.INSTANCE.features.pterbCoolantIOMultiplier != 0.0f;
+                UtilConfig.INSTANCE.features.pterbCoolantIOMultiplier != 0.0f || GTCEu.isDataGen();
     }
 }
diff --git a/src/main/java/net/neganote/gtutilities/mixin/ParallelHatchPartMachineMixin.java b/src/main/java/net/neganote/gtutilities/mixin/ParallelHatchPartMachineMixin.java
@@ -0,0 +1,32 @@
+package net.neganote.gtutilities.mixin;
+
+import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
+import com.gregtechceu.gtceu.common.machine.multiblock.part.ParallelHatchPartMachine;
+
+import net.neganote.gtutilities.config.UtilConfig;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ParallelHatchPartMachine.class)
+public abstract class ParallelHatchPartMachineMixin {
+
+    @Shadow
+    public abstract void setCurrentParallel(int parallelAmount);
+
+    @Shadow
+    @Final
+    private int maxParallel;
+
+    @Inject(
+            method = "<init>",
+            at = @At("TAIL"))
+    public void constructor(IMachineBlockEntity holder, int tier, CallbackInfo ci) {
+        if (UtilConfig.INSTANCE.features.parallelHatchAutoConfigure)
+            this.setCurrentParallel(this.maxParallel);
+    }
+}
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -23,6 +23,9 @@ GregTech Utilities
 A GregTech Modern addon, adding some nice quality-of-life features.
 '''
 
+    [[mixins]]
+        config="${mod_id}.mixins.json"
+
     [[dependencies.${mod_id}]]
         modId = "forge"
         mandatory = true
@@ -40,4 +43,4 @@ A GregTech Modern addon, adding some nice quality-of-life features.
         mandatory = true
         versionRange = "[${gtceu_version},)"
         ordering = "AFTER"
-        side = "BOTH"
+        side = "BOTH"
diff --git a/src/main/resources/gtmutils.mixins.json b/src/main/resources/gtmutils.mixins.json
@@ -1,9 +1,9 @@
 {
   "required": true,
-  "package": "com.example.examplemod.mixin",
+  "package": "net.neganote.gtutilities.mixin",
   "compatibilityLevel": "JAVA_17",
-  "minVersion": "0.8",
   "mixins": [
+    "ParallelHatchPartMachineMixin"
   ],
   "client": [
   ],
