fix 1.21 ctm and bloom

src/generated/resources/assets/gtceu/blockstates/connected_texture_test.json

@@ -0,0 +1,150 @@
+{
+    "variants": {
+        "facing=down,upwards_facing=down": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=down,upwards_facing=east": {
+            "gtceu:z": 90,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "x": 90
+        },
+        "facing=down,upwards_facing=north": {
+            "model": "gtceu:block/machine/connected_texture_test",
+            "x": 90
+        },
+        "facing=down,upwards_facing=south": {
+            "gtceu:z": 180,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "x": 90
+        },
+        "facing=down,upwards_facing=up": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=down,upwards_facing=west": {
+            "gtceu:z": 270,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "x": 90
+        },
+        "facing=east,upwards_facing=down": {
+            "gtceu:z": 180,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 90
+        },
+        "facing=east,upwards_facing=east": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=east,upwards_facing=north": {
+            "gtceu:z": 270,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 90
+        },
+        "facing=east,upwards_facing=south": {
+            "gtceu:z": 90,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 90
+        },
+        "facing=east,upwards_facing=up": {
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 90
+        },
+        "facing=east,upwards_facing=west": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=north,upwards_facing=down": {
+            "gtceu:z": 180,
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=north,upwards_facing=east": {
+            "gtceu:z": 90,
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=north,upwards_facing=north": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=north,upwards_facing=south": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=north,upwards_facing=up": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=north,upwards_facing=west": {
+            "gtceu:z": 270,
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=south,upwards_facing=down": {
+            "gtceu:z": 180,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 180
+        },
+        "facing=south,upwards_facing=east": {
+            "gtceu:z": 270,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 180
+        },
+        "facing=south,upwards_facing=north": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=south,upwards_facing=south": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=south,upwards_facing=up": {
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 180
+        },
+        "facing=south,upwards_facing=west": {
+            "gtceu:z": 90,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 180
+        },
+        "facing=up,upwards_facing=down": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=up,upwards_facing=east": {
+            "gtceu:z": 90,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "x": 270
+        },
+        "facing=up,upwards_facing=north": {
+            "gtceu:z": 180,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "x": 270
+        },
+        "facing=up,upwards_facing=south": {
+            "model": "gtceu:block/machine/connected_texture_test",
+            "x": 270
+        },
+        "facing=up,upwards_facing=up": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=up,upwards_facing=west": {
+            "gtceu:z": 270,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "x": 270
+        },
+        "facing=west,upwards_facing=down": {
+            "gtceu:z": 180,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 270
+        },
+        "facing=west,upwards_facing=east": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        },
+        "facing=west,upwards_facing=north": {
+            "gtceu:z": 90,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 270
+        },
+        "facing=west,upwards_facing=south": {
+            "gtceu:z": 270,
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 270
+        },
+        "facing=west,upwards_facing=up": {
+            "model": "gtceu:block/machine/connected_texture_test",
+            "y": 270
+        },
+        "facing=west,upwards_facing=west": {
+            "model": "gtceu:block/machine/connected_texture_test"
+        }
+    }
+}

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

@@ -188,6 +188,7 @@
     "block.gtceu.computer_casing": "buısɐƆ ɹǝʇndɯoƆ",
     "block.gtceu.computer_heat_vent": "ʇuǝΛ ʇɐǝH ɹǝʇndɯoƆ",
     "block.gtceu.configurable_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW ǝןqɐɹnbıɟuoƆ",
+    "block.gtceu.connected_texture_test": "ʇsǝ⟘ ǝɹnʇxǝ⟘ pǝʇɔǝuuoƆ",
     "block.gtceu.corrosion_proof_casing": "buısɐƆ ɟooɹԀ uoısoɹɹoƆ",
     "block.gtceu.cracked_dark_concrete_bricks": "sʞɔıɹᗺ ǝʇǝɹɔuoƆ ʞɹɐᗡ pǝʞɔɐɹƆ",
     "block.gtceu.cracked_light_concrete_bricks": "sʞɔıɹᗺ ǝʇǝɹɔuoƆ ʇɥbıꞀ pǝʞɔɐɹƆ",
@@ -344,7 +345,6 @@
     "block.gtceu.gregification_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH uoıʇɐɔıɟıbǝɹ⅁",
     "block.gtceu.heat_vent": "ʇuǝΛ ʇɐǝH",
     "block.gtceu.heatproof_machine_casing": "buısɐƆ ǝuıɥɔɐW ɹɐʌuI ɟooɹԀ ʇɐǝH",
