Added visual indicator of item conduit mode.

MartinSVK12 · Apr 2, 2024 · ac71bf8 · ac71bf8
1 parent 7cb6c93
commit ac71bf8
Show file tree

Hide file tree

Showing 25 changed files with 303 additions and 28 deletions.
diff --git a/...main/java/sunsetsatellite/signalindustries/blocks/states/ItemConduitStateInterpreter.java b/...main/java/sunsetsatellite/signalindustries/blocks/states/ItemConduitStateInterpreter.java
@@ -48,6 +48,7 @@ public HashMap<String, String> getStateMap(WorldSource worldSource, int i, int j
             states.put(direction.getName().toLowerCase(), String.valueOf(show));
             if(tile != null){
                 states.put("restrict_"+direction.getName().toLowerCase(), String.valueOf(tile.restrictDirections.get(direction)));
+                states.put("mode",tile.mode.name());
             }
         }
         return states;

diff --git a/...n/resources/assets/signalindustries/block/item_conduit_basic_restrict_split.png b/...n/resources/assets/signalindustries/block/item_conduit_basic_restrict_split.png
diff --git a/src/main/resources/assets/signalindustries/block/item_conduit_basic_split.png b/src/main/resources/assets/signalindustries/block/item_conduit_basic_split.png
diff --git a/src/main/resources/assets/signalindustries/block/item_conduit_prototype_split.png b/src/main/resources/assets/signalindustries/block/item_conduit_prototype_split.png
diff --git a/src/main/resources/assets/signalindustries/block/itempipe.png b/src/main/resources/assets/signalindustries/block/itempipe.png
diff --git a/src/main/resources/assets/signalindustries/block/itempipeopaque.png b/src/main/resources/assets/signalindustries/block/itempipeopaque.png
diff --git a/src/main/resources/assets/signalindustries/blockstates/basic_item_conduit.json b/src/main/resources/assets/signalindustries/blockstates/basic_item_conduit.json
@@ -7,50 +7,135 @@
     },
     {
       "apply": {
-        "model": "signalindustries:conduit/item/basic/conduit_up"
+        "model": "signalindustries:conduit/item/basic/split/conduit_base"
       },
       "when": {
-        "up": "true"
+        "mode": "SPLIT"
       }
     },
     {
-      "apply": {
-        "model": "signalindustries:conduit/item/basic/conduit_down"
-      },
       "when": {
-        "down": "true"
+        "AND": [
+          {"up": "true"},{"mode": "SPLIT"}
+        ]
+      },
+      "apply": {
+        "model": "signalindustries:conduit/item/basic/split/conduit_up"
       }
     },
     {
+      "when": {
+        "AND": [
+          {"up": "true"},{"mode": "RANDOM"}
+        ]
+      },
       "apply": {
-        "model": "signalindustries:conduit/item/basic/conduit_north"
+        "model": "signalindustries:conduit/item/basic/conduit_up"
+      }
+    },
+
+    {
+      "when": {
+        "AND": [
+          {"down": "true"},{"mode": "SPLIT"}
+        ]
       },
+      "apply": {
+        "model": "signalindustries:conduit/item/basic/split/conduit_down"
+      }
+    },
+    {
       "when": {
-        "north": "true"
+        "AND": [
+          {"down": "true"},{"mode": "RANDOM"}
+        ]
+      },
+      "apply": {
+        "model": "signalindustries:conduit/item/basic/conduit_down"
       }
     },
