Remove CTM dependency by implementing connected textures separately. Thanks XFactHD.

Author: PlatinPython

build.gradle

@@ -77,9 +77,6 @@ minecraft {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
-    maven { // CTM
-        url "https://maven.tterrag.com/"
-    }
     maven { // TOP
         url "https://www.cursemaven.com/"
         content {
@@ -89,10 +86,10 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.18.2-40.1.30'
-
-    implementation fg.deobf("team.chisel.ctm:CTM:${ctm_version}")
+    minecraft 'net.minecraftforge:forge:1.18.2-40.1.51'
 
+//    compileOnly fg.deobf("curse.maven:top-245211:3671753:api")
+//    runtimeOnly fg.deobf("curse.maven:top-245211:3671753")
     implementation fg.deobf("curse.maven:top-245211:3671753")
 }
 

src/generated/resources/.cache/cache

@@ -30,7 +30,7 @@ e6ed7024cf7c1b5b2f7c6471f33e70f3ce193e35 assets/rgbblocks/blockstates/wool.json
 d40ba91a88e517775fc5165a5c2c6d333fe94fa6 assets/rgbblocks/blockstates/wool_slab.json
 b5e9859ddfeb05e81ebab545be5b761bae63a41e assets/rgbblocks/blockstates/wool_stairs.json
 ba027282455cdb86afbb41395cb4011131656a2b assets/rgbblocks/lang/en_us.json
-5533dd9da61b4f1d229b5f381392e0a67c66b906 assets/rgbblocks/models/block/antiblock.json
+cb2fe277c64a775f23d1ffc429b0dbc2ce2647e6 assets/rgbblocks/models/block/antiblock.json
 3a4fb210195963f9ba8bf29325dd95678af6d5fc assets/rgbblocks/models/block/carpet.json
 8df58d7e1c24159201fa50db6feb7d9eebc3759f assets/rgbblocks/models/block/concrete.json
 139c59ea138f500550221e630b809af65a64b536 assets/rgbblocks/models/block/concrete_powder.json

src/generated/resources/assets/rgbblocks/models/block/antiblock.json

@@ -1,7 +1,11 @@
 {
-  "parent": "rgbblocks:block/no_shade_2_layer",
-  "textures": {
-    "bot": "rgbblocks:block/white",
-    "top": "rgbblocks:block/antiblock"
+  "parent": "forge:block/default",
+  "loader": "rgbblocks:antiblock_model",
+  "base_model": {
+    "parent": "rgbblocks:block/no_shade_2_layer",
+    "textures": {
+      "bot": "rgbblocks:block/white",
+      "top": "rgbblocks:block/antiblock"
+    }
   }
 }

src/main/java/platinpython/rgbblocks/client/model/AntiblockBakedModel.java

@@ -1,14 +1,13 @@
 package platinpython.rgbblocks.data;
 
+import com.google.gson.JsonObject;
 import net.minecraft.data.DataGenerator;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.RedstoneLampBlock;
 import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.StairBlock;
-import net.minecraftforge.client.model.generators.BlockStateProvider;
-import net.minecraftforge.client.model.generators.ConfiguredModel;
-import net.minecraftforge.client.model.generators.ModelFile;
-import net.minecraftforge.client.model.generators.ModelProvider;
+import net.minecraftforge.client.model.generators.*;
 import net.minecraftforge.common.data.ExistingFileHelper;
 import platinpython.rgbblocks.RGBBlocks;
 import platinpython.rgbblocks.util.RegistryHandler;
@@ -45,12 +44,41 @@ protected void registerStatesAndModels() {
                   models().withExistingParent(BlockRegistry.RGB_GLASS_PANE.getId().toString() + "_noside_alt",
                                               modLoc(ModelProvider.BLOCK_FOLDER + "/template_glass_pane_noside_alt"))
                           .texture("pane", modLoc(ModelProvider.BLOCK_FOLDER + "/glass")));
+        class AntiblockLoaderBuilder extends CustomLoaderBuilder<BlockModelBuilder> {
+            private JsonObject baseModel;
+
+            protected AntiblockLoaderBuilder(BlockModelBuilder parent,
+                                             ExistingFileHelper existingFileHelper) {
+                super(new ResourceLocation(RGBBlocks.MOD_ID, "antiblock_model"), parent, existingFileHelper);
+            }
+
+            public AntiblockLoaderBuilder baseModel(JsonObject baseModel) {
+                this.baseModel = baseModel;
+                models().generatedModels.remove(modLoc("block/" + BlockRegistry.RGB_ANTIBLOCK.getId().getPath() + "_base"));
+                return this;
+            }
+
+            @Override
+            public JsonObject toJson(JsonObject json) {
+                json = super.toJson(json);
+                if (baseModel != null)
+                    json.add("base_model", baseModel);
+                return json;
+            }
+        }
         simpleBlock(BlockRegistry.RGB_ANTIBLOCK.get(),
-                    models().singleTexture(BlockRegistry.RGB_ANTIBLOCK.getId().getPath(),
-                                           modLoc(ModelProvider.BLOCK_FOLDER + "/no_shade_2_layer"),
-                                           "bot",
-                                           modLoc(ModelProvider.BLOCK_FOLDER + "/white"))
-                            .texture("top", modLoc(ModelProvider.BLOCK_FOLDER + "/antiblock")));
+                    models().withExistingParent(BlockRegistry.RGB_ANTIBLOCK.getId().getPath(),
+                                                new ResourceLocation("forge:block/default")
+                            )
+                            .customLoader(AntiblockLoaderBuilder::new)
+                            .baseModel(models().singleTexture(BlockRegistry.RGB_ANTIBLOCK.getId().getPath() + "_base",
+                                                              modLoc(ModelProvider.BLOCK_FOLDER + "/no_shade_2_layer"),
+                                                              "bot",
+                                                              modLoc(ModelProvider.BLOCK_FOLDER + "/white")
+                                               )
+                                               .texture("top", modLoc(ModelProvider.BLOCK_FOLDER + "/antiblock")).toJson())
+                            .end()
+        );
         getVariantBuilder(BlockRegistry.RGB_REDSTONE_LAMP.get()).forAllStates(state -> {
             return state.getValue(RedstoneLampBlock.LIT)
                    ? ConfiguredModel.builder()

src/main/java/platinpython/rgbblocks/data/ModBlockStateProvider.java

@@ -5,6 +5,7 @@
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackCompatibility;
 import net.minecraft.server.packs.repository.PackSource;
@@ -13,6 +14,8 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ColorHandlerEvent;
 import net.minecraftforge.client.event.EntityRenderersEvent;
+import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
@@ -24,6 +27,7 @@
 import platinpython.rgbblocks.client.colorhandlers.RGBBlockColor;
 import platinpython.rgbblocks.client.colorhandlers.RGBBlockItemColor;
 import platinpython.rgbblocks.client.gui.screen.ColorSelectScreen;
+import platinpython.rgbblocks.client.model.AntiblockBakedModel;
 import platinpython.rgbblocks.client.renderer.entity.RGBFallingBlockRenderer;
 import platinpython.rgbblocks.util.pack.RGBBlocksPack;
 import platinpython.rgbblocks.util.registries.BlockRegistry;
@@ -88,6 +92,11 @@ public static void registerColorHandlers(ColorHandlerEvent.Item event) {
         event.getItemColors().register(new PaintBucketItemColor(), ItemRegistry.PAINT_BUCKET.get());
     }
 
+    @SubscribeEvent
+    public static void registerModelStuff(ModelRegistryEvent event) {
+        ModelLoaderRegistry.registerLoader(new ResourceLocation(RGBBlocks.MOD_ID, "antiblock_model"), new AntiblockBakedModel.ModelLoader());
+    }
+
     public static void openColorSelectScreen(int color, boolean isRGBSelected) {
         Minecraft.getInstance().setScreen(new ColorSelectScreen(color, isRGBSelected));
     }

src/main/java/platinpython/rgbblocks/util/ClientUtils.java

@@ -10,7 +10,7 @@ issueTrackerURL="https://github.com/PlatinPython/RGBBlocks/issues"
   description="Blocks in almost all colors you can imagine."
   logoFile="logo.png"
   logoBlur=true
-  credits="Thanks TobiBenzi for the logo and some textures"
+  credits="Thanks TobiBenzi for the logo and some textures, Thanks XFactHD for implementing the CTM Model"
   authors="PlatinPython"
   displayURL="https://www.curseforge.com/minecraft/mc-mods/rgb-blocks-forge"
 
@@ -27,10 +27,3 @@ issueTrackerURL="https://github.com/PlatinPython/RGBBlocks/issues"
   versionRange="[1.18.2,)"
   ordering="NONE"
   side="BOTH"
-
-[[dependencies.rgbblocks]]
-  modId="ctm"
-  mandatory=true
-  versionRange="[MC1.18.2-1,)"
-  ordering="NONE"
-  side="CLIENT"