-    "block.gtceu.heavy_oil": "ןıO ʎʌɐǝH",
     "block.gtceu.high_performance_computation_array": ")ⱯƆԀH( ʎɐɹɹⱯ uoıʇɐʇndɯoƆ ǝɔuɐɯɹoɟɹǝԀ ɥbıH",
     "block.gtceu.high_power_casing": "buısɐƆ ɹǝʍoԀ ɥbıH",
     "block.gtceu.high_pressure_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH ǝɹnssǝɹԀ ɥbıH",
@@ -588,7 +588,6 @@
     "block.gtceu.light_gray_large_metal_sheet": "ʇǝǝɥS ןɐʇǝW ǝbɹɐꞀ ʎɐɹ⅁ ʇɥbıꞀ",
     "block.gtceu.light_gray_metal_sheet": "ʇǝǝɥS ןɐʇǝW ʎɐɹ⅁ ʇɥbıꞀ",
     "block.gtceu.light_gray_studs": "spnʇS ʎɐɹ⅁ ʇɥbıꞀ",
-    "block.gtceu.light_oil": "ןıO ʇɥbıꞀ",
     "block.gtceu.lime_borderless_lamp": "dɯɐꞀ ssǝןɹǝpɹoᗺ ǝɯıꞀ",
     "block.gtceu.lime_lamp": "dɯɐꞀ ǝɯıꞀ",
     "block.gtceu.lime_large_metal_sheet": "ʇǝǝɥS ןɐʇǝW ǝbɹɐꞀ ǝɯıꞀ",
@@ -924,7 +923,6 @@
     "block.gtceu.mv_wiremill": "ɹ§ ןןıɯǝɹıM pǝɔuɐʌpⱯq§",
     "block.gtceu.mv_world_accelerator": "ɹ§ ɹoʇɐɹǝןǝɔɔⱯ pןɹoM pǝɔuɐʌpⱯq§",
     "block.gtceu.naquadah_coil_block": "ʞɔoןᗺ ןıoƆ ɥɐpɐnbɐN",
-    "block.gtceu.natural_gas": "sɐ⅁ ןɐɹnʇɐN",
     "block.gtceu.network_switch": "ɥɔʇıʍS ʞɹoʍʇǝN",
     "block.gtceu.nichrome_coil_block": "ʞɔoןᗺ ןıoƆ ǝɯoɹɥɔıN",
     "block.gtceu.noise_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH ǝsıoN",
@@ -1061,7 +1059,6 @@
     "block.gtceu.purple_studs": "spnʇS ǝןdɹnԀ",
     "block.gtceu.pyrolyse_oven": "uǝʌO ǝsʎןoɹʎԀ",
     "block.gtceu.radioactive_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH ǝʌıʇɔɐoıpɐᴚ",
-    "block.gtceu.raw_oil": "ןıO ʍɐᴚ",
     "block.gtceu.reaction_safe_mixing_casing": "buısɐƆ buıxıW ǝɟɐS-uoıʇɔɐǝᴚ",
     "block.gtceu.red_borderless_lamp": "dɯɐꞀ ssǝןɹǝpɹoᗺ pǝᴚ",
     "block.gtceu.red_granite": "ǝʇıuɐɹ⅁ pǝᴚ",
@@ -1153,6 +1150,7 @@
     "block.gtceu.substation_capacitor.tooltip_empty": "uoıʇɐʇsqnS ɹǝʍoԀ ɹnoʎ uı ǝɔɐds buıןןıɟ ɹoℲㄥ§",
     "block.gtceu.substation_capacitor.tooltip_filled": "∩Ǝ %dɟ§ :ʎʇıɔɐdɐƆ ʎbɹǝuƎɔ§",
     "block.gtceu.superconducting_coil": "ʞɔoןᗺ ןıoƆ buıʇɔnpuoɔɹǝdnS",
+    "block.gtceu.surface_rock": "ʞɔoᴚ ǝɔɐɟɹnS %s",
     "block.gtceu.tempered_glass": "ssɐן⅁ pǝɹǝdɯǝ⟘",
     "block.gtceu.test_mui": "ınW ʇsǝ⟘",
     "block.gtceu.the_end_marker": "puƎ ǝɥ⟘",
@@ -1743,7 +1741,6 @@
     "block.gtceu.zpm_transformer_4a": "ɹǝɯɹoɟsuɐɹ⟘ )xㄣ( dɯⱯ-ıH ɹ§ǝbɐʇןoΛ WԀZɔ§",
     "block.gtceu.zpm_wiremill": "ɹ§III ןןıɯǝɹıM ǝʇıןƎɔ§",
     "block.gtceu.zpm_world_accelerator": "ɹ§III ɹoʇɐɹǝןǝɔɔⱯ pןɹoM ǝʇıןƎɔ§",