+
     {
+      "when": {
+        "AND": [
+          {"north": "true"},{"mode": "SPLIT"}
+        ]
+      },
       "apply": {
-        "model": "signalindustries:conduit/item/basic/conduit_east"
+        "model": "signalindustries:conduit/item/basic/split/conduit_north"
+      }
+    },
+    {
+      "when": {
+        "AND": [
+          {"north": "true"},{"mode": "RANDOM"}
+        ]
       },
+      "apply": {
+        "model": "signalindustries:conduit/item/basic/conduit_north"
+      }
+    },
+
+    {
       "when": {
-        "east": "true"
+        "AND": [
+          {"south": "true"},{"mode": "SPLIT"}
+        ]
+      },
+      "apply": {
+        "model": "signalindustries:conduit/item/basic/split/conduit_south"
       }
     },
     {
+      "when": {
+        "AND": [
+          {"south": "true"},{"mode": "RANDOM"}
+        ]
+      },
       "apply": {
         "model": "signalindustries:conduit/item/basic/conduit_south"
-      },
+      }
+    },
+
+    {
       "when": {
-        "south": "true"
+        "AND": [
+          {"east": "true"},{"mode": "SPLIT"}
+        ]
+      },
+      "apply": {
+        "model": "signalindustries:conduit/item/basic/split/conduit_east"
       }
     },
     {
+      "when": {
+        "AND": [
+          {"east": "true"},{"mode": "RANDOM"}
+        ]
+      },
       "apply": {
-        "model": "signalindustries:conduit/item/basic/conduit_west"
+        "model": "signalindustries:conduit/item/basic/conduit_east"
+      }
+    },
+
+    {
+      "when": {
+        "AND": [
+          {"west": "true"},{"mode": "SPLIT"}
+        ]
       },
+      "apply": {
+        "model": "signalindustries:conduit/item/basic/split/conduit_west"
+      }
+    },
+    {
       "when": {
-        "west": "true"
+        "AND": [
+          {"west": "true"},{"mode": "RANDOM"}
+        ]
+      },
+      "apply": {
+        "model": "signalindustries:conduit/item/basic/conduit_west"
       }
     }
   ]

diff --git a/src/main/resources/assets/signalindustries/blockstates/basic_item_conduit_restrict.json b/src/main/resources/assets/signalindustries/blockstates/basic_item_conduit_restrict.json
@@ -5,6 +5,14 @@
         "model": "signalindustries:conduit/item/basic/conduit_base"
       }
     },
+    {
+      "apply": {
+        "model": "signalindustries:conduit/item/basic/split/conduit_base"
+      },
+      "when": {
+        "mode": "SPLIT"
+      }
+    },
     {
       "when": {
         "AND": [

diff --git a/src/main/resources/assets/signalindustries/blockstates/prototype_item_conduit.json b/src/main/resources/assets/signalindustries/blockstates/prototype_item_conduit.json
@@ -7,50 +7,135 @@
     },
     {
       "apply": {
-        "model": "signalindustries:conduit/item/prototype/conduit_up"
+        "model": "signalindustries:conduit/item/prototype/split/conduit_base"
       },
       "when": {
-        "up": "true"
+        "mode": "SPLIT"
       }
     },
     {
-      "apply": {
-        "model": "signalindustries:conduit/item/prototype/conduit_down"
-      },
       "when": {
-        "down": "true"
+        "AND": [
+          {"up": "true"},{"mode": "SPLIT"}
+        ]
+      },
+      "apply": {
+        "model": "signalindustries:conduit/item/prototype/split/conduit_up"
       }
     },
     {
+      "when": {
+        "AND": [
+          {"up": "true"},{"mode": "RANDOM"}
+        ]
+      },
       "apply": {
-        "model": "signalindustries:conduit/item/prototype/conduit_north"
+        "model": "signalindustries:conduit/item/prototype/conduit_up"
+      }
+    },
+
+    {
+      "when": {
+        "AND": [
+          {"down": "true"},{"mode": "SPLIT"}
+        ]
       },
+      "apply": {
+        "model": "signalindustries:conduit/item/prototype/split/conduit_down"
+      }
+    },
+    {
       "when": {
-        "north": "true"
+        "AND": [
+          {"down": "true"},{"mode": "RANDOM"}
+        ]
+      },
+      "apply": {
+        "model": "signalindustries:conduit/item/prototype/conduit_down"
       }
     },
+
     {
+      "when": {
+        "AND": [
+          {"north": "true"},{"mode": "SPLIT"}
+        ]
+      },
       "apply": {
-        "model": "signalindustries:conduit/item/prototype/conduit_east"
+        "model": "signalindustries:conduit/item/prototype/split/conduit_north"
+      }
+    },
+    {
+      "when": {
+        "AND": [
+          {"north": "true"},{"mode": "RANDOM"}
+        ]
       },
+      "apply": {
+        "model": "signalindustries:conduit/item/prototype/conduit_north"
+      }
+    },
+
+    {
       "when": {
-        "east": "true"
+        "AND": [
+          {"south": "true"},{"mode": "SPLIT"}
+        ]
+      },
+      "apply": {
+        "model": "signalindustries:conduit/item/prototype/split/conduit_south"
       }
     },
     {
+      "when": {
+        "AND": [
+          {"south": "true"},{"mode": "RANDOM"}
+        ]
+      },
       "apply": {
         "model": "signalindustries:conduit/item/prototype/conduit_south"
-      },
+      }
+    },
+
+    {
       "when": {
-        "south": "true"
+        "AND": [
+          {"east": "true"},{"mode": "SPLIT"}
+        ]
+      },
+      "apply": {
+        "model": "signalindustries:conduit/item/prototype/split/conduit_east"
       }
     },
     {
+      "when": {
+        "AND": [
+          {"east": "true"},{"mode": "RANDOM"}
+        ]
+      },
       "apply": {
-        "model": "signalindustries:conduit/item/prototype/conduit_west"
+        "model": "signalindustries:conduit/item/prototype/conduit_east"
+      }
+    },
+
+    {
+      "when": {
+        "AND": [
+          {"west": "true"},{"mode": "SPLIT"}
+        ]
       },
+      "apply": {
+        "model": "signalindustries:conduit/item/prototype/split/conduit_west"
+      }
+    },
+    {
       "when": {
-        "west": "true"
+        "AND": [
+          {"west": "true"},{"mode": "RANDOM"}
+        ]
+      },
+      "apply": {
+        "model": "signalindustries:conduit/item/prototype/conduit_west"
       }
     }
   ]

