connected textures support

JaisDK · JaisDK · commit bf2e8c736be6 · 2025-03-09T14:51:14.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -122,6 +122,8 @@ dependencies {
     implementation "curse.maven:productivebees-377897:5611632"
     implementation "curse.maven:storage-drawers-223852:5633810"
     implementation "curse.maven:mekanism-268560:5574951"
+    implementation "curse.maven:fusion-connected-textures-854949:6183288"
+    implementation "curse.maven:dyenamics-509276:6137368"
 
     // Example optional mod dependency with JEI
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
diff --git a/changelog.txt b/changelog.txt
@@ -0,0 +1,3 @@
+1.21.1-0.2.0
+
+- Added support for connected textures
diff --git a/gradle.properties b/gradle.properties
@@ -34,7 +34,7 @@ mod_name=Camol
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=All Rights Reserved
 # The mod version. See https://semver.org/
-mod_version=1.21.1-0.1.0
+mod_version=1.21.1-0.2.0
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
diff --git a/src/main/java/cy/jdkdigital/camol/Camol.java b/src/main/java/cy/jdkdigital/camol/Camol.java
@@ -59,17 +59,18 @@ public class Camol
     public static final Supplier<DataComponentType<BlockState>> BLOCK_COMPONENT = DATA_COMPONENTS.register("block", () -> DataComponentType.<BlockState>builder().persistent(BlockState.CODEC).networkSynchronized(ByteBufCodecs.fromCodec(BlockState.CODEC)).build());
 
     public static final Supplier<AttachmentType<Map<String, BlockState>>> CAMO_BLOCK_MAP = ATTACHMENT_TYPES.register(
-        "camo", () -> AttachmentType.<Map<String, BlockState>>builder(() -> new HashMap<>()).serialize(Codec.unboundedMap(Codec.STRING, BlockState.CODEC)).build()
+            "camo", () -> AttachmentType.<Map<String, BlockState>>builder(() -> new HashMap<>()).serialize(Codec.unboundedMap(Codec.STRING, BlockState.CODEC)).build()
     );
 
     public static final DeferredHolder<RecipeSerializer<?>, RecipeSerializer<?>> SIMPLE_CAMO_CRAFTING = RECIPE_SERIALIZERS.register("simple_camo_crafting", () -> new SimpleCraftingRecipeSerializer<>(SimpleCamoCraftingRecipe::new));
-    public static final DeferredHolder<RecipeType<?>, RecipeType<SimpleCamoCraftingRecipe>> SIMPLE_CAMO_CRAFTING_TYPE = RECIPE_TYPES.register("simple_camo_crafting", () -> new RecipeType<>() {});
+    public static final DeferredHolder<RecipeType<?>, RecipeType<SimpleCamoCraftingRecipe>> SIMPLE_CAMO_CRAFTING_TYPE = RECIPE_TYPES.register("simple_camo_crafting", () -> new RecipeType<>()
+    {
+    });
 
     public static final TagKey<Block> CAMO_BLACKLIST = BlockTags.create(ResourceLocation.fromNamespaceAndPath(MODID, "disallowed_camoable_blocks"));
     public static final TagKey<Item> CRAFTING_BLACKLIST = ItemTags.create(ResourceLocation.fromNamespaceAndPath(MODID, "disallowed_camo_blocks"));
 
-    public Camol(IEventBus modEventBus, ModContainer modContainer)
-    {
+    public Camol(IEventBus modEventBus, ModContainer modContainer) {
         ITEMS.register(modEventBus);
         BLOCKS.register(modEventBus);
         BLOCK_ENTITIES.register(modEventBus);
@@ -91,8 +92,7 @@ public Camol(IEventBus modEventBus, ModContainer modContainer)
     }
 
     // Add the example block item to the building blocks tab
-    private void addCreative(BuildCreativeModeTabContentsEvent event)
-    {
+    private void addCreative(BuildCreativeModeTabContentsEvent event) {
         if (event.getTabKey() == CreativeModeTabs.FUNCTIONAL_BLOCKS) {
             ITEMS.getEntries().forEach(itemDeferredHolder -> {
                 event.accept(itemDeferredHolder.value());
diff --git a/src/main/java/cy/jdkdigital/camol/Config.java b/src/main/java/cy/jdkdigital/camol/Config.java
@@ -13,7 +13,6 @@ public class Config
     static final ModConfigSpec SPEC = BUILDER.build();
 
     @SubscribeEvent
-    static void onLoad(final ModConfigEvent event)
-    {
+    static void onLoad(final ModConfigEvent event) {
     }
 }
diff --git a/src/main/java/cy/jdkdigital/camol/common/item/CamoItem.java b/src/main/java/cy/jdkdigital/camol/common/item/CamoItem.java
@@ -13,6 +13,7 @@
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.neoforged.neoforge.network.PacketDistributor;
@@ -32,10 +33,10 @@ public InteractionResult useOn(UseOnContext context) {
             String posKey = String.valueOf(context.getClickedPos().asLong());
             var chunk = serverLevel.getChunkAt(context.getClickedPos());
             var camoData = new HashMap<>(chunk.getData(Camol.CAMO_BLOCK_MAP));
-            if (camoData.containsKey(posKey)) {
+            if (camoData.containsKey(posKey) && !camoData.get(posKey).isAir()) {
                 var camoState = camoData.get(posKey);
                 Block.popResourceFromFace(serverLevel, context.getClickedPos(), context.getClickedFace(), getCamoItem(camoState));
-                camoData.remove(posKey);
+                camoData.put(posKey, Blocks.AIR.defaultBlockState());
             } else {
                 var camoState = context.getItemInHand().get(Camol.BLOCK_COMPONENT);
                 if (camoState != null) {
diff --git a/src/main/java/cy/jdkdigital/camol/common/recipe/SimpleCamoCraftingRecipe.java b/src/main/java/cy/jdkdigital/camol/common/recipe/SimpleCamoCraftingRecipe.java
@@ -13,7 +13,8 @@
 
 public class SimpleCamoCraftingRecipe implements CraftingRecipe
 {
-    public SimpleCamoCraftingRecipe(CraftingBookCategory category) {}
+    public SimpleCamoCraftingRecipe(CraftingBookCategory category) {
+    }
 
     @Override
     public CraftingBookCategory category() {
diff --git a/src/main/java/cy/jdkdigital/camol/datagen/RecipeProvider.java b/src/main/java/cy/jdkdigital/camol/datagen/RecipeProvider.java
@@ -35,6 +35,6 @@ protected void buildRecipes(RecipeOutput pRecipeOutput) {
     }
 
     private static ResourceLocation prefixedRecipeId(ItemLike item, String prefix) {
-        return BuiltInRegistries.ITEM.getKey(item.asItem()).withPath(path ->  prefix + path);
+        return BuiltInRegistries.ITEM.getKey(item.asItem()).withPath(path -> prefix + path);
     }
 }
diff --git a/src/main/java/cy/jdkdigital/camol/event/ClientEventHandler.java b/src/main/java/cy/jdkdigital/camol/event/ClientEventHandler.java
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import cy.jdkdigital.camol.Camol;
+import cy.jdkdigital.camol.utils.CamoHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
@@ -13,7 +14,7 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.phys.shapes.Shapes;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
@@ -23,37 +24,31 @@
 import net.neoforged.neoforge.client.model.pipeline.VertexConsumerWrapper;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @EventBusSubscriber(modid = Camol.MODID, value = Dist.CLIENT)
 public class ClientEventHandler
 {
     public static boolean shouldBeTransparent = false;
     public static boolean isTransparent = false;
+
     @SubscribeEvent
     public static void onRenderLevelStage(RenderLevelStageEvent event) {
         if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_TRANSLUCENT_BLOCKS) {
             return;
         }
 
+        // Change transparency of camo blocks when switching items in hand
         if (Minecraft.getInstance().level != null && shouldBeTransparent != isTransparent) {
             isTransparent = shouldBeTransparent;
             Set<SectionPos> sections = new HashSet<>();
 
-            var chunkStorage = Minecraft.getInstance().level.getChunkSource().storage;
-
-            int i = chunkStorage.chunkRadius;
-            for (int j = chunkStorage.viewCenterZ - i; j <= chunkStorage.viewCenterZ + i; j++) {
-                for (int k = chunkStorage.viewCenterX - i; k <= chunkStorage.viewCenterX + i; k++) {
-                    LevelChunk levelchunk = chunkStorage.chunks.get(chunkStorage.getIndex(k, j));
-                    if (levelchunk != null) {
-                        levelchunk.getData(Camol.CAMO_BLOCK_MAP).keySet().forEach(posKey -> {
-                            sections.add(SectionPos.of(BlockPos.of((Long.parseLong(posKey)))));
-                        });
-                    }
-                }
-            }
+            CamoHelper.CLIENT_CAMO_MAP.entrySet().stream().filter(entry -> !entry.getValue().isAir()).forEach(entry -> {
+                sections.add(SectionPos.of(BlockPos.of((Long.parseLong(entry.getKey())))));
+            });
 
             for (SectionPos section : sections) {
                 Minecraft.getInstance().levelRenderer.setSectionDirty(section.x(), section.y(), section.z());
@@ -65,7 +60,8 @@ public static void onRenderLevelStage(RenderLevelStageEvent event) {
     public static void geometryEvent(AddSectionGeometryEvent event) {
         SectionPos section = SectionPos.of(event.getSectionOrigin());
 
-        Map<BlockPos, BlockState> camoBlocks = event.getLevel().getChunkAt(event.getSectionOrigin()).getData(Camol.CAMO_BLOCK_MAP).entrySet().stream()
+        Map<BlockPos, BlockState> camoBlocks = CamoHelper.CLIENT_CAMO_MAP.entrySet().stream()
+                .filter(entry -> !entry.getValue().isAir())
                 .filter(p -> SectionPos.of(BlockPos.of(Long.parseLong(p.getKey()))).equals(section))
                 .collect(Collectors.toMap(e -> BlockPos.of(Long.parseLong(e.getKey())), Map.Entry::getValue));
 
@@ -86,9 +82,11 @@ public static void geometryEvent(AddSectionGeometryEvent event) {
                     poseStack.pushPose();
                     poseStack.translate(SectionPos.sectionRelative(pos.getX()), SectionPos.sectionRelative(pos.getY()), SectionPos.sectionRelative(pos.getZ()));
 
-                    poseStack.translate(0.5, 0.5, 0.5);
-                    poseStack.scale(1.005F, 1.005F, 1.005F);
-                    poseStack.translate(-0.5, -0.5, -0.5);
+//                    if (level.getBlockState(pos).getShape(level, pos).equals(Shapes.block())) {
+                        poseStack.translate(0.5, 0.5, 0.5);
+                        poseStack.scale(1.005F, 1.005F, 1.005F);
+                        poseStack.translate(-0.5, -0.5, -0.5);
+//                    }
 
                     boolean shouldRenderTransparentCamo = Minecraft.getInstance().player.getItemInHand(InteractionHand.MAIN_HAND).is(Camol.CAMO_ITEM);
                     for (RenderType renderType : model.getRenderTypes(camoState, random, ModelData.EMPTY)) {
diff --git a/src/main/java/cy/jdkdigital/camol/event/ClientModEventHandler.java b/src/main/java/cy/jdkdigital/camol/event/ClientModEventHandler.java
@@ -14,10 +14,12 @@
 import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent;
 
 @EventBusSubscriber(modid = Camol.MODID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
-public class ClientModEventHandler {
+public class ClientModEventHandler
+{
     @SubscribeEvent
     public static void registerClientExtensions(RegisterClientExtensionsEvent event) {
-        event.registerItem(new IClientItemExtensions() {
+        event.registerItem(new IClientItemExtensions()
+        {
             final BlockEntityWithoutLevelRenderer myRenderer = new CamoItemRenderer();
 
             @Override
diff --git a/src/main/java/cy/jdkdigital/camol/event/ModEventHandler.java b/src/main/java/cy/jdkdigital/camol/event/ModEventHandler.java
@@ -15,12 +15,12 @@ public class ModEventHandler
     public static void register(final RegisterPayloadHandlersEvent event) {
         final PayloadRegistrar registrar = event.registrar(Camol.MODID).versioned("1");
         registrar.playToClient(
-            SyncChunkCamoData.TYPE,
-            SyncChunkCamoData.STREAM_CODEC,
-            new DirectionalPayloadHandler<>(
-                    SyncChunkCamoData::clientHandle,
-                    SyncChunkCamoData::serverHandle
-            )
+                SyncChunkCamoData.TYPE,
+                SyncChunkCamoData.STREAM_CODEC,
+                new DirectionalPayloadHandler<>(
+                        SyncChunkCamoData::clientHandle,
+                        SyncChunkCamoData::serverHandle
+                )
         );
     }
 }
diff --git a/src/main/java/cy/jdkdigital/camol/mixin/MixinBlock.java b/src/main/java/cy/jdkdigital/camol/mixin/MixinBlock.java
@@ -0,0 +1,29 @@
+package cy.jdkdigital.camol.mixin;
+
+import cy.jdkdigital.camol.utils.CamoHelper;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Mixin(Block.class)
+public abstract class MixinBlock
+{
+    @ModifyVariable(
+            method = "shouldRenderFace(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;)Z",
+            at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/level/BlockGetter;getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;"), index = 5
+    )
+    private static BlockState shouldRenderCamoFace(BlockState value, BlockState state, BlockGetter level, BlockPos pos, Direction side, BlockPos sidePos) {
+        if (pos != null && side != null) {
+            var camoState = CamoHelper.getClientCamoBlockState(pos.relative(side));
+            if (camoState != null && !camoState.isAir()) {
+                return camoState;
+            }
+        }
+        return value;
+    }
+}
diff --git a/src/main/java/cy/jdkdigital/camol/mixin/MixinBlockState.java b/src/main/java/cy/jdkdigital/camol/mixin/MixinBlockState.java
@@ -0,0 +1,29 @@
+package cy.jdkdigital.camol.mixin;
+
+import cy.jdkdigital.camol.utils.CamoHelper;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.BlockAndTintGetter;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
+import net.neoforged.neoforge.common.extensions.IBlockStateExtension;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(BlockState.class)
+public abstract class MixinBlockState extends BlockBehaviour.BlockStateBase implements IBlockStateExtension
+{
+    private MixinBlockState() {
+        super(null, null, null);
+    }
+
+    @Override
+    public BlockState getAppearance(BlockAndTintGetter blockGetter, BlockPos pos, Direction side, @Nullable BlockState queryState, @Nullable BlockPos queryPos) {
+        BlockState camoState = CamoHelper.getClientCamoBlockState(pos);
+        if (camoState != null && !camoState.isAir()) {
+            return camoState.getBlock().getAppearance(camoState, blockGetter, pos, side, queryState, queryPos);
+        }
+        return getBlock().getAppearance(this.asState(), blockGetter, pos, side, queryState, queryPos);
+    }
+}
diff --git a/src/main/java/cy/jdkdigital/camol/network/SyncChunkCamoData.java b/src/main/java/cy/jdkdigital/camol/network/SyncChunkCamoData.java
@@ -2,13 +2,13 @@
 
 import com.mojang.serialization.Codec;
 import cy.jdkdigital.camol.Camol;
+import cy.jdkdigital.camol.utils.CamoHelper;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.neoforge.network.handling.IPayloadContext;
@@ -33,8 +33,10 @@ public Type<? extends CustomPacketPayload> type() {
     }
 
     public static void clientHandle(final SyncChunkCamoData data, final IPayloadContext context) {
-        context.player().level().getChunkAt(data.chunkPos).setData(Camol.CAMO_BLOCK_MAP, data.data);
+        // Add camos to global client map
+        CamoHelper.CLIENT_CAMO_MAP.putAll(data.data);
 
+        // Update changed position
         var state = context.player().level().getBlockState(data.chunkPos);
         context.player().level().setBlocksDirty(data.chunkPos, state.isAir() ? Blocks.DIRT.defaultBlockState() : Blocks.AIR.defaultBlockState(), state);
     }
diff --git a/src/main/java/cy/jdkdigital/camol/utils/CamoHelper.java b/src/main/java/cy/jdkdigital/camol/utils/CamoHelper.java
@@ -1,15 +1,30 @@
 package cy.jdkdigital.camol.utils;
 
 import cy.jdkdigital.camol.Camol;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class CamoHelper
 {
+    public static Map<String, BlockState> CLIENT_CAMO_MAP = new HashMap<>();
+
+    public static BlockState getClientCamoBlockState(BlockPos pos) {
+        String posKey = String.valueOf(pos.asLong());
+        return CLIENT_CAMO_MAP.getOrDefault(posKey, Blocks.AIR.defaultBlockState());
+    }
+
     public static BlockState getCamoBlockState(Level level, BlockPos pos) {
         String posKey = String.valueOf(pos.asLong());
-        var camoMap = level.getData(Camol.CAMO_BLOCK_MAP);
+        if (level instanceof ClientLevel) {
+            return CLIENT_CAMO_MAP.getOrDefault(posKey, Blocks.AIR.defaultBlockState());
+        }
+        var camoMap = level.getChunkAt(pos).getData(Camol.CAMO_BLOCK_MAP);
         if (camoMap.containsKey(posKey)) {
             return camoMap.get(posKey);
         }
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
@@ -51,7 +51,8 @@ description='''${mod_description}'''
 #[[accessTransformers]]
 #file="META-INF/accesstransformer.cfg"
 
-# The coremods config file path is not configurable and is always loaded from META-INF/coremods.json
+[[mixins]]
+    config="camol.mixin.json"
 
 # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
 [[dependencies.${mod_id}]] #optional
diff --git a/src/main/resources/camol.mixin.json b/src/main/resources/camol.mixin.json
@@ -0,0 +1,16 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "cy.jdkdigital.camol.mixin",
+  "compatibilityLevel": "JAVA_21",
+  "refmap": "camol.refmap.json",
+  "mixins": [
+    "MixinBlock",
+    "MixinBlockState"
+  ],
+  "client": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+1.21.1-0.2.0`
	`2`	`+`
	`3`	`+- Added support for connected textures`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public class Config`
`13`	`13`	`static final ModConfigSpec SPEC = BUILDER.build();`
`14`	`14`
`15`	`15`	`@SubscribeEvent`
`16`		`- static void onLoad(final ModConfigEvent event)`
`17`		`- {`
	`16`	`+ static void onLoad(final ModConfigEvent event) {`
`18`	`17`	`}`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`
`14`	`14`	`public class SimpleCamoCraftingRecipe implements CraftingRecipe`
`15`	`15`	`{`
`16`		`- public SimpleCamoCraftingRecipe(CraftingBookCategory category) {}`
	`16`	`+ public SimpleCamoCraftingRecipe(CraftingBookCategory category) {`
	`17`	`+ }`
`17`	`18`
`18`	`19`	`@Override`
`19`	`20`	`public CraftingBookCategory category() {`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ protected void buildRecipes(RecipeOutput pRecipeOutput) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`private static ResourceLocation prefixedRecipeId(ItemLike item, String prefix) {`
`38`		`- return BuiltInRegistries.ITEM.getKey(item.asItem()).withPath(path -> prefix + path);`
	`38`	`+ return BuiltInRegistries.ITEM.getKey(item.asItem()).withPath(path -> prefix + path);`
`39`	`39`	`}`
`40`	`40`	`}`