GregTechCEu · screret · Jul 19, 2025 · Jul 19, 2025 · Jul 19, 2025 · Jul 23, 2025
@@ -22,5 +22,6 @@ classes/
 src/generated/resources/.cache/
 
 *.patch
+*.cap
 *.DS_Store
 
@@ -42,8 +42,7 @@ dependencies {
     modCompileOnly(forge.architectury)
     modCompileOnly(forge.rhino)
 
-    // Shimmer
-    modCompileOnly(forge.shimmer)
+    // Performance
     modCompileOnly(forge.embeddium)
     modCompileOnly(forge.oculus)
     modCompileOnly(forge.modernfix)

@@ -125,9 +125,22 @@ A large number of machine feature interfaces have been removed, and have had the
 - `IFluidRendererMulti` - Use `MultiblockFluidRendererTrait`
 
 
+## Connected texture reimplementation
+The mod's connected texture logic has been reimplemented in GTM proper.
+Texture packs, addons, and modpacks will have to change their texture metadata files for connected texures slightly.  
+A few regexes for fixing all the MCMeta files is follows, run them in order:
+
+1. Match: `"ldlib":([\s\{]*)"connection"(:\s".*?")(?:,\s.*)?`  
+   Replace with: `"gtceu":$1"connection_texture"$2` 
+2. Match: `\s*\},\s*"shimmer":\s*\{(\s*"bloom":.*)`  
+   Replace with: `,$1` 
+3. Match: `(\{\s*)"shimmer":(\s*\{\s*"bloom":.*)`  
+   Replace with: `$1"gtceu":$2` 
+
+
 ## Other Changes
 
 - `BlastingRecipeBuilder`, `CampfireRecipeBuilder`, `SmeltingRecipeBuilder` and `SmokingRecipeBuilder` have been merged into `SimpleCookingRecipeBuilder`
     - Example usage: `SimpleCookingRecipeBuilder.campfireCooking("cooking_chicken").input(new ItemStack(Items.CHICKEN)).output(new ItemStacks(Items.COOKED_CHICKEN)).cookingTime(100).experience(100).save(provider);`
 - `GTFluidImpl` has been merged into `GTFluid`, use `GTFluid.Flowing` and `GTFluid.Source` instead of `GTFluidImpl.Flowing` and `GTFluidImpl.Source`.
-- Item behaviors have been moved to `common/item/behavior`, and some items have been moved from `api/item` to `common/item`.
+- Item behaviors have been moved to `common/item/behavior`, and some items have been moved from `api/item` to `common/item`.
@@ -0,0 +1,63 @@
+---
+title: Creating Connected Textures
+---
+
+**Connected textures** are, as the name would imply, textures that connect with neighboring blocks.
+
+The CTM renderer will draw the block faces by assembling 4 quadrants from the 5 available block textures.
+The normal `texture.png` is the block's "unconnected" texture, and is used when CTM is disabled or the block
+has nothing to connect to.  
+`texture.png` has the outside corner quadrants and `texture_ctm.png` contains the connections.
+```
+┌─────────────────┐ ┌────────────────────────────────┐
+│ texture.png     │ │ texture_ctm.png                │
+│ ╔══════╤══════╗ │ │  ──────┼────── ║ ─────┼───── ║ │
+│ ║      │      ║ │ │ │      │      │║      │      ║ │
+│ ║ 4/4  │ 4/5  ║ │ │ │ 0/0  │ 0/1  │║ 0/2  │ 0/3  ║ │
+│ ╟──────┼──────╢ │ │ ┼──────┼──────┼╟──────┼──────╢ │
+│ ║      │      ║ │ │ │      │      │║      │      ║ │
+│ ║ 5/4  │ 5/5  ║ │ │ │ 1/0  │ 1/1  │║ 1/2  │ 1/3  ║ │
+│ ╚══════╧══════╝ │ │  ──────┼────── ║ ─────┼───── ║ │
+└─────────────────┘ │ ═══════╤═══════╝ ─────┼───── ╚ │
+                    │ │      │      ││      │      │ │
+                    │ │ 2/0  │ 2/1  ││ 2/2  │ 2/3  │ │
+                    │ ┼──────┼──────┼┼──────┼──────┼ │
+                    │ │      │      ││      │      │ │
+                    │ │ 3/0  │ 3/1  ││ 3/2  │ 3/3  │ │
+                    │ ═══════╧═══════╗ ─────┼───── ╔ │
+                    └────────────────────────────────┘
+```
+
+For example, combining sections 4/4, 2/1, 5/4, and 3/1, we can generate a texture connected to the right!
+```
+╔══════╤═══════
+║      │      │
+║ 4/4  │ 2/1  │
+╟──────┼──────┼
+║      │      │
+║ 5/4  │ 3/1  │
+╚══════╧═══════
+```  
+Combining sections 0/2, 2/3, 5/4, and 3/1, we can generate a texture in the shape of an L (connected to the right and up):
+```
+║ ─────┼───── ╚
+║      │      │
+║ 0/2  │ 2/3  │
+╟──────┼──────┼
+║      │      │
+║ 5/4  │ 3/1  │
+╚══════╧═══════
+```
+
+
+??? example "Example MCMeta file"
+    (For a texture `mypack/assets/textures/blocks/texture.png` with a ctm texture `mypack/assets/textures/blocks/texture_ctm.png`)
+    ```json title="mypack:blocks/texture.png.mcmeta"
+    {
+        "gtceu": {
+            "connection_texture": "mypack:blocks/texture_ctm"
+        }
+    }
+    ```
+    The CTM texture layout is [here](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/resources/assets/gtceu/textures/block/ctm_test.png) for the unconnected texture and [here](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/resources/assets/gtceu/textures/block/ctm_test_ctm.png) for its connections.
+    Its MCMeta metadata file is [this one](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/resources/assets/gtceu/textures/block/ctm_test.png.mcmeta).
@@ -30,7 +30,7 @@ xaerosMinimap = "25.3.10"
 
 ## modrinth maven ##
 jade = "11.6.3"
-embeddium = "0.3.31+mc1.20.1"
+embeddium = "0.3.31-beta.53+mc1.20.1"
 oculus = "1.20.1-1.8.0"
 modernfix = "DdUByV9S" # 5.24.1+mc1.20.1
 
@@ -86,7 +86,7 @@ ftbteams            = { module = "dev.ftb.mods:ftb-teams-forge", version.ref = "
 ftbquests           = { module = "dev.ftb.mods:ftb-quests-forge", version.ref = "ftbquests" }
 ftbchunks           = { module = "dev.ftb.mods:ftb-chunks-forge", version.ref = "ftbchunks" }
 jade                = { module = "maven.modrinth:jade", version.ref = "jade" }
-embeddium           = { module = "maven.modrinth:embeddium", version.ref = "embeddium" }
+embeddium           = { module = "org.embeddedt:embeddium-1.20.1", version.ref = "embeddium" }
 oculus              = { module = "maven.modrinth:oculus", version.ref = "oculus" }
 modernfix           = { module = "maven.modrinth:modernfix", version.ref = "modernfix" }
 xaeroslib           = { module = "xaero.lib:xaerolib-forge-1.20.1", version.ref = "xaerosLib" }

@@ -152,10 +152,16 @@ legacyForge {
             // Enable assertions for our classes in dev environment
             jvmArgument('-ea:com.gregtechceu.gtceu...')
 
+            // jvmArgument("-XX:+AllowEnhancedClassRedefinition")
+            jvmArgument("-XX:+AllowRedefinitionToAddDeleteMethods")
+
             // Recommended logging level for the console
             // You can set various levels here.
             // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             logLevel = org.slf4j.event.Level.INFO
+
+            // Disable JOML using scientific notation for its types' toString() outputs
+            systemProperty 'joml.format', 'false'
         }
     }
 }

