New Office Concrete + Tiling Blocks

- Added Capped Office Concrete + Large Blue Tiling
- Added Light Borderless Office Concrete + Black Tiling
- Refactored Bordered Office Concrete + Brown Tiling to Dark Borderless Office Concrete + Brown Tiling, and changed its side texture to match.
- Changed the side texture of the rocket turret and neurotoxin emitter to use the new dark borderless office concrete side

src/main/resources/assets/portalcubed/blockstates/capped_office_concrete.json

@@ -0,0 +1,12 @@
+{
+  "variants": {
+    "":[ { "model": "portalcubed:block/capped_vertical_office_concrete" }
+
+
+    ]
+
+
+
+
+  }
+}

src/main/resources/assets/portalcubed/blockstates/dark_borderless_office_concrete.json

@@ -0,0 +1,12 @@
+{
+  "variants": {
+    "":[ { "model": "portalcubed:block/dark_borderless_office_concrete" }
+
+
+    ]
+
+
+
+
+  }
+}

src/main/resources/assets/portalcubed/blockstates/light_borderless_office_concrete.json

@@ -0,0 +1,12 @@
+{
+  "variants": {
+    "":[ { "model": "portalcubed:block/light_borderless_office_concrete" }
+
+
+    ]
+
+
+
+
+  }
+}

src/main/resources/assets/portalcubed/blockstates/solid_office_concrete.json