diff --git a/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_all.json b/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_all.json
@@ -0,0 +1,6 @@
+{
+  "parent": "signalindustries:conduit/template_item_conduit_all",
+  "textures": {
+    "conduit": "signalindustries:block/item_conduit_basic_split"
+  }
+}
diff --git a/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_base.json b/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_base.json
@@ -0,0 +1,6 @@
+{
+  "parent": "signalindustries:conduit/template_item_conduit_base",
+  "textures": {
+    "conduit": "signalindustries:block/item_conduit_basic_split"
+  }
+}
diff --git a/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_down.json b/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_down.json
@@ -0,0 +1,6 @@
+{
+  "parent": "signalindustries:conduit/template_item_conduit_down",
+  "textures": {
+    "conduit": "signalindustries:block/item_conduit_basic_split"
+  }
+}
diff --git a/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_east.json b/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_east.json
@@ -0,0 +1,6 @@
+{
+  "parent": "signalindustries:conduit/template_item_conduit_east",
+  "textures": {
+    "conduit": "signalindustries:block/item_conduit_basic_split"
+  }
+}
diff --git a/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_north.json b/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_north.json
@@ -0,0 +1,6 @@
+{
+  "parent": "signalindustries:conduit/template_item_conduit_north",
+  "textures": {
+    "conduit": "signalindustries:block/item_conduit_basic_split"
+  }
+}
diff --git a/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_south.json b/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_south.json
@@ -0,0 +1,6 @@
+{
+  "parent": "signalindustries:conduit/template_item_conduit_south",
+  "textures": {
+    "conduit": "signalindustries:block/item_conduit_basic_split"
+  }
+}
diff --git a/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_up.json b/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_up.json
@@ -0,0 +1,6 @@
+{
+  "parent": "signalindustries:conduit/template_item_conduit_up",
+  "textures": {
+    "conduit": "signalindustries:block/item_conduit_basic_split"
+  }
+}
diff --git a/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_west.json b/src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_west.json
@@ -0,0 +1,6 @@
+{
+  "parent": "signalindustries:conduit/template_item_conduit_west",
+  "textures": {
+    "conduit": "signalindustries:block/item_conduit_basic_split"
+  }
+}
diff --git a/...ain/resources/assets/signalindustries/model/conduit/item/prototype/split/conduit_all.json b/...ain/resources/assets/signalindustries/model/conduit/item/prototype/split/conduit_all.json
@@ -0,0 +1,6 @@
+{
+  "parent": "signalindustries:conduit/template_item_conduit_all",
+  "textures": {
+    "conduit": "signalindustries:block/item_conduit_prototype_split"
+  }
+}