Added CTM integration for Disk Manipulator, remove Processing Pattern Encoder GUI texture, fixes #1406

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.5.15
+- Added CTM integration for Disk Manipulator (raoulvdberge)
+
 ### 1.5.14
 - Updated Forge to 2426 (raoulvdberge)
 - Updated French translation (cylek56)

src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java

@@ -15,6 +15,7 @@ import java.util.function.Function;
 
 public class ModelDiskDrive implements IModel {
     private static final ResourceLocation MODEL_BASE = new ResourceLocation("refinedstorage:block/disk_drive");
+
     private static final ResourceLocation MODEL_DISK = new ResourceLocation("refinedstorage:block/disk");
     private static final ResourceLocation MODEL_DISK_NEAR_CAPACITY = new ResourceLocation("refinedstorage:block/disk_near_capacity");
     private static final ResourceLocation MODEL_DISK_FULL = new ResourceLocation("refinedstorage:block/disk_full");

src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java

@@ -7,20 +7,25 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.IModel;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.model.IModelState;
+import net.minecraftforge.fml.common.Loader;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
 
 public class ModelDiskManipulator implements IModel {
-    private static final ResourceLocation MODEL_BASE_CONNECTED = new ResourceLocation("refinedstorage:block/disk_manipulator_connected");
+    private static final ResourceLocation MODEL_BASE_CONNECTED = new ResourceLocation("refinedstorage:block/disk_manipulator_connected" + (Loader.isModLoaded("ctm") ? "_glow" : ""));
     private static final ResourceLocation MODEL_BASE_DISCONNECTED = new ResourceLocation("refinedstorage:block/disk_manipulator_disconnected");
+
     private static final ResourceLocation MODEL_DISK = new ResourceLocation("refinedstorage:block/disk");
     private static final ResourceLocation MODEL_DISK_NEAR_CAPACITY = new ResourceLocation("refinedstorage:block/disk_near_capacity");
     private static final ResourceLocation MODEL_DISK_FULL = new ResourceLocation("refinedstorage:block/disk_full");
     private static final ResourceLocation MODEL_DISK_DISCONNECTED = new ResourceLocation("refinedstorage:block/disk_disconnected");
 
+    private static final ResourceLocation TEXTURE_BASE_CONNECTED_GLOW = new ResourceLocation("refinedstorage:blocks/disk_manipulator_connected_glow");
+
     @Override
     public Collection<ResourceLocation> getDependencies() {
         List<ResourceLocation> dependencies = new ArrayList<>();
@@ -35,6 +40,11 @@ public class ModelDiskManipulator implements IModel {
         return dependencies;
     }
 
+    @Override
+    public Collection<ResourceLocation> getTextures() {
+        return Collections.singletonList(TEXTURE_BASE_CONNECTED_GLOW);
+    }
+
     @Override
     public IBakedModel bake(IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter) {
         IModel baseModelConnected, baseModelDisconnected;

src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected_glow.json

@@ -0,0 +1,69 @@
+{
+  "parent": "block/block",
+  "textures": {
+    "particle": "refinedstorage:blocks/disk_manipulator_connected",
+    "front": "refinedstorage:blocks/disk_manipulator_connected",
+    "glow": "refinedstorage:blocks/disk_manipulator_connected_glow",
+    "bottom": "refinedstorage:blocks/side",
+    "top": "refinedstorage:blocks/side",
+    "side": "refinedstorage:blocks/side"
+  },
+  "elements": [
+    {
+      "from": [
+        0,
+        0,
+        0
+      ],
+      "to": [
+        16,
+        16,
+        16
+      ],
+      "faces": {
+        "down": {
+          "texture": "#bottom",
+          "cullface": "down"
+        },
+        "up": {
+          "texture": "#top",
+          "cullface": "up"
+        },
+        "north": {
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "south": {
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": {
+          "texture": "#side",
+          "cullface": "west"
+        },
+        "east": {
+          "texture": "#side",
+          "cullface": "east"
+        }
+      }
+    },
+    {
+      "from": [
+        0,
+        0,
+        0
+      ],
+      "to": [
+        16,
+        16,
+        16
+      ],
+      "faces": {
+        "north": {
+          "texture": "#glow",
+          "cullface": "north"
+        }
+      }
+    }
+  ]
+}

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

@@ -0,0 +1,9 @@
+{
+  "ctm": {
+    "ctm_version": 1,
+    "layer": "CUTOUT",
+    "extra": {
+      "light": 15
+    }
+  }
+}