-    "block.gtceu.surface_rock": "ʞɔoᴚ ǝɔɐɟɹnS %s",
     "button.gtceu.mark_as_depleted.name": "pǝʇǝןdǝᗡ sɐ ʞɹɐW",
     "button.gtceu.toggle_waypoint.name": "ʇuıodʎɐM ǝןbbo⟘",
     "command.gtceu.cape.failure.does_not_exist": "ʇsıxǝ ʇou sǝop %s ǝdɐƆ",

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

@@ -188,6 +188,7 @@
     "block.gtceu.computer_casing": "Computer Casing",
     "block.gtceu.computer_heat_vent": "Computer Heat Vent",
     "block.gtceu.configurable_maintenance_hatch": "Configurable Maintenance Hatch",
+    "block.gtceu.connected_texture_test": "Connected Texture Test",
     "block.gtceu.corrosion_proof_casing": "Corrosion Proof Casing",
     "block.gtceu.cracked_dark_concrete_bricks": "Cracked Dark Concrete Bricks",
     "block.gtceu.cracked_light_concrete_bricks": "Cracked Light Concrete Bricks",
@@ -344,7 +345,6 @@
     "block.gtceu.gregification_hazard_sign_block": "Gregification Hazard Sign Block",
     "block.gtceu.heat_vent": "Heat Vent",
     "block.gtceu.heatproof_machine_casing": "Heat Proof Invar Machine Casing",
-    "block.gtceu.heavy_oil": "Heavy Oil",
     "block.gtceu.high_performance_computation_array": "High Performance Computation Array (HPCA)",
     "block.gtceu.high_power_casing": "High Power Casing",
     "block.gtceu.high_pressure_hazard_sign_block": "High Pressure Hazard Sign Block",
@@ -588,7 +588,6 @@
     "block.gtceu.light_gray_large_metal_sheet": "Light Gray Large Metal Sheet",
     "block.gtceu.light_gray_metal_sheet": "Light Gray Metal Sheet",
     "block.gtceu.light_gray_studs": "Light Gray Studs",
-    "block.gtceu.light_oil": "Light Oil",
     "block.gtceu.lime_borderless_lamp": "Lime Borderless Lamp",
     "block.gtceu.lime_lamp": "Lime Lamp",
     "block.gtceu.lime_large_metal_sheet": "Lime Large Metal Sheet",
@@ -924,7 +923,6 @@
     "block.gtceu.mv_wiremill": "§bAdvanced Wiremill §r",
     "block.gtceu.mv_world_accelerator": "§bAdvanced World Accelerator §r",
     "block.gtceu.naquadah_coil_block": "Naquadah Coil Block",
-    "block.gtceu.natural_gas": "Natural Gas",
     "block.gtceu.network_switch": "Network Switch",
     "block.gtceu.nichrome_coil_block": "Nichrome Coil Block",
     "block.gtceu.noise_hazard_sign_block": "Noise Hazard Sign Block",
@@ -1061,7 +1059,6 @@
     "block.gtceu.purple_studs": "Purple Studs",
     "block.gtceu.pyrolyse_oven": "Pyrolyse Oven",
     "block.gtceu.radioactive_hazard_sign_block": "Radioactive Hazard Sign Block",
-    "block.gtceu.raw_oil": "Raw Oil",
     "block.gtceu.reaction_safe_mixing_casing": "Reaction-Safe Mixing Casing",
     "block.gtceu.red_borderless_lamp": "Red Borderless Lamp",
     "block.gtceu.red_granite": "Red Granite",
@@ -1153,6 +1150,7 @@
     "block.gtceu.substation_capacitor.tooltip_empty": "§7For filling space in your Power Substation",
     "block.gtceu.substation_capacitor.tooltip_filled": "§cEnergy Capacity: §f%d EU",
     "block.gtceu.superconducting_coil": "Superconducting Coil Block",
+    "block.gtceu.surface_rock": "%s Surface Rock",
     "block.gtceu.tempered_glass": "Tempered Glass",
     "block.gtceu.test_mui": "Test Mui",
     "block.gtceu.the_end_marker": "The End",
@@ -1743,7 +1741,6 @@
     "block.gtceu.zpm_transformer_4a": "§cZPM Voltage§r Hi-Amp (4x) Transformer",
     "block.gtceu.zpm_wiremill": "§cElite Wiremill III§r",
     "block.gtceu.zpm_world_accelerator": "§cElite World Accelerator III§r",
