From b8f4574087a8d987c54ba4bf1fb5d559d6feb510 Mon Sep 17 00:00:00 2001
From: TyBraniff <TyBraniff@live.com>
Date: Mon, 7 Oct 2024 09:31:15 -0400
Subject: [PATCH] conduit (#614)

* Adding conduit entity models

1 default (not active) conduit model - set as default
1 activated conduit model - not available via current bluemap code, just making asset available once, or if, it becomes detectable.

* Adding conduit blockstate

Uses model "entity/conduit" by default; has variant for active under "active=true" varriant.

* Update conduit.json

format update

* Update conduit_active.json

format update

* Update conduit.json

* Update conduit.json

---------

Co-authored-by: Lukas Rieger <TBlueF@users.noreply.github.com>
---
 .../assets/minecraft/blockstates/conduit.json |  6 +++
 .../minecraft/models/entity/conduit.json      | 23 ++++++++
 .../models/entity/conduit_active.json         | 52 +++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 core/src/main/resourceExtensions/assets/minecraft/blockstates/conduit.json
 create mode 100644 core/src/main/resourceExtensions/assets/minecraft/models/entity/conduit.json
 create mode 100644 core/src/main/resourceExtensions/assets/minecraft/models/entity/conduit_active.json

diff --git a/core/src/main/resourceExtensions/assets/minecraft/blockstates/conduit.json b/core/src/main/resourceExtensions/assets/minecraft/blockstates/conduit.json
new file mode 100644
index 000000000..ca8be81fe
--- /dev/null
+++ b/core/src/main/resourceExtensions/assets/minecraft/blockstates/conduit.json
@@ -0,0 +1,6 @@
+{
+  "variants": {
+    "": {"model": "minecraft:entity/conduit"},
+    "active=true": {"model": "minecraft:entity/conduit_active"}
+  }
+}
diff --git a/core/src/main/resourceExtensions/assets/minecraft/models/entity/conduit.json b/core/src/main/resourceExtensions/assets/minecraft/models/entity/conduit.json
new file mode 100644
index 000000000..80062d372
--- /dev/null
+++ b/core/src/main/resourceExtensions/assets/minecraft/models/entity/conduit.json
@@ -0,0 +1,23 @@
+{
+  "credit": "Made by TyBraniff with Blockbench for Bluemap",
+  "texture_size": [32, 16],
+  "textures": {
+    "0": "entity/conduit/base",
+    "particle": "entity/conduit/base"
+  },
+  "elements": [
+    {
+      "from": [5, 5, 5],
+      "to": [11, 11, 11],
+      "rotation": {"angle": 0, "axis": "y", "origin": [7, 7, 7]},
+      "faces": {
+        "north": {"uv": [6, 0, 9, 6], "texture": "#0"},
+        "east": {"uv": [0, 6, 3, 12], "texture": "#0"},
+        "south": {"uv": [6, 6, 9, 12], "texture": "#0"},
+        "west": {"uv": [3, 6, 6, 12], "texture": "#0"},
+        "up": {"uv": [3, 0, 6, 6], "texture": "#0"},
+        "down": {"uv": [9, 6, 12, 12], "texture": "#0"}
+      }
+    }
+  ]
+}
diff --git a/core/src/main/resourceExtensions/assets/minecraft/models/entity/conduit_active.json b/core/src/main/resourceExtensions/assets/minecraft/models/entity/conduit_active.json
new file mode 100644
index 000000000..a553a3aa8
--- /dev/null
+++ b/core/src/main/resourceExtensions/assets/minecraft/models/entity/conduit_active.json
@@ -0,0 +1,52 @@
+{
+  "credit": "Made by TyBraniff with Blockbench for Bluemap",
+  "texture_size": [32, 16],
+  "textures": {
+    "1": "entity/conduit/cage",
+    "2": "entity/conduit/open_eye",
+    "3": "entity/conduit/wind",
+    "4": "entity/conduit/wind_vertical"
+  },
+  "elements": [
+      {
+      "name": "cage",
+      "from": [4, 4, 4],
+      "to": [12, 12, 12],
+      "rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]},
+      "faces": {
+        "north": {"uv": [0, 8, 4, 16], "texture": "#1"},
+        "east": {"uv": [4, 0, 8, 8], "texture": "#1"},
+        "south": {"uv": [8, 8, 12, 16], "texture": "#1"},
+        "west": {"uv": [4, 8, 8, 16], "texture": "#1"},
+        "up": {"uv": [8, 0, 12, 8], "rotation": 90, "texture": "#1"},
+        "down": {"uv": [12, 8, 16, 16], "rotation": 270, "texture": "#1"}
+      }
+    },
+      {
+      "name": "eye",
+      "from": [5, 5, 8],
+      "to": [11, 11, 8],
+      "faces": {
+        "north": {"uv": [0, 0, 8, 16], "texture": "#2"},
+        "east": {"uv": [0, 0, 0, 8], "texture": "#missing"},
+        "south": {"uv": [0, 0, 8, 16], "texture": "#2"},
+        "west": {"uv": [0, 0, 0, 8], "texture": "#missing"},
+        "up": {"uv": [0, 0, 4, 0], "texture": "#missing"},
+        "down": {"uv": [0, 0, 4, 0], "texture": "#missing"}
+      }
+    },
+      {
+      "name": "wind",
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "north": {"uv": [0, 8, 4, 16], "texture": "#3"},
+        "east": {"uv": [4, 16, 8, 8], "rotation": 90, "texture": "#4"},
+        "south": {"uv": [12, 8, 16, 16], "texture": "#3"},
+        "west": {"uv": [4, 8, 12, 16], "texture": "#3"},
+        "up": {"uv": [0, 16, 4, 8], "texture": "#4"},
+        "down": {"uv": [12, 8, 8, 16], "texture": "#4"}
+      }
+    }
+  ]
+}