Vinneli's transportalizer textures (#494)

* vinneli's transportalizer textures * pretty sure this is how the changelog works?
lunar-sway · Jul 28, 2023 · bb007b5 · bb007b5
1 parent 698eab3
commit bb007b5
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+### Changed
+
+- New textures and slightly shorter models for transportalizers
+
+### Contributors for this release
+
+- Vinnelli, hadean
+
 ## [1.19.2-1.11.0.0] - 2023-07-22
 
 ### Added

diff --git a/src/main/java/com/mraof/minestuck/block/MSBlockShapes.java b/src/main/java/com/mraof/minestuck/block/MSBlockShapes.java
@@ -101,7 +101,7 @@ public class MSBlockShapes
 
 	//Misc Machines
 	public static CustomVoxelShape INTELLIBEAM_LASERSTATION = new CustomVoxelShape(new double[]{1,6,0,6,12,4}, new double[]{1,0,1,6,7,6}, new double[]{4,0,12,11,7,16}, new double[]{0,0,6,8,8,12}, new double[]{8,0,4,15,8,12}, new double[]{-1,7,7,16,10,11}, new double[]{6,7,12,11,16,16}, new double[]{6,15,11,11,21,15}, new double[]{4,20,8,14,26,14}, new double[]{-1,20,7,4,27,15}, new double[]{5,19,5,12,22,10}, new double[]{6,22,6,11,24,8});
-	public static CustomVoxelShape TRANSPORTALIZER = new CustomVoxelShape(new double[]{0,0,0,16,6,16}, new double[]{1,6,1,15,8,15});
+	public static CustomVoxelShape TRANSPORTALIZER = new CustomVoxelShape(new double[]{0,0,0,16,5,16}, new double[]{1,5,1,15,7,15});
 	public static CustomVoxelShape SENDIFICATOR = new CustomVoxelShape(new double[]{0,0,0,16,1,16},new double[]{0,16,0,16,15,16},new double[]{0,1,0,1,15,16},new double[]{16,1,0,15,15,16},new double[]{1,1,15,15,15,16});
 	public static CustomVoxelShape GRIST_WIDGET = new CustomVoxelShape(new double[]{6,0,5,10,1.5,11.7}, new double[]{2.5,1,5.3,13.5,2.1,11.15}, new double[]{10,0,5,14,1.75,12}, new double[]{11,0.3,11.2,13,1.3,12.2}, new double[]{2,0,5,6,1.75,11}, new double[]{6,0,5,4,1.75,7}).rotate(Direction.SOUTH);
 	public static CustomVoxelShape ANTHVIL = new CustomVoxelShape(new double[]{2,0,6,14,4,10},new double[]{4,4,7,12,7,9},new double[]{0,7,4,16,14,12});

diff --git a/src/main/resources/assets/minestuck/models/block/trans_portalizer.json b/src/main/resources/assets/minestuck/models/block/trans_portalizer.json
@@ -1,32 +1,31 @@
 {
-    "textures": {
-        "particle": "minestuck:item/trans_portalizer",
-        "texture": "minestuck:block/trans_portalizer"
-    },
-    "elements": [
-        {
-            "from": [0, 0, 0],
-            "to": [16, 6, 16],
-            "faces": {
-                "north": {"uv": [8, 9, 16, 12], "texture": "#texture", "cullface": "north"},
-                "east": {"uv": [8, 13, 16, 16], "texture": "#texture", "cullface": "east"},
-                "south": {"uv": [8, 9, 16, 12], "texture": "#texture", "cullface": "south"},
-                "west": {"uv": [8, 13, 16, 16], "texture": "#texture", "cullface": "west"},
-                "up": {"uv": [0, 0, 8, 8], "texture": "#texture"},
-                "down": {"uv": [0, 8, 8, 16], "texture": "#texture", "cullface": "down"}
-            }
-        },
-        {
-            "from": [1, 6, 1],
-            "to": [15, 8, 15],
-            "faces": {
-                "north": {"uv": [0.5, 15, 7.5, 16], "texture": "#texture"},
-                "east": {"uv": [7.5, 4, 15.5, 5], "texture": "#texture"},
-                "south": {"uv": [0.5, 15, 7.5, 16], "texture": "#texture"},
-                "west": {"uv": [8, 8, 16, 9], "texture": "#texture"},
-                "up": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#texture"},
-                "down": {"uv": [0, 0, 0, 0], "texture": "#texture"}
-            }
-        }
-    ]
+	"credit": "Made with Blockbench",
+	"textures": {
+		"particle": "minestuck:block/trans_portalizer"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 5, 16],
+			"faces": {
+				"north": {"uv": [8, 9, 16, 11.5], "texture": "#particle", "cullface": "north"},
+				"east": {"uv": [8, 5, 16, 7.5], "texture": "#particle", "cullface": "east"},
+				"south": {"uv": [8, 1, 16, 3.5], "texture": "#particle", "cullface": "south"},
+				"west": {"uv": [8, 13, 16, 15.5], "texture": "#particle", "cullface": "west"},
+				"up": {"uv": [0, 0, 8, 8], "texture": "#particle"},
+				"down": {"uv": [0, 8, 8, 16], "texture": "#particle", "cullface": "down"}
+			}
+		},
+		{
+			"from": [1, 5, 1],
+			"to": [15, 7, 15],
+			"faces": {
+				"north": {"uv": [8.5, 8, 15.5, 9], "texture": "#particle"},
+				"east": {"uv": [8.5, 4, 15.5, 5], "texture": "#particle"},
+				"south": {"uv": [8.5, 0, 15.5, 1], "texture": "#particle"},
+				"west": {"uv": [8.5, 12, 15.5, 13], "texture": "#particle"},
+				"up": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#particle"}
+			}
+		}
+	]
 }
