Skip to content

Commit

Permalink
Plywood
Browse files Browse the repository at this point in the history 
- Added Plywood blocks.  They are a new old aperture building block, and can be used in place of planks in recipes if you end up with excess amounts.
- Changed the texture of the Old Aperture door's frame to better match the new plywood texture
- Changed the base of the Old Aperture floor button to use plywood
- Changed the old aperture door and floor button recipes to use plywood
- Fixed some of the wood-based blocks being mineable with a pickaxe and not an axe
  • Loading branch information
@Cart3r1234
Cart3r1234 committed Oct 27, 2023
1 parent 916f0e3 commit 4493895
Show file tree
Hide file tree
Showing 21 changed files with 212 additions and 95 deletions.
21 changes: 21 additions & 0 deletions src/main/resources/assets/portalcubed/blockstates/plywood.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"variants": {
"": [
{
"model": "portalcubed:block/plywood"
},
{
"model": "portalcubed:block/plywood",
"y": 90
},
{
"model": "portalcubed:block/plywood",
"y": 180
},
{
"model": "portalcubed:block/plywood",
"y": 270
}
]
}
}
1 change: 1 addition & 0 deletions src/main/resources/assets/portalcubed/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@
"block.portalcubed.old_ap_white_2x2_panel_bottom_right": "Old Aperture White 2x2 Panel Bottom Right",
"block.portalcubed.old_ap_white_checkered_panel": "Old Aperture White Checkered Panel",
"block.portalcubed.old_ap_white_panel": "Old Aperture White Panel",
"block.portalcubed.plywood": "Plywood",