@@ -12,9 +12,12 @@ repositories {
         }
     }
 
-    maven { // JEI
-        name = "Jared's Maven"
-        url = "https://maven.blamejared.com/"
+    exclusiveContent { // Create, Ponder, Flywheel
+        forRepository { maven { url = "https://maven.blamejared.com" } }
+        filter {
+            includeGroup("mezz.jei")
+            includeGroup("org.embeddedt")
+        }
     }
 
     maven { // JEI mirror, AE2
@@ -37,7 +40,7 @@ repositories {
     }
     exclusiveContent { // KubeJS and Rhino
         forRepository { maven { url = "https://maven.latvian.dev/releases" } }
-        filter { includeGroup("dev.latvian.mods")}
+        filter { includeGroup("dev.latvian.mods") }
     }
     exclusiveContent { // FTB mods
         forRepository { maven { url = "https://maven.ftb.dev/releases" } }

@@ -1,6 +1,12 @@
 {
     "net/minecraft/client/renderer/block/model/BakedQuad": [
-        "com/gregtechceu/gtceu/core/IGTBakedQuad"
+        "com/gregtechceu/gtceu/core/util/extensions/BakedQuadExt"
+    ],
+    "com/mojang/blaze3d/vertex/VertexConsumer": [
+        "com/gregtechceu/gtceu/core/util/extensions/VertexConsumerExt"
+    ],
+    "net/minecraftforge/client/model/lighting/QuadLighter": [
+        "com/gregtechceu/gtceu/core/util/extensions/QuadLighterExt"
     ],
     "net/minecraft/world/entity/Entity": [
         "com/gregtechceu/gtceu/core/IFireImmuneEntity",

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/ctm_test"
+    }
+  }
+}
@@ -187,6 +187,7 @@
   "block.gtceu.creative_tank": "ʞuɐ⟘ ǝʌıʇɐǝɹƆ",
   "block.gtceu.creosote": "ǝʇosoǝɹƆ",
   "block.gtceu.crushing_wheels": "sןǝǝɥM buıɥsnɹƆ",
+  "block.gtceu.ctm_test": "ʞɔoןᗺ ʇsǝ⟘ ǝɹnʇxǝ⟘ pǝʇɔǝuuoƆ",
   "block.gtceu.cupronickel_coil_block": "ʞɔoןᗺ ןıoƆ ןǝʞɔıuoɹdnƆ",
   "block.gtceu.cyan_borderless_lamp": "dɯɐꞀ ssǝןɹǝpɹoᗺ uɐʎƆ",
   "block.gtceu.cyan_lamp": "dɯɐꞀ uɐʎƆ",
@@ -1762,9 +1763,13 @@
   "config.gtceu.option.arcRecyclingYield": "pןǝıʎbuıןɔʎɔǝᴚɔɹɐ",
   "config.gtceu.option.armorHud": "pnHɹoɯɹɐ",
   "config.gtceu.option.autoRebuildResources": "sǝɔɹnosǝᴚpןınqǝᴚoʇnɐ",
+  "config.gtceu.option.baseBrightness": "ssǝuʇɥbıɹᗺǝsɐq",
   "config.gtceu.option.batchDuration": "uoıʇɐɹnᗡɥɔʇɐq",
   "config.gtceu.option.bedrockOreDistance": "ǝɔuɐʇsıᗡǝɹOʞɔoɹpǝq",
   "config.gtceu.option.bedrockOreDropTagPrefix": "xıɟǝɹԀbɐ⟘doɹᗡǝɹOʞɔoɹpǝq",
+  "config.gtceu.option.bloom": "ɯooןq",
+  "config.gtceu.option.bloomType": "ǝdʎ⟘ɯooןq",
+  "config.gtceu.option.bloomType.load_error": "sןıɐʇǝp ɹoɟ %s ǝǝs 'ʇɔǝɟɟǝ ɯooןq ǝɥʇ ɹoɟ sɹǝpɐɥs pɐoן ʇou pןnoƆ",
   "config.gtceu.option.borderColor": "ɹoןoƆɹǝpɹoq",
   "config.gtceu.option.bronzeBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺǝzuoɹq",
   "config.gtceu.option.bronzeBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺǝzuoɹq",
@@ -1790,6 +1795,7 @@
   "config.gtceu.option.drum": "ɯnɹp",
   "config.gtceu.option.dumpAssets": "sʇǝssⱯdɯnp",
   "config.gtceu.option.dumpRecipes": "sǝdıɔǝᴚdɯnp",
+  "config.gtceu.option.emissiveTexturesHaveBloom": "ɯooןᗺǝʌɐHsǝɹnʇxǝ⟘ǝʌıssıɯǝ",
   "config.gtceu.option.enableArcRecycling": "buıןɔʎɔǝᴚɔɹⱯǝןqɐuǝ",
   "config.gtceu.option.enableCleanroom": "ɯooɹuɐǝןƆǝןqɐuǝ",
   "config.gtceu.option.enableExtractorRecycling": "buıןɔʎɔǝᴚɹoʇɔɐɹʇxƎǝןqɐuǝ",
@@ -1853,7 +1859,9 @@
   "config.gtceu.option.machinesEmissiveTextures": "sǝɹnʇxǝ⟘ǝʌıssıɯƎsǝuıɥɔɐɯ",
   "config.gtceu.option.machinesHaveBERsByDefault": "ʇןnɐɟǝᗡʎᗺsᴚƎᗺǝʌɐHsǝuıɥɔɐɯ",
   "config.gtceu.option.maintenanceCheckRate": "ǝʇɐᴚʞɔǝɥƆǝɔuɐuǝʇuıɐɯ",
+  "config.gtceu.option.maxBrightness": "ssǝuʇɥbıɹᗺxɐɯ",
   "config.gtceu.option.meHatchEnergyUsage": "ǝbɐs∩ʎbɹǝuƎɥɔʇɐHǝɯ",
+  "config.gtceu.option.minBrightness": "ssǝuʇɥbıɹᗺuıɯ",
   "config.gtceu.option.minerSpeed": "pǝǝdSɹǝuıɯ",
   "config.gtceu.option.minimap": "dɐɯıuıɯ",
   "config.gtceu.option.nanoSaber": "ɹǝqɐSouɐu",
@@ -1905,6 +1913,8 @@
   "config.gtceu.option.steelBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺןǝǝʇs",
   "config.gtceu.option.steelBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺןǝǝʇs",
   "config.gtceu.option.steelSteamMultiblocks": "sʞɔoןqıʇןnWɯɐǝʇSןǝǝʇs",
+  "config.gtceu.option.step": "dǝʇs",
+  "config.gtceu.option.strength": "ɥʇbuǝɹʇs",
   "config.gtceu.option.surfaceRockProspectRange": "ǝbuɐᴚʇɔǝdsoɹԀʞɔoᴚǝɔɐɟɹns",
   "config.gtceu.option.tankItemFluidPreview": "ʍǝıʌǝɹԀpınןℲɯǝʇIʞuɐʇ",
   "config.gtceu.option.temperaturesInCelsius": "snısןǝƆuIsǝɹnʇɐɹǝdɯǝʇ",

@@ -187,6 +187,7 @@
   "block.gtceu.creative_tank": "Creative Tank",
   "block.gtceu.creosote": "Creosote",
   "block.gtceu.crushing_wheels": "Crushing Wheels",
+  "block.gtceu.ctm_test": "Connected Texture Test Block",
   "block.gtceu.cupronickel_coil_block": "Cupronickel Coil Block",
   "block.gtceu.cyan_borderless_lamp": "Cyan Borderless Lamp",
   "block.gtceu.cyan_lamp": "Cyan Lamp",
@@ -1762,9 +1763,13 @@
   "config.gtceu.option.arcRecyclingYield": "arcRecyclingYield",
   "config.gtceu.option.armorHud": "armorHud",
   "config.gtceu.option.autoRebuildResources": "autoRebuildResources",
+  "config.gtceu.option.baseBrightness": "baseBrightness",
   "config.gtceu.option.batchDuration": "batchDuration",
   "config.gtceu.option.bedrockOreDistance": "bedrockOreDistance",
   "config.gtceu.option.bedrockOreDropTagPrefix": "bedrockOreDropTagPrefix",
+  "config.gtceu.option.bloom": "bloom",
+  "config.gtceu.option.bloomType": "bloomType",
+  "config.gtceu.option.bloomType.load_error": "Could not load shaders for the bloom effect, see %s for details",
   "config.gtceu.option.borderColor": "borderColor",
   "config.gtceu.option.bronzeBoilerHeatSpeed": "bronzeBoilerHeatSpeed",
   "config.gtceu.option.bronzeBoilerMaxTemperature": "bronzeBoilerMaxTemperature",
@@ -1790,6 +1795,7 @@
   "config.gtceu.option.drum": "drum",
   "config.gtceu.option.dumpAssets": "dumpAssets",
   "config.gtceu.option.dumpRecipes": "dumpRecipes",
+  "config.gtceu.option.emissiveTexturesHaveBloom": "emissiveTexturesHaveBloom",
   "config.gtceu.option.enableArcRecycling": "enableArcRecycling",
   "config.gtceu.option.enableCleanroom": "enableCleanroom",
   "config.gtceu.option.enableExtractorRecycling": "enableExtractorRecycling",
@@ -1853,7 +1859,9 @@
   "config.gtceu.option.machinesEmissiveTextures": "machinesEmissiveTextures",
   "config.gtceu.option.machinesHaveBERsByDefault": "machinesHaveBERsByDefault",
   "config.gtceu.option.maintenanceCheckRate": "maintenanceCheckRate",
+  "config.gtceu.option.maxBrightness": "maxBrightness",
   "config.gtceu.option.meHatchEnergyUsage": "meHatchEnergyUsage",
+  "config.gtceu.option.minBrightness": "minBrightness",
   "config.gtceu.option.minerSpeed": "minerSpeed",
   "config.gtceu.option.minimap": "minimap",
   "config.gtceu.option.nanoSaber": "nanoSaber",
@@ -1905,6 +1913,8 @@
   "config.gtceu.option.steelBoilerHeatSpeed": "steelBoilerHeatSpeed",
   "config.gtceu.option.steelBoilerMaxTemperature": "steelBoilerMaxTemperature",
   "config.gtceu.option.steelSteamMultiblocks": "steelSteamMultiblocks",
+  "config.gtceu.option.step": "step",
+  "config.gtceu.option.strength": "strength",
   "config.gtceu.option.surfaceRockProspectRange": "surfaceRockProspectRange",
   "config.gtceu.option.tankItemFluidPreview": "tankItemFluidPreview",
   "config.gtceu.option.temperaturesInCelsius": "temperaturesInCelsius",

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "gtceu:block/ctm_test"
+  }
+}
@@ -0,0 +1,3 @@
+{
+  "parent": "gtceu:block/ctm_test"
+}
@@ -96,7 +96,7 @@ public static boolean isDataGen() {
 
     /**
      * A friendly reminder that the server instance is populated on the server side only, so null/side check it!
-     * 
+     *
      * @return the current minecraft server instance
      */
     public static MinecraftServer getMinecraftServer() {
@@ -108,12 +108,14 @@ public static MinecraftServer getMinecraftServer() {
      * @return if the mod whose id is {@code modId} is loaded or not
      */
     public static boolean isModLoaded(String modId) {
-        return ModList.get().isLoaded(modId);
+        ModList modList = ModList.get();
+        if (modList != null) return modList.isLoaded(modId);
+        else return FMLLoader.getLoadingModList().getModFileById(modId) != null;
     }
 
     /**
      * For async stuff use this, otherwise use {@link GTCEu isClientSide}
-     * 
+     *
      * @return if the current thread is the client thread
      */
     public static boolean isClientThread() {
@@ -132,7 +134,7 @@ public static boolean isClientSide() {
 
     /**
      * This check isn't the same for client and server!
-     * 
+     *
      * @return if it's safe to access the current instance {@link net.minecraft.world.level.Level Level} on client or if
      *         it's safe to access any level on server.
      */
@@ -175,9 +177,8 @@ public static boolean isIrisOculusLoaded() {
             return isModLoaded(GTValues.MODID_IRIS) || isModLoaded(GTValues.MODID_OCULUS);
         }
 
-        public static boolean isSodiumRubidiumEmbeddiumLoaded() {
-            return isModLoaded(GTValues.MODID_SODIUM) || isModLoaded(GTValues.MODID_RUBIDIUM) ||
-                    isModLoaded(GTValues.MODID_EMBEDDIUM);
+        public static boolean isSodiumEmbeddiumLoaded() {
+            return isModLoaded(GTValues.MODID_SODIUM) || isModLoaded(GTValues.MODID_EMBEDDIUM);
         }
 
         public static boolean isAE2Loaded() {
@@ -188,10 +189,6 @@ public static boolean isCuriosLoaded() {
             return isModLoaded(GTValues.MODID_CURIOS);
         }
 
-        public static boolean isShimmerLoaded() {
-            return isModLoaded(GTValues.MODID_SHIMMER);
-        }
-
         public static boolean isModernFixLoaded() {
             return isModLoaded(GTValues.MODID_MODERNFIX);
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,5 +22,6 @@ classes/ @@
     src/generated/resources/.cache/
     *.patch
+    *.cap
     *.DS_Store