From f7f32a07e98298ab60e13c512c4bab3cdd7e1123 Mon Sep 17 00:00:00 2001 From: OrekiWoof Date: Thu, 19 Mar 2026 02:19:51 +0100 Subject: [PATCH] make pin board woodtyped --- .../blocktypes/pinboard2x2.json | 32 +++++++++++-------- .../blocktypes/pinboard3x3.json | 32 +++++++++++-------- .../assets/dusiulkaspinboard/lang/en.json | 4 +-- .../recipes/grid/pinboard2x2.json | 4 +-- .../recipes/grid/pinboard3x3.json | 4 +-- 5 files changed, 42 insertions(+), 34 deletions(-) diff --git a/ButterflyPins/assets/dusiulkaspinboard/blocktypes/pinboard2x2.json b/ButterflyPins/assets/dusiulkaspinboard/blocktypes/pinboard2x2.json index ceca366..8c0f793 100644 --- a/ButterflyPins/assets/dusiulkaspinboard/blocktypes/pinboard2x2.json +++ b/ButterflyPins/assets/dusiulkaspinboard/blocktypes/pinboard2x2.json @@ -7,6 +7,7 @@ { "name": "Lockable" } ], "variantgroups": [ + { "code": "wood", "loadFromProperties": "block/wood" }, { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } ], "attributes": { @@ -21,14 +22,17 @@ "reinforcable": true }, "creativeinventory": { - "general": ["pinboard2x2-south"], - "decorative": ["pinboard2x2-south"] + "general": ["pinboard2x2-oak-north"], + "decorative": ["pinboard2x2-oak-north"] + }, + "textures": { + "wood": { "base": "game:block/wood/debarked/{wood}" } }, "shapebytype": { - "*-north": { "base": "dusiulkaspinboard:block/pinboard-2x2", "rotateY": 180 }, - "*-east": { "base": "dusiulkaspinboard:block/pinboard-2x2", "rotateY": 90 }, - "*-south": { "base": "dusiulkaspinboard:block/pinboard-2x2", "rotateY": 0 }, - "*-west": { "base": "dusiulkaspinboard:block/pinboard-2x2", "rotateY": 270 } + "*-*-north": { "base": "dusiulkaspinboard:block/pinboard-2x2", "rotateY": 180 }, + "*-*-east": { "base": "dusiulkaspinboard:block/pinboard-2x2", "rotateY": 90 }, + "*-*-south": { "base": "dusiulkaspinboard:block/pinboard-2x2", "rotateY": 0 }, + "*-*-west": { "base": "dusiulkaspinboard:block/pinboard-2x2", "rotateY": 270 } }, "blockmaterial": "Wood", "drawtype": "json", @@ -47,10 +51,10 @@ "y2": 0.9375, "z2": 1.0, "rotateYByType": { - "*-north": 180, - "*-east": 90, - "*-south": 0, - "*-west": 270 + "*-*-north": 180, + "*-*-east": 90, + "*-*-south": 0, + "*-*-west": 270 } }, "selectionbox": { @@ -61,10 +65,10 @@ "y2": 0.9375, "z2": 1.0, "rotateYByType": { - "*-north": 180, - "*-east": 90, - "*-south": 0, - "*-west": 270 + "*-*-north": 180, + "*-*-east": 90, + "*-*-south": 0, + "*-*-west": 270 } }, "combustibleProps": { diff --git a/ButterflyPins/assets/dusiulkaspinboard/blocktypes/pinboard3x3.json b/ButterflyPins/assets/dusiulkaspinboard/blocktypes/pinboard3x3.json index de98591..5dae147 100644 --- a/ButterflyPins/assets/dusiulkaspinboard/blocktypes/pinboard3x3.json +++ b/ButterflyPins/assets/dusiulkaspinboard/blocktypes/pinboard3x3.json @@ -7,6 +7,7 @@ { "name": "Lockable" } ], "variantgroups": [ + { "code": "wood", "loadFromProperties": "block/wood" }, { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } ], "attributes": { @@ -21,14 +22,17 @@ "reinforcable": true }, "creativeinventory": { - "general": ["pinboard3x3-south"], - "decorative": ["pinboard3x3-south"] + "general": ["pinboard3x3-oak-north"], + "decorative": ["pinboard3x3-oak-north"] + }, + "textures": { + "wood": { "base": "game:block/wood/debarked/{wood}" } }, "shapebytype": { - "*-north": { "base": "dusiulkaspinboard:block/pinboard-3x3", "rotateY": 180 }, - "*-east": { "base": "dusiulkaspinboard:block/pinboard-3x3", "rotateY": 90 }, - "*-south": { "base": "dusiulkaspinboard:block/pinboard-3x3", "rotateY": 0 }, - "*-west": { "base": "dusiulkaspinboard:block/pinboard-3x3", "rotateY": 270 } + "*-*-north": { "base": "dusiulkaspinboard:block/pinboard-3x3", "rotateY": 180 }, + "*-*-east": { "base": "dusiulkaspinboard:block/pinboard-3x3", "rotateY": 90 }, + "*-*-south": { "base": "dusiulkaspinboard:block/pinboard-3x3", "rotateY": 0 }, + "*-*-west": { "base": "dusiulkaspinboard:block/pinboard-3x3", "rotateY": 270 } }, "blockmaterial": "Wood", "drawtype": "json", @@ -47,10 +51,10 @@ "y2": 0.9375, "z2": 1.0, "rotateYByType": { - "*-north": 180, - "*-east": 90, - "*-south": 0, - "*-west": 270 + "*-*-north": 180, + "*-*-east": 90, + "*-*-south": 0, + "*-*-west": 270 } }, "selectionbox": { @@ -61,10 +65,10 @@ "y2": 0.9375, "z2": 1.0, "rotateYByType": { - "*-north": 180, - "*-east": 90, - "*-south": 0, - "*-west": 270 + "*-*-north": 180, + "*-*-east": 90, + "*-*-south": 0, + "*-*-west": 270 } }, "combustibleProps": { diff --git a/ButterflyPins/assets/dusiulkaspinboard/lang/en.json b/ButterflyPins/assets/dusiulkaspinboard/lang/en.json index df6e94b..138b652 100644 --- a/ButterflyPins/assets/dusiulkaspinboard/lang/en.json +++ b/ButterflyPins/assets/dusiulkaspinboard/lang/en.json @@ -1,4 +1,4 @@ { - "block-pinboard2x2-*": "Butterfly Pin Board (2x2)", - "block-pinboard3x3-*": "Butterfly Pin Board (3x3)" + "block-pinboard2x2-*-*": "Butterfly Pin Board (2x2)", + "block-pinboard3x3-*-*": "Butterfly Pin Board (3x3)" } \ No newline at end of file diff --git a/ButterflyPins/assets/dusiulkaspinboard/recipes/grid/pinboard2x2.json b/ButterflyPins/assets/dusiulkaspinboard/recipes/grid/pinboard2x2.json index e2715b0..9f8f0bb 100644 --- a/ButterflyPins/assets/dusiulkaspinboard/recipes/grid/pinboard2x2.json +++ b/ButterflyPins/assets/dusiulkaspinboard/recipes/grid/pinboard2x2.json @@ -1,7 +1,7 @@ { "ingredientPattern": "_S_\tSBS\t_S_", "ingredients": { - "S": { "type": "item", "code": "game:stick" }, + "S": { "type": "item", "code": "game:plank-*", "name": "wood" }, "B": { "type": "item", "code": "game:*-butterflypin-*" @@ -9,5 +9,5 @@ }, "width": 3, "height": 3, - "output": { "type": "block", "code": "pinboard2x2-north" } + "output": { "type": "block", "code": "pinboard2x2-{wood}-north" } } \ No newline at end of file diff --git a/ButterflyPins/assets/dusiulkaspinboard/recipes/grid/pinboard3x3.json b/ButterflyPins/assets/dusiulkaspinboard/recipes/grid/pinboard3x3.json index fc7ceef..c728805 100644 --- a/ButterflyPins/assets/dusiulkaspinboard/recipes/grid/pinboard3x3.json +++ b/ButterflyPins/assets/dusiulkaspinboard/recipes/grid/pinboard3x3.json @@ -1,7 +1,7 @@ { "ingredientPattern": "S_S\t_B_\tS_S", "ingredients": { - "S": { "type": "item", "code": "game:stick" }, + "S": { "type": "item", "code": "game:plank-*", "name": "wood" }, "B": { "type": "item", "code": "game:*-butterflypin-*" @@ -9,5 +9,5 @@ }, "width": 3, "height": 3, - "output": { "type": "block", "code": "pinboard3x3-north" } + "output": { "type": "block", "code": "pinboard3x3-{wood}-north" } } \ No newline at end of file