Built-in connected texture implementation

docs/content/Modpacks/Changes/v8.0.0.md

@@ -125,6 +125,19 @@ 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`

docs/content/Modpacks/Other-Topics/Connected-Textures.md

@@ -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).

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

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/ctm_test"
+    }
+  }
+}

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

@@ -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ɐʎƆ",

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

@@ -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",

src/generated/resources/assets/gtceu/models/block/ctm_test.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "gtceu:block/ctm_test"
+  }
+}

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

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

src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java

@@ -38,23 +38,22 @@
 import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable;
 import com.gregtechceu.gtceu.client.model.IBlockEntityRendererBakedModel;
 import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
-import com.gregtechceu.gtceu.client.util.ModelUtils;
+import com.gregtechceu.gtceu.client.util.RenderUtil;
 import com.gregtechceu.gtceu.common.cover.FluidFilterCover;
 import com.gregtechceu.gtceu.common.cover.ItemFilterCover;
 import com.gregtechceu.gtceu.common.cover.data.ManualIOMode;
 import com.gregtechceu.gtceu.common.machine.owner.MachineOwner;
 import com.gregtechceu.gtceu.common.machine.owner.PlayerOwner;
 import com.gregtechceu.gtceu.common.machine.trait.AutoOutputTrait;
 import com.gregtechceu.gtceu.utils.ExtendedUseOnContext;
+import com.gregtechceu.gtceu.utils.GTStringUtils;
 import com.gregtechceu.gtceu.utils.data.TagCompatibilityFixer;
 
 import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture;
 import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
 import com.lowdragmc.lowdraglib.utils.DummyWorld;
 
 import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.block.BlockRenderDispatcher;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -661,7 +660,7 @@ public void addDebugOverlayText(Consumer<String> lines) {
         // add render state info
         MachineRenderState renderState = this.getRenderState();
         for (var property : renderState.getValues().entrySet()) {
-            lines.accept(ModelUtils.getPropertyValueString(property));
+            lines.accept(GTStringUtils.getPropertyValueString(property));
         }
     }
 
@@ -1011,8 +1010,7 @@ public int getDefaultPaintingColor() {
     @OnlyIn(Dist.CLIENT)
     @Override
     public AABB getRenderBoundingBox() {
-        BlockRenderDispatcher blockRenderDispatcher = Minecraft.getInstance().getBlockRenderer();
-        BakedModel model = blockRenderDispatcher.getBlockModel(this.getBlockState());
+        BakedModel model = RenderUtil.getModelForState(this.getBlockState());
 
         if (model instanceof IBlockEntityRendererBakedModel<?> modelWithBER) {
             if (modelWithBER.getBlockEntityType() == this.getType()) {

src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java

@@ -30,6 +30,7 @@
 import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderManager;
 import com.gregtechceu.gtceu.client.renderer.machine.impl.*;
 import com.gregtechceu.gtceu.client.renderer.machine.impl.BoilerMultiPartRender;
+import com.gregtechceu.gtceu.client.util.ModelEventHelper;
 import com.gregtechceu.gtceu.common.CommonEventListener;
 import com.gregtechceu.gtceu.common.CommonProxy;
 import com.gregtechceu.gtceu.common.data.GTBlockEntities;
@@ -72,6 +73,8 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 
+import java.util.*;
+
 public class ClientProxy extends CommonProxy {
 
     public static final BiMap<ResourceLocation, GTOreDefinition> CLIENT_ORE_VEINS = HashBiMap.create();
@@ -91,6 +94,7 @@ public static void init() {
             CommonEventListener.registerCapes(new RegisterGTCapesEvent());
         }
         initializeDynamicRenders();
+        ModelEventHelper.initInternalAssetReloadListeners();
     }
 
     @SubscribeEvent
@@ -158,7 +162,7 @@ public void onClientSetup(FMLClientSetupEvent event) {
         }
     }
 
-    public static void initializeDynamicRenders() {
+    private static void initializeDynamicRenders() {
         DynamicRenderManager.register(GTCEu.id("quantum_tank_fluid"), QuantumTankFluidRender.TYPE);
         DynamicRenderManager.register(GTCEu.id("quantum_chest_item"), QuantumChestItemRender.TYPE);
 

src/main/java/com/gregtechceu/gtceu/client/model/GTModelProperties.java

@@ -13,6 +13,7 @@ public class GTModelProperties {
 
     public static final ModelProperty<BlockAndTintGetter> LEVEL = new ModelProperty<>();
     public static final ModelProperty<BlockPos> POS = new ModelProperty<>();
+    public static final ModelProperty<ModelData> PARENT_MODEL_DATA = new ModelProperty<>();
 
     public static final ModelProperty<Map<Direction, ModelData>> COVER_MODEL_DATA = new ModelProperty<>();
 

src/main/java/com/gregtechceu/gtceu/client/model/TextureOverrideModel.java

@@ -1,6 +1,6 @@
 package com.gregtechceu.gtceu.client.model;
 
-import com.gregtechceu.gtceu.client.util.GTQuadTransformers;
+import com.gregtechceu.gtceu.client.util.quad.transformers.GTQuadTransformers;
 
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.BakedQuad;
@@ -14,7 +14,6 @@
 import net.minecraftforge.client.model.data.ModelData;
 
 import lombok.Getter;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -23,7 +22,6 @@ public class TextureOverrideModel<T extends BakedModel> extends BakedModelWrappe
 
     public static final IQuadTransformer OVERLAY_OFFSET = GTQuadTransformers.offset(0.002f);
 
-    @NotNull
     @Getter
     protected final Map<String, TextureAtlasSprite> textureOverrides;
 
@@ -37,10 +35,9 @@ public BakedModel getChild() {
     }
 
     @Override
-    public @NotNull List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side,
-                                             @NotNull RandomSource rand, @NotNull ModelData extraData,
-                                             @Nullable RenderType renderType) {
-        return retextureQuads(super.getQuads(state, side, rand, extraData, renderType), textureOverrides);
+    public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side,
+                                    RandomSource rand, ModelData modelData, @Nullable RenderType renderType) {
+        return retextureQuads(super.getQuads(state, side, rand, modelData, renderType), textureOverrides);
     }
 
     public static List<BakedQuad> retextureQuads(List<BakedQuad> quads, Map<String, TextureAtlasSprite> overrides) {

src/main/java/com/gregtechceu/gtceu/client/model/ctm/CTMBakedModel.java

@@ -0,0 +1,59 @@
+package com.gregtechceu.gtceu.client.model.ctm;
+
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.level.BlockAndTintGetter;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.client.model.BakedModelWrapper;
+import net.minecraftforge.client.model.data.ModelData;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+import static com.gregtechceu.gtceu.client.model.GTModelProperties.*;
+
+public class CTMBakedModel<T extends BakedModel> extends BakedModelWrapper<T> {
+
+    public CTMBakedModel(T parent) {
+        super(parent);
+    }
+
+    public BakedModel getParent() {
+        return this.originalModel;
+    }
+
+    @SuppressWarnings("DataFlowIssue")
+    @Override
+    public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side,
+                                    RandomSource rand, ModelData data, @Nullable RenderType renderType) {
+        ModelData parentModelData = data.has(PARENT_MODEL_DATA) ? data.get(PARENT_MODEL_DATA) : data;
+        if (state == null || side == null) {
+            return super.getQuads(state, side, rand, parentModelData, renderType);
+        }
+        BlockAndTintGetter level = data.get(LEVEL);
+        BlockPos pos = data.get(POS);
+        if (level == null || pos == null) {
+            return super.getQuads(state, side, rand, parentModelData, renderType);
+        }
+
+        TextureConnections connections = TextureConnections.getInstance();
+        connections.fillSubmapCache(level, pos, state, side);
+        return CTMMeshBuilder.buildCTMQuads(connections, super.getQuads(state, side, rand, parentModelData, renderType),
+                side);
+    }
+
+    @Override
+    public ModelData getModelData(BlockAndTintGetter level, BlockPos pos, BlockState state, ModelData modelData) {
+        ModelData parentModelData = super.getModelData(level, pos, state, modelData);
+        return ModelData.builder()
+                .with(LEVEL, level)
+                .with(POS, pos)
+                .with(PARENT_MODEL_DATA, parentModelData)
+                .build();
+    }
+}