diff --git a/src/main/resources/assets/minestuck/models/block/transportalizer.json b/src/main/resources/assets/minestuck/models/block/transportalizer.json
@@ -1,31 +1,31 @@
 {
-    "textures": {
-        "particle": "minestuck:item/transportalizer",
-        "texture": "minestuck:block/transportalizer"
-    },
-    "elements": [
-        {
-            "from": [ 0, 0, 0 ],
-            "to": [ 16, 6, 16 ],
-            "faces": {
-                "down":  { "uv": [ 0,  8,  8, 16 ], "texture": "#texture", "cullface": "down" },
-                "up":    { "uv": [ 0,  0,  8,  8 ], "texture": "#texture" },
-                "south": { "uv": [ 8,  1, 16,  4 ], "texture": "#texture", "cullface": "south" },
-                "east":  { "uv": [ 8,  5, 16,  8 ], "texture": "#texture", "cullface": "east" },
-                "north": { "uv": [ 8,  9, 16, 12 ], "texture": "#texture", "cullface": "north" },
-                "west":  { "uv": [ 8, 13, 16, 16 ], "texture": "#texture", "cullface": "west" }
-            }
-        },
-        {
-            "from": [ 1, 6, 1 ],
-            "to": [ 15, 8, 15 ],
-            "faces": {
-                "up":    { "uv": [ 0.5, 0.5,  7.5, 7.5 ], "texture": "#texture" },
-                "south": { "uv": [ 7.5,   0, 15.5,   1 ], "texture": "#texture" },
-                "east":  { "uv": [ 7.5,   4, 15.5,   5 ], "texture": "#texture" },
-                "north": { "uv": [ 7.5,   8, 15.5,   9 ], "texture": "#texture" },
-                "west":  { "uv": [ 7.5,  12, 15.5,  13 ], "texture": "#texture" }
-            }
-        }
-    ]
+	"credit": "Made with Blockbench",
+	"textures": {
+		"particle": "minestuck:block/transportalizer"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 5, 16],
+			"faces": {
+				"north": {"uv": [8, 9, 16, 11.5], "texture": "#particle", "cullface": "north"},
+				"east": {"uv": [8, 5, 16, 7.5], "texture": "#particle", "cullface": "east"},
+				"south": {"uv": [8, 1, 16, 3.5], "texture": "#particle", "cullface": "south"},
+				"west": {"uv": [8, 13, 16, 15.5], "texture": "#particle", "cullface": "west"},
+				"up": {"uv": [0, 0, 8, 8], "texture": "#particle"},
+				"down": {"uv": [0, 8, 8, 16], "texture": "#particle", "cullface": "down"}
+			}
+		},
+		{
+			"from": [1, 5, 1],
+			"to": [15, 7, 15],
+			"faces": {
+				"north": {"uv": [8.5, 8, 15.5, 9], "texture": "#particle"},
+				"east": {"uv": [8.5, 4, 15.5, 5], "texture": "#particle"},
+				"south": {"uv": [8.5, 0, 15.5, 1], "texture": "#particle"},
+				"west": {"uv": [8.5, 12, 15.5, 13], "texture": "#particle"},
+				"up": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#particle"}
+			}
+		}
+	]
 }
diff --git a/src/main/resources/assets/minestuck/textures/block/trans_portalizer.png b/src/main/resources/assets/minestuck/textures/block/trans_portalizer.png
diff --git a/src/main/resources/assets/minestuck/textures/block/transportalizer.png b/src/main/resources/assets/minestuck/textures/block/transportalizer.png