cherrypick 1.2.3.a (#1319)

* Fix steam miner machine not draining steam. (#1313)

* In World machine configuration (#1302)

* machine configuration tools initial

* Machine configuration handling with wrenches and screwdrivers

* fixed emerald/beryllium derivate toxicity (#1304)

* fixed emerald/beryllium derivate toxicity

* fixed butyraldehyde derivate toxicity and added PVC rings to fix hazmat headpiece recipe

* AT Fixes and Feature Addition (#1310)

* Fixing AT Pausing not working and causing them to explode if unformed while moving power.

* Created a Config "HarmlessActiveTransformers", which disables AT explosions. Disabled by default.

* Fixed HarmlessActiveTransformers to harmlessActiveTransformers

* fix tag -> unification entry lookup being stupidly slow in larger packs (#1315)

* fix tag -> unification entry lookup being stupidly slow in larger packs
cosmic frontiers went from 4 minutes world load for tooltips to 10 seconds.

* fix bedrock ore crash

* Why do they call it oven when you of in the cold food of out hot eat the food (#1316)

* Release prep for 1.2.3.a (#1318)

* chore: move dependencies.gradle to root dir

* run datagen

* chore: version & changelog

---------

Co-authored-by: screret <[email protected]>

* fix errors

---------

Co-authored-by: NicholasBaldwinSE <[email protected]>
Co-authored-by: YoungOnion <[email protected]>
Co-authored-by: Markh3tr <[email protected]>
Co-authored-by: Ghostipedia <[email protected]>
Co-authored-by: Mikerooni <[email protected]>

CHANGELOG.md

@@ -1,26 +1,17 @@
 # ChangeLog
 
-Version: 1.2.3
+Version: 1.2.3.a
 
 ### ADDITIONS:
-- Custom coil tiers are now displayed in JEI and displayed on separate lines to the temperature.
-- Turbines now hurt the player when running.
-- Added in-world oil spouts.
-- Made fluid pipes display the fluid contents when using Jade/TOP.
-- Added hazmat armor and added various debuff effects. 
-  - asbestos is now a breathing hazard, uranium is radioactive to touch, etc.
+- Added in-world machine configuration using tools
+- Active Transformers now explode when they're being mined while transferring energy
+  - A new `harmlessActiveTransformers` config option was added to optionally disable this feature
 
 ### CHANGES:
-- Reworked rotor stats by moving efficiency to its own parameter.
-  - PACK/ADDON DEVS NEED TO CHANGE THEIR ROTOR PROPERTIES
-- Number formatting for duration and eu values in JEI.
 
 ### FIXES:
-- Fixed all pipe blocks being washed away by any fluid.
-- Made active overlay textures actually render on machines when running or paused.
-- Fixed QuarkTech armor consuming lunchboxes and other "foods" that don't get consumed immediately.
-- Fixed various ore smelting recipes were added.
-- Fixed GT armors no longer take durability damage.
-- Updated ru and tw translations.
-- Fixed laser hatches now save the energy between world loads.
-- Fixed dense plates requiring ingots to craft.
+- Fixed steam miners not using steam
+- Fixed emerald/beryllium derivate toxicity
+- Increased performance for unification entry lookups in larger modpacks
+- Fixed steam ovens not parallelizing
+- Fixed bedrock ore veins not being registered

build.gradle

@@ -31,7 +31,7 @@ version = "${mod_version}" + (buildNumber != null ? "-build_${System.getenv("GIT
 apply from: "$rootDir/gradle/scripts/architectury_loom.gradle"
 apply from: "$rootDir/gradle/scripts/capabilities.gradle"
 apply from: "$rootDir/gradle/scripts/repositories.gradle"
-apply from: "$rootDir/gradle/scripts/dependencies.gradle"
+apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/gradle/scripts/resources.gradle"
 apply from: "$rootDir/gradle/scripts/jars.gradle"
 apply from: "$rootDir/gradle/scripts/publishing.gradle"

gradle/scripts/dependencies.gradle → dependencies.gradle

@@ -58,7 +58,7 @@ dependencies {
     modImplementation(forge.ae2) { transitive = false }
 
     //AlmostUnified
-    modImplementation(forge.almostUnified.forge)
+    modCompileOnly(forge.almostUnified.forge)
 
     // KJS
     modImplementation forge.kubejs
@@ -73,4 +73,4 @@ dependencies {
 
     // Runtime only testing mods
     //modRuntimeOnly(forge.worldStripper)
-}
+}

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.2.3
+mod_version = 1.2.3.a
 mod_description = GregTech CE Unofficial, ported from 1.12.2
 mod_license = LGPL-3.0 license
 mod_url = https://github.com/GregTechCEu/GregTech-Modern/

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -1767,12 +1767,14 @@
   "compass.node.gtceu.materials/block": "ʞɔoןᗺ",
   "compass.node.gtceu.materials/bolt": "ʇןoᗺ",
   "compass.node.gtceu.materials/chainsaw_head": "pɐǝH ʍɐsuıɐɥƆ",
+  "compass.node.gtceu.materials/chipped_gem": "ɯǝ⅁ pǝddıɥƆ",
   "compass.node.gtceu.materials/crushed_ore": "ǝɹO pǝɥsnɹƆ",
   "compass.node.gtceu.materials/dense_plate": "ǝʇɐןԀ ǝsuǝᗡ",
   "compass.node.gtceu.materials/double_plate": "ǝʇɐןԀ ǝןqnoᗡ",
   "compass.node.gtceu.materials/dust": "ʇsnᗡ",
   "compass.node.gtceu.materials/exquisite_gem": "ɯǝ⅁ ǝʇısınbxƎ",
   "compass.node.gtceu.materials/fine_wire": "ǝɹıM ǝuıℲ",
+  "compass.node.gtceu.materials/flawed_gem": "ɯǝ⅁ pǝʍɐןℲ",
   "compass.node.gtceu.materials/flawless_gem": "ɯǝ⅁ ssǝןʍɐןℲ",
   "compass.node.gtceu.materials/foil": "ןıoℲ",
   "compass.node.gtceu.materials/frame": "ǝɯɐɹℲ",
@@ -2051,6 +2053,7 @@
   "config.gtceu.option.harderCharcoalRecipe": "ǝdıɔǝᴚןɐoɔɹɐɥƆɹǝpɹɐɥ",
   "config.gtceu.option.harderCircuitRecipes": "sǝdıɔǝᴚʇınɔɹıƆɹǝpɹɐɥ",
   "config.gtceu.option.harderRods": "spoᴚɹǝpɹɐɥ",
+  "config.gtceu.option.harmlessActiveTransformers": "sɹǝɯɹoɟsuɐɹ⟘ǝʌıʇɔⱯssǝןɯɹɐɥ",
   "config.gtceu.option.hazardsEnabled": "pǝןqɐuƎspɹɐzɐɥ",
   "config.gtceu.option.hideFacadesInJEI": "IƎſuIsǝpɐɔɐℲǝpıɥ",
   "config.gtceu.option.hideFilledCellsInJEI": "IƎſuIsןןǝƆpǝןןıℲǝpıɥ",
@@ -2076,6 +2079,7 @@
   "config.gtceu.option.oreVeins": "suıǝΛǝɹo",
   "config.gtceu.option.overclockDivisor": "ɹosıʌıᗡʞɔoןɔɹǝʌo",
   "config.gtceu.option.platformToEuRatio": "oıʇɐᴚnƎo⟘ɯɹoɟʇɐןd",
+  "config.gtceu.option.prospectorEnergyUseMultiplier": "ɹǝıןdıʇןnWǝs∩ʎbɹǝuƎɹoʇɔǝdsoɹd",
   "config.gtceu.option.recipeProgressLowEnergy": "ʎbɹǝuƎʍoꞀssǝɹboɹԀǝdıɔǝɹ",
   "config.gtceu.option.recipes": "sǝdıɔǝɹ",
   "config.gtceu.option.removeSmeltingForEBFMetals": "sןɐʇǝWℲᗺƎɹoℲbuıʇןǝɯSǝʌoɯǝɹ",
@@ -3240,6 +3244,9 @@
   "gtceu.maintenance.configurable_time.changed_description": "˙ǝʇɐɹ ןɐɯɹou ǝɥʇ xɟ% ʇɐ ɹnɔɔo ןןıʍ sɯǝןqoɹd ǝɔuɐuǝʇuıɐW",
   "gtceu.maintenance.configurable_time.unchanged_description": "˙ǝʇɐpdn oʇ uoıʇɐɹnbıɟuoɔ ǝbuɐɥƆ ˙ǝʇɐɹ ןɐɯɹou ʇɐ ɹnɔɔo ןןıʍ sɯǝןqoɹd ǝɔuɐuǝʇuıɐW",
   "gtceu.mixer": "ɹǝxıW",
+  "gtceu.mode.both": "ɹ§)ɯǝʇI puⱯ pınןℲ( ɥʇoᗺp§",
+  "gtceu.mode.fluid": "ɹ§pınןℲ6§",
+  "gtceu.mode.item": "ɹ§ɯǝʇI9§",
   "gtceu.muffler.recovery_tooltip": "%d%%ɟ§ :ǝɔuɐɥƆ ʎɹǝʌoɔǝᴚq§",
   "gtceu.multiblock.advanced_processing_array.description": "˙uoıʇɐɯoʇnɐ buısɐǝ ʎןǝʌıʇɔǝɟɟǝ 'ʞɔoןqıʇןnɯ ǝןbuıs ɐ uı )s(ǝuıɥɔɐɯ ʞɔoןq ǝןbuıs ㄣ9 oʇ dn sǝuıqɯoɔ ʎɐɹɹⱯ buıssǝɔoɹԀ ǝɥ⟘",
   "gtceu.multiblock.assembly_line.description": "˙sʇuǝuodɯoɔ buıʇɟɐɹɔ pǝɔuɐʌpɐ buıʇɐǝɹɔ ɹoɟ pǝsn 'ǝuıɥɔɐW buıןqɯǝssⱯ ǝbɹɐן s,ʇı 'ʎɹoǝɥʇ uI ˙\"sǝɔıןs\" 9Ɩ oʇ ϛ ɟo buıʇsısuoɔ ǝɹnʇɔnɹʇs ʞɔoןqıʇןnɯ ǝbɹɐן ɐ sı ǝuıꞀ ʎןqɯǝssⱯ ǝɥ⟘",
@@ -5322,6 +5329,7 @@
   "metaitem.generic.fluid_container.tooltip": "%s Ꞁ%d/%d",
   "metaitem.int_circuit.configuration": "%d :uoıʇɐɹnbıɟuoƆ",
   "metaitem.liquid_fuel_jetpack.tooltip": "ʇsnɹɥ⟘ ɹoɟ sןǝnℲ ɹoʇɐɹǝuǝ⅁ uoıʇsnqɯoƆ sǝs∩",
+  "metaitem.machine_configuration.mode": "%s ɹ§:ǝpoW uoıʇɐɹnbıɟuoƆɐ§",
   "metaitem.plugin.proxy.tooltips.1": ")uǝǝɹɔs ǝɥʇ uı ǝpoɯ ʎxoɹd oʇ ʇsnظpɐ ǝsɐǝןԀ(",
   "metaitem.plugin.tooltips.1": "˙ʎʇıןɐuoıʇɔunɟ ǝɹoɯ ɹoɟ uǝǝɹɔs ǝɥʇ oʇ pǝppɐ ǝq uɐɔ suıbnןԀ",
   "metaitem.prospector.mode.bedrock_ore": "ɹ§ǝpoW uoıʇɔǝdsoɹԀ ǝɹO ʞɔoɹpǝᗺq§",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -1767,12 +1767,14 @@
   "compass.node.gtceu.materials/block": "Block",
   "compass.node.gtceu.materials/bolt": "Bolt",
   "compass.node.gtceu.materials/chainsaw_head": "Chainsaw Head",
+  "compass.node.gtceu.materials/chipped_gem": "Chipped Gem",
   "compass.node.gtceu.materials/crushed_ore": "Crushed Ore",
   "compass.node.gtceu.materials/dense_plate": "Dense Plate",
   "compass.node.gtceu.materials/double_plate": "Double Plate",
   "compass.node.gtceu.materials/dust": "Dust",
   "compass.node.gtceu.materials/exquisite_gem": "Exquisite Gem",
   "compass.node.gtceu.materials/fine_wire": "Fine Wire",
+  "compass.node.gtceu.materials/flawed_gem": "Flawed Gem",
   "compass.node.gtceu.materials/flawless_gem": "Flawless Gem",
   "compass.node.gtceu.materials/foil": "Foil",
   "compass.node.gtceu.materials/frame": "Frame",
@@ -2033,7 +2035,6 @@
   "config.gtceu.option.enableWorldAccelerators": "enableWorldAccelerators",
   "config.gtceu.option.energy": "energy",
   "config.gtceu.option.energyUsageMultiplier": "energyUsageMultiplier",
-  "config.gtceu.option.prospectorEnergyUseMultiplier": "prospectorEnergyUsageMultiplier",
   "config.gtceu.option.euToPlatformRatio": "euToPlatformRatio",
   "config.gtceu.option.flintAndSteelRequireSteel": "flintAndSteelRequireSteel",
   "config.gtceu.option.gameplay": "gameplay",
@@ -2052,6 +2053,7 @@
   "config.gtceu.option.harderCharcoalRecipe": "harderCharcoalRecipe",
   "config.gtceu.option.harderCircuitRecipes": "harderCircuitRecipes",
   "config.gtceu.option.harderRods": "harderRods",
+  "config.gtceu.option.harmlessActiveTransformers": "harmlessActiveTransformers",
   "config.gtceu.option.hazardsEnabled": "hazardsEnabled",
   "config.gtceu.option.hideFacadesInJEI": "hideFacadesInJEI",
   "config.gtceu.option.hideFilledCellsInJEI": "hideFilledCellsInJEI",
@@ -2077,6 +2079,7 @@
   "config.gtceu.option.oreVeins": "oreVeins",
   "config.gtceu.option.overclockDivisor": "overclockDivisor",
   "config.gtceu.option.platformToEuRatio": "platformToEuRatio",
+  "config.gtceu.option.prospectorEnergyUseMultiplier": "prospectorEnergyUseMultiplier",
   "config.gtceu.option.recipeProgressLowEnergy": "recipeProgressLowEnergy",
   "config.gtceu.option.recipes": "recipes",
   "config.gtceu.option.removeSmeltingForEBFMetals": "removeSmeltingForEBFMetals",
@@ -3241,6 +3244,9 @@
   "gtceu.maintenance.configurable_time.changed_description": "Maintenance problems will occur at %fx the normal rate.",
   "gtceu.maintenance.configurable_time.unchanged_description": "Maintenance problems will occur at normal rate. Change configuration to update.",
   "gtceu.mixer": "Mixer",
+  "gtceu.mode.both": "§dBoth (Fluid And Item)§r",
+  "gtceu.mode.fluid": "§9Fluid§r",
+  "gtceu.mode.item": "§6Item§r",
   "gtceu.muffler.recovery_tooltip": "§bRecovery Chance: §f%d%%",
   "gtceu.multiblock.advanced_processing_array.description": "The Processing Array combines up to 64 single block machine(s) in a single multiblock, effectively easing automation.",
   "gtceu.multiblock.assembly_line.description": "The Assembly Line is a large multiblock structure consisting of 5 to 16 \"slices\". In theory, it's large Assembling Machine, used for creating advanced crafting components.",
@@ -5323,6 +5329,7 @@
   "metaitem.generic.fluid_container.tooltip": "%d/%dL %s",
   "metaitem.int_circuit.configuration": "Configuration: %d",
   "metaitem.liquid_fuel_jetpack.tooltip": "Uses Combustion Generator Fuels for Thrust",
+  "metaitem.machine_configuration.mode": "§aConfiguration Mode:§r %s",
   "metaitem.plugin.proxy.tooltips.1": "(Please adjust to proxy mode in the screen)",
   "metaitem.plugin.tooltips.1": "Plugins can be added to the screen for more functionality.",
   "metaitem.prospector.mode.bedrock_ore": "§bBedrock Ore Prospection Mode§r",

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/EURecipeCapability.java

@@ -71,6 +71,10 @@ public int getMaxParallelRatio(IRecipeCapabilityHolder holder, GTRecipe recipe,
         if (recipeEUt == 0) {
             return Integer.MAX_VALUE;
         }
-        return Math.abs((int) (maxVoltage / recipeEUt));
+        return Math.abs(safeCastLongToInt(maxVoltage / recipeEUt));
+    }
+
+    public static int safeCastLongToInt(long v) {
+        return v > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) v;
     }
 }

src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java

@@ -251,17 +251,22 @@ public static UnificationEntry getUnificationEntry(ItemLike itemLike) {
     }
 
     public static UnificationEntry getUnificationEntry(TagKey<Item> tag) {
-        UnificationEntry entry = TAG_UNIFICATION_ENTRY.computeIfAbsent(tag, tagKey -> {
+        if (TAG_UNIFICATION_ENTRY.isEmpty()) {
+            // If the map is empty, resolve all possible tags to their values in an attempt to save time on later lookups.
+            Set<TagKey<Item>> allItemTags = Registry.ITEM.getTagNames().collect(Collectors.toSet());
             for (TagPrefix prefix : TagPrefix.values()) {
                 for (Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) {
-                    if (Arrays.stream(prefix.getItemTags(material)).anyMatch(tagKey1 -> tagKey1.location().equals(tagKey.location()))) {
-                        return new UnificationEntry(prefix, material);
-                    }
+                    Arrays.stream(prefix.getItemTags(material))
+                        .filter(allItemTags::contains)
+                        .forEach(tagKey -> {
+                            // remove the tag so that the next iteration is faster.
+                            allItemTags.remove(tagKey);
+                            TAG_UNIFICATION_ENTRY.put(tagKey, new UnificationEntry(prefix, material));
+                        });
                 }
             }
-            return UnificationEntry.EmptyMapMarkerEntry;
-        });
-        return entry != UnificationEntry.EmptyMapMarkerEntry ? entry : null;
+        }
+        return TAG_UNIFICATION_ENTRY.get(tag);
     }
 
     public static List<ItemLike> getItems(UnificationEntry unificationEntry) {

src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java

@@ -75,7 +75,7 @@ public InteractionResultHolder<ItemStack> use(Item item, Level level, Player pla
             if (!level.isClientSide) {
                 boolean isInDischargeMode = isInDischargeMode(itemStack);
                 String locale = "metaitem.electric.discharge_mode." + (isInDischargeMode ? "disabled" : "enabled");
-                player.sendSystemMessage(Component.translatable(locale));
+                player.displayClientMessage(Component.translatable(locale),true);
                 setInDischargeMode(itemStack, !isInDischargeMode);
             }
             return InteractionResultHolder.success(itemStack);

src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolType.java

@@ -138,7 +138,7 @@ public class GTToolType {
             .harvestTag(TagUtil.createBlockTag("mineable/wrench", false))
             .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse()
                     .attackDamage(1.0F).attackSpeed(-2.8F)
-                    .behaviors(BlockRotatingBehavior.INSTANCE, new EntityDamageBehavior(3.0F, IronGolem.class)))
+                    .behaviors(BlockRotatingBehavior.INSTANCE, new EntityDamageBehavior(3.0F, IronGolem.class), ToolModeSwitchBehavior.INSTANCE))
             .sound(GTSoundEntries.WRENCH_TOOL)
             .symbol('w')
             .build();
@@ -302,7 +302,7 @@ public class GTToolType {
         .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse()
             .efficiencyMultiplier(2.0F)
             .attackDamage(1.0F).attackSpeed(-2.8F)
-            .behaviors(BlockRotatingBehavior.INSTANCE, new EntityDamageBehavior(3.0F, IronGolem.class))
+            .behaviors(BlockRotatingBehavior.INSTANCE, new EntityDamageBehavior(3.0F, IronGolem.class), ToolModeSwitchBehavior.INSTANCE)
             .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_LV))
         .sound(GTSoundEntries.WRENCH_TOOL, true)
         .electric(GTValues.LV)
@@ -316,7 +316,7 @@ public class GTToolType {
         .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse()
             .efficiencyMultiplier(3.0F)
             .attackDamage(1.0F).attackSpeed(-2.8F)
-            .behaviors(BlockRotatingBehavior.INSTANCE, new EntityDamageBehavior(3.0F, IronGolem.class))
+            .behaviors(BlockRotatingBehavior.INSTANCE, new EntityDamageBehavior(3.0F, IronGolem.class), ToolModeSwitchBehavior.INSTANCE)
             .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_HV))
         .sound(GTSoundEntries.WRENCH_TOOL, true)
         .electric(GTValues.HV)
@@ -330,7 +330,7 @@ public class GTToolType {
         .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse()
             .efficiencyMultiplier(4.0F)
             .attackDamage(1.0F).attackSpeed(-2.8F)
-            .behaviors(BlockRotatingBehavior.INSTANCE, new EntityDamageBehavior(3.0F, IronGolem.class))
+            .behaviors(BlockRotatingBehavior.INSTANCE, new EntityDamageBehavior(3.0F, IronGolem.class), ToolModeSwitchBehavior.INSTANCE)
             .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_IV))
         .sound(GTSoundEntries.WRENCH_TOOL, true)
         .electric(GTValues.IV)