Officially reintroduce CTM compat

build.gradle

@@ -128,12 +128,11 @@ repositories {
 }
 
 dependencies {
-    //compile "team.chisel.ctm:CTM:${project.ctm_version}"
     compileOnly fg.deobf("mezz.jei:jei-${mc_version_jei}:${jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:jei-${mc_version_jei}:${jei_version}")
 
     runtimeOnly fg.deobf("com.sk88q.worldedit:WorldEdit:${we_version}")
-//    runtimeOnly fg.deobf("team.chisel.ctm:CTM:1.1.0.8")
+    runtimeOnly fg.deobf("team.chisel.ctm:CTM:${project.ctm_version}")
     runtimeOnly fg.deobf("me.ichun.mods.tabula.common:Tabula:10.2.0")
     runtimeOnly fg.deobf("me.ichun.mods.ichunutil.common:iChunUtil:10.2.0")
 

gradle.properties

@@ -26,7 +26,7 @@ mod_group=androsa.gaiadimension
 
 archives_base_name=gaiadimension
 
-ctm_version=MC1.12.2-0.3.2.20
+ctm_version=MC1.16.1-1.1.2.6
 
 jei_version=7.6.1.71
 

src/generated/resources/.cache/cache

@@ -468,7 +468,7 @@ b774f0287bc12847984fea58cb76e11fcf2a9c51 assets/gaiadimension/models/block/jade_
 bb0cfb4029ffed952a27e44634436c84f4f99c7d assets/gaiadimension/models/block/jet_brick_stairs_inner.json
 8dc2d93a4d90fae2890c4be832581feb1e18f2bf assets/gaiadimension/models/block/jet_brick_stairs_outer.json
 0f4857ae756c5ffc37ab9df7349db21571f37849 assets/gaiadimension/models/block/jet_bricks.json
-2a7c30432a223a953c827863e7a3eaab2ac8c6ce assets/gaiadimension/models/block/keystone_block.json
+b98bed7a856897e5baceb659c5cc0dd7fade13fe assets/gaiadimension/models/block/keystone_block.json
 eff3f5143f2847e57d1065a9a494cbea70bcfba0 assets/gaiadimension/models/block/labradorite_block.json
 0f1f0441887fafc3bf052bc707274978fa47d97f assets/gaiadimension/models/block/labradorite_ore.json
 948ef60e86e3c690b37242b4e527be68d9a2776e assets/gaiadimension/models/block/leucite_block.json
@@ -644,7 +644,7 @@ fe6d5c49d5cba0bca66ec68e9a28ca90505be6c0 assets/gaiadimension/models/block/thisc
 a31c123b2daa09ac90c24b2cc8df7d35d220ddff assets/gaiadimension/models/block/thorny_wiltha.json
 7ae9d47c540d4d28115f0b1727224818f0b11803 assets/gaiadimension/models/block/varloom.json
 6b50570cead9e7fa8072226c102efaf2c969e0c4 assets/gaiadimension/models/block/volcanic_rock.json
-77c28ef150583c022408c0101679dfbb0abf1f13 assets/gaiadimension/models/block/wasteland_stone.json
+2a9a3132b2a011df8c08cd68f815490e0c9648b9 assets/gaiadimension/models/block/wasteland_stone.json
 e20784c91663d8112bd2939d8306341fff78e6d5 assets/gaiadimension/models/item/active_rock.json
 2d0d497011eedacd31ca47e2094b053b8e765fec assets/gaiadimension/models/item/agate_arrow.json
 6415670f1e682e28cbdd99726cf765dca857ae89 assets/gaiadimension/models/item/agate_axe.json

src/generated/resources/assets/gaiadimension/models/block/keystone_block.json

@@ -1,6 +1,7 @@
 {
-  "parent": "minecraft:block/cube_all",
+  "parent": "gaiadimension:block/util/cube_all_2_layer",
   "textures": {
-    "all": "gaiadimension:block/keystone_block"
+    "all": "gaiadimension:block/keystone_block",
+    "all2": "gaiadimension:block/keystone_block_empty"
   }
 }

src/generated/resources/assets/gaiadimension/models/block/wasteland_stone.json

@@ -1,6 +1,7 @@
 {
-  "parent": "minecraft:block/cube_all",
+  "parent": "gaiadimension:block/util/cube_all_2_layer",
   "textures": {
-    "all": "gaiadimension:block/wasteland_stone"
+    "all": "gaiadimension:block/wasteland_stone",
+    "all2": "gaiadimension:block/wasteland_stone_static"
   }
 }

src/main/java/androsa/gaiadimension/client/ClientEvents.java

@@ -181,6 +181,7 @@ public static void registerBlockRenderers() {
         RenderType cutoutM = RenderType.cutoutMipped();
         RenderType translucent = RenderType.translucent();
 
+        renderBlock(ModBlocks.keystone_block, translucent);
         renderBlock(ModBlocks.gaia_portal, translucent);
         renderBlock(ModBlocks.gold_fire, cutout);
         renderBlock(ModBlocks.pyrite_torch, cutout);
@@ -233,6 +234,7 @@ public static void registerBlockRenderers() {
         renderBlock(ModBlocks.burnt_leaves, cutoutM);
         renderBlock(ModBlocks.burning_leaves, cutoutM);
         renderBlock(ModBlocks.aura_leaves, cutoutM);
+        renderBlock(ModBlocks.wasteland_stone, translucent);
         renderBlock(ModBlocks.static_stone, translucent);
         renderBlock(ModBlocks.charged_mineral, translucent);
         renderBlock(ModBlocks.searing_rock, translucent);

src/main/java/androsa/gaiadimension/data/GaiaBlockStates.java

@@ -22,7 +22,7 @@ public String getName() {
 
     @Override
     protected void registerStatesAndModels() {
-        basicBlock(ModBlocks.keystone_block);
+        basicBlockLayered(ModBlocks.keystone_block, "keystone_block", "keystone_block_empty");
         crossBlock(ModBlocks.gold_fire);
         torchBlock(ModBlocks.pyrite_torch, ModBlocks.pyrite_wall_torch);
         sidedBlock(ModBlocks.agate_crafting_table, "agate_table_top", "agate_table_bottom", "agate_table_front", "agate_table_side", "agate_table_side", "agate_table_side");
@@ -124,7 +124,7 @@ protected void registerStatesAndModels() {
         basicBlock(ModBlocks.pebbles);
         basicBlockRotated(ModBlocks.gaia_stone);
         basicBlock(ModBlocks.gaia_cobblestone);
-        basicBlock(ModBlocks.wasteland_stone);
+        basicBlockLayered(ModBlocks.wasteland_stone, "wasteland_stone", "wasteland_stone_static");
         basicBlockLayered(ModBlocks.static_stone, "wasteland_stone", "static_stone");
         basicBlock(ModBlocks.charged_mineral);
         basicBlock(ModBlocks.volcanic_rock);