New Portal Guns + various other tweaks

- New Portal Guns, Portal Gun Frame, and Portal Gun Casing - Tweaked the metal grating blocks - Tweaked the border of the Insulation blocks - Fixed Conversion Gel z fighting with stuff - Removed the energy ball in the laser relay for consistency, since none of the other laser nodes have it anymore now that the laser is a raycast. May be added back via other means in the future. - KNOWN ISSUE: The lights on the portal gun no longer change color. Something with the portal_gun_dyeable texture was specific to the old models, and I'm unsure what it was.
Fusion-Flux · Jun 23, 2023 · f9f8f17 · f9f8f17
1 parent 34c77de
commit f9f8f17
Show file tree

Hide file tree

Showing 14 changed files with 841 additions and 404 deletions.
diff --git a/src/main/resources/assets/portalcubed/blockstates/conversion_gel.json b/src/main/resources/assets/portalcubed/blockstates/conversion_gel.json
@@ -1,64 +1,149 @@
 {
   "multipart": [
     {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel"
+      },
       "when": {
         "north": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel"
       },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
+      }
+    },
+    {
       "apply": {
         "model": "portalcubed:block/conversion_gel",
         "uvlock": true,
-        "x": 270
+        "y": 90
+      },
+      "when": {
+        "east": "true"
       }
     },
     {
-      "when": {
-        "east": "true"
-      },
       "apply": {
         "model": "portalcubed:block/conversion_gel",
         "uvlock": true,
-        "x": 270,
         "y": 90
+      },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
       }
     },
     {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel",
+        "uvlock": true,
+        "y": 180
+      },
       "when": {
         "south": "true"
-      },
+      }
+    },
+    {
       "apply": {
         "model": "portalcubed:block/conversion_gel",
         "uvlock": true,
-        "x": 90
+        "y": 180
+      },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
       }
     },
     {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel",
+        "uvlock": true,
+        "y": 270
+      },
       "when": {
         "west": "true"
-      },
+      }
+    },
+    {
       "apply": {
         "model": "portalcubed:block/conversion_gel",
         "uvlock": true,
-        "x": 90,
-        "y": 90
+        "y": 270
+      },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
       }
     },
     {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel",
+        "uvlock": true,
+        "x": 270
+      },
       "when": {
         "up": "true"
-      },
+      }
+    },
+    {
       "apply": {
         "model": "portalcubed:block/conversion_gel",
         "uvlock": true,
-        "x": 180
+        "x": 270
+      },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
       }
     },
     {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel",
+        "uvlock": true,
+        "x": 90
+      },
       "when": {
         "down": "true"
-      },
+      }
+    },
+    {
       "apply": {
         "model": "portalcubed:block/conversion_gel",
-        "uvlock": true
+        "uvlock": true,
+        "x": 90
+      },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
       }
     }
   ]

diff --git a/src/main/resources/assets/portalcubed/lang/en_us.json b/src/main/resources/assets/portalcubed/lang/en_us.json
@@ -64,29 +64,27 @@
   "item.portalcubed.portal_gun": "Portal Gun",
   "item.portalcubed.portal_gun_primary": "Primary Portal Gun",
   "item.portalcubed.portal_gun_secondary": "Secondary Portal Gun",
-  "item.portalcubed.portal_gun_frame": "Portal Gun Barrel",
+  "item.portalcubed.portal_gun_frame": "Portal Gun Frame",
   "item.portalcubed.portal_gun_casing": "Portal Gun Casing",
   "item.portalcubed.paint_gun": "Paint Gun",
   "item.portalcubed.mini_blackhole": "Miniature Black Hole",
   "item.portalcubed.toxic_goo_bucket": "Toxic Goo Bucket",
 
-  "item.portalcubed.base_gel": "Gel Blob",
-
   "item.portalcubed.turret": "Sentry Turret",
+  "block.portalcubed.rocket_turret": "Rocket Turret",
 
   "block.portalcubed.power_block": "Power Block",
+  "block.portalcubed.velocity_helper": "Velocity Helper",
+  "block.portalcubed.catapult": "Catapult",
 
+  "item.portalcubed.base_gel": "Gel Blob",
   "block.portalcubed.propulsion_gel": "Propulsion Gel Blob",
   "block.portalcubed.repulsion_gel": "Repulsion Gel Blob",
   "block.portalcubed.adhesion_gel": "Adhesion Gel Blob",
   "block.portalcubed.conversion_gel": "Conversion Gel Blob",
   "block.portalcubed.reflection_gel": "Reflection Gel Blob",
 
   "block.portalcubed.auto_portal": "Auto Portal",
-  "block.portalcubed.velocity_helper": "Velocity Helper",
-  "block.portalcubed.catapult": "Catapult",
-
-  "block.portalcubed.rocket_turret": "Rocket Turret",
 
   "block.portalcubed.sewage": "Sewage",
 

diff --git a/src/main/resources/assets/portalcubed/models/block/conversion_gel.json b/src/main/resources/assets/portalcubed/models/block/conversion_gel.json
@@ -1,20 +1,16 @@
 {
-	"credit": "Made with Blockbench",
+	"ambientocclusion": false,
 	"textures": {
-		"0": "portalcubed:block/conversion_gel",
-		"particle": "portalcubed:block/conversion_gel"
+		"particle": "portalcubed:block/conversion_gel",
+		"conversion_gel": "portalcubed:block/conversion_gel"
 	},
 	"elements": [
-		{
-			"from": [0, 0, 0],
-			"to": [16, 0.01, 16],
+		{   "from": [ 0, 0, 0.1 ],
+			"to": [ 16, 16, 0.1 ],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 1], "texture": "#0"},
-				"east": {"uv": [0, 0, 16, 1], "texture": "#0"},
-				"south": {"uv": [0, 0, 16, 1], "texture": "#0"},
-				"west": {"uv": [0, 0, 16, 1], "texture": "#0"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#0"}
+				"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#conversion_gel" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#conversion_gel" }
 			}
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/laser_relay_active.json b/src/main/resources/assets/portalcubed/models/block/laser_relay_active.json
@@ -3,7 +3,6 @@
 	"texture_size": [64, 64],
 	"textures": {
 		"0": "portalcubed:block/laser_emitter",
-		"1": "portalcubed:block/laser_emitter_e",
 		"3": "portalcubed:block/laser_relay_active",
 		"particle": "portalcubed:block/padded_gray_panel"
 	},
@@ -63,25 +62,6 @@
 				"west": {"uv": [10.758, 13.258, 11.008, 13.508], "rotation": 270, "texture": "#0"}
 			}
 		},
-		{
-			"from": [4.65, 7.75, 3.5],
-			"to": [11.4, 8.25, 8.5],
-			"rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 7]},
-			"faces": {
-				"west": {"uv": [8.258, 0.008, 9.508, 0.008], "texture": "#1"},
-				"up": {"uv": [8.008, 0.008, 9.258, 1.758], "rotation": 270, "texture": "#1"},
-				"down": {"uv": [9.258, 0.008, 8.008, 1.758], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [4.625, 7.75, 3.5],
-			"to": [11.375, 8.25, 8.5],
-			"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 5]},
-			"faces": {
-				"up": {"uv": [8.008, 0.008, 9.258, 1.758], "rotation": 270, "texture": "#1"},
-				"down": {"uv": [9.258, 0.008, 8.008, 1.758], "rotation": 270, "texture": "#1"}
-			}
-		},
 		{
 			"name": "cube inverted",
 			"from": [11, 11, 10.75],