"block.portalcubed.2x2_double_crossbar_top_left": "2x2 Double Crossbar Top Left",
"block.portalcubed.2x2_double_crossbar_top_right": "2x2 Double Crossbar Top Right",
Expand Down
26 changes: 11 additions & 15 deletions src/main/resources/assets/portalcubed/models/block/old_ap_floor_button.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@
"credit": "Made with Blockbench by Cart3r. ",
"texture_size": [32, 32],
"textures": {
"0": "portalcubed:block/aged_smooth_gray_panel_1",
"3": "portalcubed:block/aged_smooth_gray_2x2_panel_bottom_left",
"4": "portalcubed:block/aged_smooth_gray_2x2_panel_bottom_right",
"5": "portalcubed:block/aged_smooth_gray_2x2_panel_top_left",
"6": "portalcubed:block/aged_smooth_gray_2x2_panel_top_right",
"0": "portalcubed:block/plywood",
"7": "portalcubed:block/old_ap_floor_button",
"8": "portalcubed:block/old_ap_floor_button_e",
"particle": "portalcubed:block/aged_smooth_gray_panel_1"
"particle": "portalcubed:block/plywood"
},
"elements": [
{
Expand All @@ -30,8 +26,8 @@
"faces": {
"south": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"west": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#3"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#5"}
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 90, "texture": "#0"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 270, "texture": "#0"}
}
},
{
Expand All @@ -41,8 +37,8 @@
"faces": {
"north": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"west": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#5"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#3"}
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 270, "texture": "#0"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 90, "texture": "#0"}
}
},
{
Expand All @@ -52,8 +48,8 @@
"faces": {
"north": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"east": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#6"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#4"}
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 180, "texture": "#0"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#0"}
}
},
{
Expand All @@ -63,8 +59,8 @@
"faces": {
"east": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"south": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#4"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#6"}
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#0"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 180, "texture": "#0"}
}
},
{
Expand Down Expand Up @@ -170,4 +166,4 @@
"portalcubed:render_types": {
"translucent": ["transparent"]
}
}
}
120 changes: 58 additions & 62 deletions src/main/resources/assets/portalcubed/models/block/old_ap_floor_button_active.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,71 +2,12 @@
"credit": "Made with Blockbench by Cart3r. ",
"texture_size": [32, 32],
"textures": {
"0": "portalcubed:block/aged_smooth_gray_panel_1",
"3": "portalcubed:block/aged_smooth_gray_2x2_panel_bottom_left",
"4": "portalcubed:block/aged_smooth_gray_2x2_panel_bottom_right",
"5": "portalcubed:block/aged_smooth_gray_2x2_panel_top_left",
"6": "portalcubed:block/aged_smooth_gray_2x2_panel_top_right",
"2": "portalcubed:block/plywood",
"7": "portalcubed:block/old_ap_floor_button",
"8": "portalcubed:block/old_ap_floor_button_e",
"particle": "portalcubed:block/aged_smooth_gray_panel_1"
"particle": "portalcubed:block/plywood"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#0", "cullface": "north"},
"east": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#0", "cullface": "east"},
"south": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#0", "cullface": "south"},
"west": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#0", "cullface": "west"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#0", "cullface": "down"}
}
},
{
"from": [-8, 16.075, 8],
"to": [8, 17.075, 24],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0.075, 0]},
"faces": {
"south": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"west": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#3"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#5"}
}
},
{
"from": [-8, 16.075, -8],
"to": [8, 17.075, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0.075, 0]},
"faces": {
"north": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"west": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#5"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#3"}
}
},
{
"from": [8, 16.075, -8],
"to": [24, 17.075, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0.075, 0]},
"faces": {
"north": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"east": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#6"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#4"}
}
},
{
"from": [8, 16.075, 8],
"to": [24, 17.075, 24],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0.075, 0]},
"faces": {
"east": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"south": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#0"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#4"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#6"}
}
},
{
"name": "cube inverted",
"from": [20, 19.075, 20],
Expand Down Expand Up @@ -128,6 +69,61 @@
"faces": {
"up": {"uv": [10.484, 10.484, 0.016, 0.016], "texture": "#8"}
}
},
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#2", "cullface": "north"},
"east": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#2", "cullface": "east"},
"south": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#2", "cullface": "south"},
"west": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#2", "cullface": "west"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#2", "cullface": "down"}
}
},
{
"from": [-8, 16.075, 8],
"to": [8, 17.075, 24],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0.075, 0]},
"faces": {
"south": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#2"},
"west": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#2"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 90, "texture": "#2"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 270, "texture": "#2"}
}
},
{
"from": [-8, 16.075, -8],
"to": [8, 17.075, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0.075, 0]},
"faces": {
"north": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#2"},
"west": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#2"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 270, "texture": "#2"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 90, "texture": "#2"}
}
},
{
"from": [8, 16.075, -8],
"to": [24, 17.075, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0.075, 0]},
"faces": {
"north": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#2"},
"east": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#2"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 180, "texture": "#2"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#2"}
}
},
{
"from": [8, 16.075, 8],
"to": [24, 17.075, 24],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0.075, 0]},
"faces": {
"east": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#2"},
"south": {"uv": [0.016, 0.016, 15.984, 0.984], "texture": "#2"},
"up": {"uv": [0.016, 0.016, 15.984, 15.984], "texture": "#2"},
"down": {"uv": [0.016, 0.016, 15.984, 15.984], "rotation": 180, "texture": "#2"}
}
}
],
"display": {
Expand Down Expand Up @@ -170,4 +166,4 @@
"portalcubed:render_types": {
"translucent": ["transparent"]
}
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/portalcubed/models/block/plywood.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "portalcubed:block/plywood"
}
}
4 changes: 4 additions & 0 deletions src/main/resources/assets/portalcubed/models/item/plywood.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"parent": "portalcubed:block/plywood"

}
Binary file modified src/main/resources/assets/portalcubed/textures/block/old_aperture_door.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/portalcubed/textures/block/plywood.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/main/resources/data/minecraft/tags/blocks/mineable/axe.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"replace": false,
"values": [
"portalcubed:old_ap_white_2x2_panel_top_left",
"portalcubed:old_ap_white_2x2_panel_top_right",
"portalcubed:old_ap_white_2x2_panel_bottom_left",
"portalcubed:old_ap_white_2x2_panel_bottom_right",
"portalcubed:old_ap_white_checkered_panel",
"portalcubed:old_ap_white_panel",
"portalcubed:old_ap_white_panel_facade",
"portalcubed:old_ap_white_checkered_panel_facade",
"portalcubed:plywood"
]
}
8 changes: 0 additions & 8 deletions src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@
"portalcubed:portal_1_2x2_exposed_panel_top_right",
"portalcubed:portal_1_2x2_exposed_panel_bottom_left",
"portalcubed:portal_1_2x2_exposed_panel_bottom_right",
"portalcubed:old_ap_white_2x2_panel_top_left",
"portalcubed:old_ap_white_2x2_panel_top_right",
"portalcubed:old_ap_white_2x2_panel_bottom_left",
"portalcubed:old_ap_white_2x2_panel_bottom_right",
"portalcubed:old_ap_white_checkered_panel",
"portalcubed:old_ap_white_panel",
"portalcubed:portal_1_smooth_tiles",
"portalcubed:portal_1_smooth_gray_panel",
"portalcubed:portal_1_smooth_gray_half_panel",
Expand Down Expand Up @@ -183,8 +177,6 @@
"portalcubed:smooth_gray_half_panel_facade",
"portalcubed:aged_smooth_gray_panel_facade",
"portalcubed:aged_smooth_gray_half_panel_facade",
"portalcubed:old_ap_white_panel_facade",
"portalcubed:old_ap_white_checkered_panel_facade",
"portalcubed:old_ap_green_panel_facade",
"portalcubed:old_ap_blue_panel_facade",
"portalcubed:insulation_facade",
Expand Down
6 changes: 6 additions & 0 deletions src/main/resources/data/minecraft/tags/items/planks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"portalcubed:plywood"
]
}
1 change: 1 addition & 0 deletions src/main/resources/data/portalcubed/advancements/recipes/old_aperture_white_panels.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"portalcubed:old_aperture_white_2x2_panel_top_left_crafting",
"portalcubed:old_aperture_white_2x2_panel_top_right_crafting",
"portalcubed:old_aperture_white_panel_crafting",
"portalcubed:plywood_crafting",
"portalcubed:old_aperture_white_checkered_panel_crafting"
]
},
Expand Down
20 changes: 20 additions & 0 deletions src/main/resources/data/portalcubed/loot_tables/blocks/plywood.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1.0,
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"name": "portalcubed:plywood"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
2 changes: 1 addition & 1 deletion src/main/resources/data/portalcubed/recipes/old_ap_door_crafting.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"key": {
"X": {
"tag": "minecraft:planks"
"item": "portalcubed:plywood"
},
"Y": {
"tag": "c:lime_dyes"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/data/portalcubed/recipes/old_aperture_floor_button_crafting.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"tag": "minecraft:wooden_pressure_plates"
},
"Z": {
"tag": "portalcubed:portal_2_aged_gray_panels"
"item": "portalcubed:plywood"
},
"B": {
"item": "minecraft:redstone"
Expand Down
20 changes: 20 additions & 0 deletions src/main/resources/data/portalcubed/recipes/plywood_crafting.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"category": "building",
"pattern": [
"YX",
"XY"
],
"key": {
"X": {
"tag": "portalcubed:planks_that_burn"
},
"Y": {
"tag": "portalcubed:stripped_logs_that_burn"
}
},
"result": {
"item": "portalcubed:plywood",
"count": 8
}
}
3 changes: 2 additions & 1 deletion src/main/resources/data/portalcubed/tags/blocks/cant_place_portal_on.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"portalcubed:aged_padded_gray_2x2_panel_top_right",
"portalcubed:aged_padded_gray_2x2_panel_bottom_left",
"portalcubed:aged_padded_gray_2x2_panel_bottom_right",
"portalcubed:plywood",
"portalcubed:old_ap_blue_panel",
"portalcubed:old_ap_blue_2x1_panel_top",
"portalcubed:old_ap_blue_2x1_panel_bottom",
Expand Down Expand Up @@ -195,4 +196,4 @@
"minecraft:bedrock"

]
}
}
13 changes: 13 additions & 0 deletions src/main/resources/data/portalcubed/tags/items/planks_that_burn.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"replace": false,
"values" : [
"minecraft:oak_planks",
"minecraft:birch_planks",
"minecraft:spruce_planks",
"minecraft:jungle_planks",
"minecraft:acacia_planks",
"minecraft:dark_oak_planks",
"minecraft:mangrove_planks",
"minecraft:cherry_planks"
]
}

0 comments on commit 4493895

Please sign in to comment.