Added CTM integration for Constructor and Destructor

src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java

@@ -201,8 +201,6 @@ public class ProxyClient extends ProxyCommon {
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("refinedstorage:external_storage", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory"));
@@ -259,6 +257,12 @@ public class ProxyClient extends ProxyCommon {
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north"));
         ModelLoader.setCustomStateMapper(RSBlocks.CRAFTER, new StateMapperCTM("refinedstorage:crafter"));
 
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory"));
+        ModelLoader.setCustomStateMapper(RSBlocks.CONSTRUCTOR, new StateMapperCTM("refinedstorage:constructor"));
+
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory"));
+        ModelLoader.setCustomStateMapper(RSBlocks.DESTRUCTOR, new StateMapperCTM("refinedstorage:destructor"));
+
         ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> {
             ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack));
 

src/main/resources/assets/refinedstorage/blockstates/constructor_glow.json

@@ -0,0 +1,104 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "cable": "refinedstorage:blocks/cable",
+      "particle": "refinedstorage:blocks/cable",
+      "front": "refinedstorage:blocks/constructor_disconnected",
+      "line": "refinedstorage:blocks/generic_grey",
+      "glow": "refinedstorage:blocks/none"
+    },
+    "model": "refinedstorage:cable_core",
+    "uvlock": true
+  },
+  "variants": {
+    "inventory": [
+      {
+        "model": "refinedstorage:constructor_destructor_item",
+        "transform": "forge:default-block"
+      }
+    ],
+    "connected": {
+      "true": {
+        "textures": {
+          "front": "refinedstorage:blocks/constructor_connected",
+          "glow": "refinedstorage:blocks/constructor_connected_glow"
+        }
+      },
+      "false": {
+      }
+    },
+    "direction": {
+      "north": {
+        "submodel": "refinedstorage:constructor_destructor_glow"
+      },
+      "east": {
+        "submodel": "refinedstorage:constructor_destructor_glow",
+        "y": 90
+      },
+      "south": {
+        "submodel": "refinedstorage:constructor_destructor_glow",
+        "x": 180
+      },
+      "west": {
+        "submodel": "refinedstorage:constructor_destructor_glow",
+        "y": 270
+      },
+      "up": {
+        "submodel": "refinedstorage:constructor_destructor_glow",
+        "x": 270
+      },
+      "down": {
+        "submodel": "refinedstorage:constructor_destructor_glow",
+        "x": 90
+      }
+    },
+    "north": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension"
+      },
+      "false": {
+      }
+    },
+    "east": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension",
+        "y": 90
+      },
+      "false": {
+      }
+    },
+    "south": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension",
+        "x": 180
+      },
+      "false": {
+      }
+    },
+    "west": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension",
+        "y": 270
+      },
+      "false": {
+      }
+    },
+    "up": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension",
+        "x": 270
+      },
+      "false": {
+      }
+    },
+    "down": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension",
+        "x": 90
+      },
+      "false": {
+      }
+    }
+  }
+}

src/main/resources/assets/refinedstorage/blockstates/destructor_glow.json

@@ -0,0 +1,104 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "cable": "refinedstorage:blocks/cable",
+      "particle": "refinedstorage:blocks/cable",
+      "front": "refinedstorage:blocks/destructor_disconnected",
+      "line": "refinedstorage:blocks/generic_grey",
+      "glow": "refinedstorage:blocks/none"
+    },
+    "model": "refinedstorage:cable_core",
+    "uvlock": true
+  },
+  "variants": {
+    "inventory": [
+      {
+        "model": "refinedstorage:constructor_destructor_item",
+        "transform": "forge:default-block"
+      }
+    ],
+    "connected": {
+      "true": {
+        "textures": {
+          "front": "refinedstorage:blocks/destructor_connected",
+          "glow": "refinedstorage:blocks/destructor_connected_glow"
+        }
+      },
+      "false": {
+      }
+    },
+    "direction": {
+      "north": {
+        "submodel": "refinedstorage:constructor_destructor_glow"
+      },
+      "east": {
+        "submodel": "refinedstorage:constructor_destructor_glow",
+        "y": 90
+      },
+      "south": {
+        "submodel": "refinedstorage:constructor_destructor_glow",
+        "x": 180
+      },
+      "west": {
+        "submodel": "refinedstorage:constructor_destructor_glow",
+        "y": 270
+      },
+      "up": {
+        "submodel": "refinedstorage:constructor_destructor_glow",
+        "x": 270
+      },
+      "down": {
+        "submodel": "refinedstorage:constructor_destructor_glow",
+        "x": 90
+      }
+    },
+    "north": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension"
+      },
+      "false": {
+      }
+    },
+    "east": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension",
+        "y": 90
+      },
+      "false": {
+      }
+    },
+    "south": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension",
+        "x": 180
+      },
+      "false": {
+      }
+    },
+    "west": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension",
+        "y": 270
+      },
+      "false": {
+      }
+    },
+    "up": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension",
+        "x": 270
+      },
+      "false": {
+      }
+    },
+    "down": {
+      "true": {
+        "submodel": "refinedstorage:cable_extension",
+        "x": 90
+      },
+      "false": {
+      }
+    }
+  }
+}

src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png.mcmeta

@@ -0,0 +1,26 @@
+{
+  "ctm": {
+    "ctm_version": 1,
+    "layer": "CUTOUT",
+    "extra": {
+      "light": 15
+    }
+  },
+  "animation": {
+    "frametime": 2,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11
+    ]
+  }
+}

src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png.mcmeta

@@ -0,0 +1,34 @@
+{
+  "ctm": {
+    "ctm_version": 1,
+    "layer": "CUTOUT",
+    "extra": {
+      "light": 15
+    }
+  },
+  "animation": {
+    "frametime": 1,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19
+    ]
+  }
+}