-    "block.gtceu.surface_rock": "%s Surface Rock",
     "button.gtceu.mark_as_depleted.name": "Mark as Depleted",
     "button.gtceu.toggle_waypoint.name": "Toggle Waypoint",
     "command.gtceu.cape.failure.does_not_exist": "Cape %s does not exist",

src/generated/resources/assets/gtceu/models/block/machine/connected_texture_test.json

@@ -0,0 +1,50 @@
+{
+    "parent": "minecraft:block/block",
+    "loader": "gtceu:machine",
+    "machine": "gtceu:connected_texture_test",
+    "texture_overrides": {
+        "all": "gtceu:block/ctm_test"
+    },
+    "variants": {
+        "recipe_logic_status=idle": {
+            "model": {
+                "parent": "gtceu:block/machine/template/cube_all/sided",
+                "textures": {
+                    "all": "gtceu:block/ctm_test",
+                    "overlay_front": "gtceu:block/multiblock/electric_blast_furnace/overlay_front",
+                    "overlay_front_emissive": "gtceu:block/multiblock/electric_blast_furnace/overlay_front_emissive"
+                }
+            }
+        },
+        "recipe_logic_status=suspend": {
+            "model": {
+                "parent": "gtceu:block/machine/template/cube_all/sided",
+                "textures": {
+                    "all": "gtceu:block/ctm_test",
+                    "overlay_front": "gtceu:block/multiblock/electric_blast_furnace/overlay_front_paused",
+                    "overlay_front_emissive": "gtceu:block/multiblock/electric_blast_furnace/overlay_front_paused_emissive"
+                }
+            }
+        },
+        "recipe_logic_status=waiting": {
+            "model": {
+                "parent": "gtceu:block/machine/template/cube_all/sided",
+                "textures": {
+                    "all": "gtceu:block/ctm_test",
+                    "overlay_front": "gtceu:block/multiblock/electric_blast_furnace/overlay_front_active",
+                    "overlay_front_emissive": "gtceu:block/multiblock/electric_blast_furnace/overlay_front_active_emissive"
+                }
+            }
+        },
+        "recipe_logic_status=working": {
+            "model": {
+                "parent": "gtceu:block/machine/template/cube_all/sided",
+                "textures": {
+                    "all": "gtceu:block/ctm_test",
+                    "overlay_front": "gtceu:block/multiblock/electric_blast_furnace/overlay_front_active",
+                    "overlay_front_emissive": "gtceu:block/multiblock/electric_blast_furnace/overlay_front_active_emissive"
+                }
+            }
+        }
+    }
+}

src/generated/resources/assets/gtceu/models/item/connected_texture_test.json

@@ -0,0 +1,3 @@
+{
+    "parent": "gtceu:block/machine/connected_texture_test"
+}

src/main/java/com/gregtechceu/gtceu/api/fluids/FluidBuilder.java

@@ -299,6 +299,7 @@ public Supplier<? extends Fluid> build(Material material, FluidStorageKey key, G
                         return IClientFluidTypeExtensions.of(state.getFluidState())
                                 .getTintColor(state.getFluidState(), level, pos);
                     })
+                    .setData(ProviderType.LANG, NonNullBiConsumer.noop())
                     .register();
         } else {
             // noinspection DataFlowIssue

src/main/java/com/gregtechceu/gtceu/api/multiblock/Predicates.java

@@ -38,6 +38,7 @@
 
 import java.util.*;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 public class Predicates {
@@ -76,6 +77,12 @@ public static PatternPredicate blocks(Block... blocks) {
         return new PatternPredicate(new PredicateBlocks(blocks));
     }
 
+    @SafeVarargs
+    @HideFromJS
+    public static PatternPredicate blocks(Supplier<Block>... blocks) {
+        return blocks(Arrays.stream(blocks).map(Supplier::get).toArray(Block[]::new));
+    }
+
     /*
      * public static PatternPredicate blocks(IMachineBlock... blocks) {
      * return new PatternPredicate(

src/main/java/com/gregtechceu/gtceu/client/bloom/BloomEventListeners.java

@@ -77,7 +77,7 @@ public static void registerNamedRenderTypes(RegisterNamedRenderTypesEvent event)
             block = GTRenderTypes.bloom();
             entity = GTRenderTypes.entityBloomBlockSheet();
         } else {
-            // if safe mode is enabled, register the named render type as a copy of forge's 'cutout'
+            // if safe mode is enabled, register the named render type as a copy of neoforge's 'cutout'
             block = RenderType.cutoutMipped();
             entity = NeoForgeRenderTypes.ITEM_LAYERED_CUTOUT.get();
         }