@@ -1,6 +1,6 @@
 {
   "variants": {
-    "":[ { "model": "portalcubed:block/solid_office_concrete" }
+    "":[ { "model": "portalcubed:block/vertical_office_concrete" }
 
 
     ]

src/main/resources/assets/portalcubed/lang/en_us.json

@@ -323,8 +323,10 @@
   "block.portalcubed.portal_2_metal_grating": "Portal 2 Metal Grating",
 
   "block.portalcubed.office_concrete": "Horizontal Office Concrete + Orange Tiling",
-  "block.portalcubed.solid_office_concrete": "Vertical Office Concrete + Blue Tiling",
-  "block.portalcubed.bordered_office_concrete": "Bordered Office Concrete + Brown Tiling",
+  "block.portalcubed.solid_office_concrete": "Vertical Office Concrete + Small Blue Tiling",
+  "block.portalcubed.capped_office_concrete": "Capped Vertical Office Concrete + Large Blue Tiling",
+  "block.portalcubed.dark_borderless_office_concrete": "Dark Borderless Office Concrete + Brown Tiling",
+  "block.portalcubed.light_borderless_office_concrete": "Light Borderless Office Concrete + Black Tiling",
   "block.portalcubed.blue_office_concrete": "Blue Horizontal Office Concrete + Tread Plating",
   "block.portalcubed.striped_office_concrete": "Striped Horizontal Office Concrete + Gray Tiling",
 

src/main/resources/assets/portalcubed/models/block/capped_vertical_office_concrete.json

@@ -0,0 +1,53 @@
+{
+	"credit": "Made by Cart3r using Blockbench.",
+	"textures": {
+		"particle": "portalcubed:block/large_blue_office_tiles",
+		"end": "portalcubed:block/large_blue_office_tiles",
+		"side": "portalcubed:block/capped_vertical_office_concrete"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "north"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "south"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "west"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#end", "cullface": "up"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#end", "cullface": "down"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 45, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, 225, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		},
+		"gui": {
+			"rotation": [30, 225, 0],
+			"scale": [0.625, 0.625, 0.625]
+		},
+		"fixed": {
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
+}

src/main/resources/assets/portalcubed/models/block/bordered_office_concrete.json → src/main/resources/assets/portalcubed/models/block/dark_borderless_office_concrete.json

@@ -3,7 +3,7 @@
 	"textures": {
 		"particle": "portalcubed:block/brown_office_tiles",
 		"end": "portalcubed:block/brown_office_tiles",
-		"side": "portalcubed:block/bordered_office_concrete"
+		"side": "portalcubed:block/dark_borderless_office_concrete"
 	},
 	"elements": [
 		{

src/main/resources/assets/portalcubed/models/block/solid_office_concrete.json → src/main/resources/assets/portalcubed/models/block/light_borderless_office_concrete.json

@@ -1,9 +1,9 @@
 {
 	"credit": "Made by Cart3r using Blockbench.",
 	"textures": {
-		"particle": "portalcubed:block/blue_office_tiles",
-		"end": "portalcubed:block/blue_office_tiles",
-		"side": "portalcubed:block/solid_office_concrete"
+		"particle": "portalcubed:block/black_office_tiles",
+		"end": "portalcubed:block/black_office_tiles",
+		"side": "portalcubed:block/light_borderless_office_concrete"
 	},
 	"elements": [
 		{

src/main/resources/assets/portalcubed/models/block/neurotoxin_emitter_off.json

@@ -3,9 +3,9 @@
 	"textures": {
 		"0": "portalcubed:block/neurotoxin_emitter_vent",
 		"1": "portalcubed:block/neurotoxin_emitter_front",
-		"2": "portalcubed:block/dirty_borderless_panel",
+		"2": "portalcubed:block/dark_borderless_office_concrete",
 		"3": "portalcubed:block/neurotoxin_emitter_background",
-		"particle": "portalcubed:block/dirty_borderless_panel"
+		"particle": "portalcubed:block/dark_borderless_office_concrete"
 	},
 	"elements": [
 		{

src/main/resources/assets/portalcubed/models/block/neurotoxin_emitter_on.json

@@ -3,9 +3,9 @@
 	"textures": {
 		"0": "portalcubed:block/neurotoxin_emitter_vent",
 		"1": "portalcubed:block/neurotoxin_emitter_front",
-		"2": "portalcubed:block/dirty_borderless_panel",
+		"2": "portalcubed:block/dark_borderless_office_concrete",
 		"3": "portalcubed:block/neurotoxin_emitter_background",
-		"particle": "portalcubed:block/dirty_borderless_panel"
+		"particle": "portalcubed:block/dark_borderless_office_concrete"
 	},
 	"elements": [
 		{

src/main/resources/assets/portalcubed/models/block/rocket_turret_base.json

@@ -3,33 +3,32 @@
 	"texture_size": [64, 64],
 	"textures": {
 		"0": "portalcubed:block/rocket_turret_inactive",
-		"1": "portalcubed:block/solid_office_concrete",
-		"2": "portalcubed:block/bordered_office_concrete",
-		"particle": "portalcubed:block/solid_office_concrete"
+		"1": "portalcubed:block/dark_borderless_office_concrete",
+		"particle": "portalcubed:block/dark_borderless_office_concrete"
 	},
 	"elements": [
 		{
-			"from": [0, 16, 0],
-			"to": [16, 17, 16],
+			"from": [-0.01, 15.99, -0.01],
+			"to": [16.01, 17.01, 16.01],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]},
 			"faces": {
-				"north": {"uv": [0, 0, 4, 0.25], "texture": "#0"},
-				"east": {"uv": [0, 0, 4, 0.25], "texture": "#0"},
-				"south": {"uv": [0, 0, 4, 0.25], "texture": "#0"},
-				"west": {"uv": [0, 0, 4, 0.25], "texture": "#0"},
-				"up": {"uv": [0, 0, 4, 4], "texture": "#0"}
+				"north": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"},
+				"east": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"},
+				"south": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"},
+				"west": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"},
+				"up": {"uv": [0.008, 0.008, 3.992, 3.992], "texture": "#0"}
 			}
 		},
 		{
-			"from": [1.97, 16.97, 1.97],
-			"to": [14.03, 18.03, 14.03],
+			"from": [1.96, 16.96, 1.96],
+			"to": [14.04, 18.04, 14.04],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]},
 			"faces": {
-				"north": {"uv": [0, 7, 3, 7.25], "texture": "#0"},
-				"east": {"uv": [3, 7, 6, 7.25], "texture": "#0"},
-				"south": {"uv": [6, 7, 9, 7.25], "texture": "#0"},
-				"west": {"uv": [9, 7, 12, 7.25], "texture": "#0"},
-				"up": {"uv": [6, 7, 3, 4], "texture": "#0"}
+				"north": {"uv": [0.008, 7.008, 2.992, 7.242], "texture": "#0"},
+				"east": {"uv": [3.008, 7.008, 5.992, 7.242], "texture": "#0"},
+				"south": {"uv": [6.008, 7.008, 8.992, 7.242], "texture": "#0"},
+				"west": {"uv": [9.008, 7.008, 11.992, 7.242], "texture": "#0"},
+				"up": {"uv": [5.992, 6.992, 3.008, 4.008], "texture": "#0"}
 			}
 		},
 		{
@@ -52,7 +51,7 @@
 				"east": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "east"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"},
 				"west": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "west"},
-				"down": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "down"}
+				"down": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "down"}
 			}
 		}
 	],

src/main/resources/assets/portalcubed/models/block/vertical_office_concrete.json

@@ -0,0 +1,53 @@
+{
+	"credit": "Made by Cart3r using Blockbench.",
+	"textures": {
+		"particle": "portalcubed:block/small_blue_office_tiles",
+		"end": "portalcubed:block/small_blue_office_tiles",
+		"side": "portalcubed:block/vertical_office_concrete"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "north"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "south"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "west"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#end", "cullface": "up"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#end", "cullface": "down"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 45, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, 225, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		},
+		"gui": {
+			"rotation": [30, 225, 0],
+			"scale": [0.625, 0.625, 0.625]
+		},
+		"fixed": {
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
+}

src/main/resources/assets/portalcubed/models/item/capped_office_concrete.json

@@ -0,0 +1,4 @@
+{
+  "parent": "portalcubed:block/capped_vertical_office_concrete"
+
+}

src/main/resources/assets/portalcubed/models/item/dark_borderless_office_concrete.json

@@ -0,0 +1,4 @@
+{
+  "parent": "portalcubed:block/dark_borderless_office_concrete"
+
+}

src/main/resources/assets/portalcubed/models/item/light_borderless_office_concrete.json

@@ -0,0 +1,4 @@
+{
+  "parent": "portalcubed:block/light_borderless_office_concrete"
+
+}

src/main/resources/assets/portalcubed/models/item/rocket_turret.json

@@ -3,8 +3,7 @@
 	"texture_size": [64, 64],
 	"textures": {
 		"0": "portalcubed:block/rocket_turret_inactive",
-		"1": "portalcubed:block/solid_office_concrete",
-		"2": "portalcubed:block/bordered_office_concrete",
+		"1": "portalcubed:block/dark_borderless_office_concrete",
 		"particle": "portalcubed:block/rocket_turret_inactive"
 	},
 	"elements": [
@@ -78,7 +77,7 @@
 				"east": {"uv": [0.008, 0.008, 15.992, 15.992], "texture": "#1"},
 				"south": {"uv": [0.008, 0.008, 15.992, 15.992], "texture": "#1"},
 				"west": {"uv": [0.008, 0.008, 15.992, 15.992], "texture": "#1"},
-				"down": {"uv": [0.008, 0.008, 15.992, 15.992], "texture": "#2"}
+				"down": {"uv": [0.008, 0.008, 15.992, 15.992], "texture": "#1"}
 			}
 		}
 	],

src/main/resources/assets/portalcubed/models/item/solid_office_concrete.json

@@ -1,4 +1,4 @@
 {
-  "parent": "portalcubed:block/solid_office_concrete"
+  "parent": "portalcubed:block/vertical_office_concrete"
 
 }

src/main/resources/data/c/tags/blocks/concrete.json

@@ -18,8 +18,10 @@
     "minecraft:red_concrete",
     "minecraft:black_concrete",
     "portalcubed:office_concrete",
-    "portalcubed:bordered_office_concrete",
+    "portalcubed:light_borderless_office_concrete",
+    "portalcubed:dark_borderless_office_concrete",
     "portalcubed:solid_office_concrete",
+    "portalcubed:capped_office_concrete",
     "portalcubed:blue_office_concrete",
     "portalcubed:striped_office_concrete"
   ]

src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -137,7 +137,9 @@
     "portalcubed:portal_1_elevator_wall_bottom",
     "portalcubed:office_concrete",
     "portalcubed:solid_office_concrete",
-    "portalcubed:bordered_office_concrete",
+    "portalcubed:capped_office_concrete",
+    "portalcubed:light_borderless_office_concrete",
+    "portalcubed:dark_borderless_office_concrete",
     "portalcubed:striped_office_concrete",
     "portalcubed:blue_office_concrete",
     "portalcubed:old_ap_metal_grating",
@@ -195,4 +197,4 @@
 
 
   ]
-}
+}

src/main/resources/data/portalcubed/advancements/recipes/office_concrete.json

@@ -6,7 +6,9 @@
       "portalcubed:office_concrete_crafting",
       "portalcubed:blue_office_concrete_crafting",
       "portalcubed:solid_office_concrete_crafting",
-      "portalcubed:bordered_office_concrete_crafting",
+      "portalcubed:capped_office_concrete_crafting",
+      "portalcubed:light_borderless_office_concrete_crafting",
+      "portalcubed:dark_borderless_office_concrete_crafting",
       "portalcubed:striped_office_concrete_crafting"
     ]
   },

src/main/resources/data/portalcubed/loot_tables/blocks/bordered_office_concrete.json → src/main/resources/data/portalcubed/loot_tables/blocks/capped_office_concrete.json

@@ -7,7 +7,7 @@
 "entries": [
  {
 "type": "minecraft:item",
-"name": "portalcubed:bordered_office_concrete"
+"name": "portalcubed:capped_office_concrete"
 }
 ],
 "conditions": [