diff --git a/common-files/src/main/resources/additional-real-blocks.yml b/common-files/src/main/resources/additional-real-blocks.yml index afdf2f7ea..c425a70f3 100644 --- a/common-files/src/main/resources/additional-real-blocks.yml +++ b/common-files/src/main/resources/additional-real-blocks.yml @@ -81,4 +81,5 @@ minecraft:cherry_fence_gate: 16 minecraft:bamboo_fence_gate: 16 minecraft:crimson_fence_gate: 16 minecraft:warped_fence_gate: 16 -minecraft:barrier: 24 \ No newline at end of file +minecraft:barrier: 24 +minecraft:white_bed: 1 \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/blocks.yml b/common-files/src/main/resources/resources/default/configuration/blocks.yml index d1fa2dbd4..1aca0f06c 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks.yml @@ -563,8 +563,6 @@ items#misc: model: type: minecraft:model path: minecraft:item/custom/sofa - generation: - parent: minecraft:block/custom/sofa behavior: type: block_item block: @@ -587,28 +585,11 @@ items#misc: hit: minecraft:block.wood.hit place: minecraft:block.wood.place step: minecraft:block.wood.step - states: - properties: - waterlogged: - type: boolean - default: false - appearances: - waterlogged=false: - state: sculk_sensor[power=1,sculk_sensor_phase=inactive,waterlogged=false] - model: - path: minecraft:block/custom/sofa - waterlogged=true: - state: sculk_sensor[power=1,sculk_sensor_phase=inactive,waterlogged=true] - model: - path: minecraft:block/custom/sofa - variants: - waterlogged=false: - appearance: waterlogged=false - id: 0 - waterlogged=true: - appearance: waterlogged=true - id: 1 - + state: + id: 0 + state: white_bed[facing=west,occupied=false,part=foot] + entity-renderer: + item: default:sofa default:connectable_sofa_straight: material: nether_brick custom-model-data: 3009 diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/sofa.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/sofa.json similarity index 78% rename from common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/sofa.json rename to common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/sofa.json index 07bbf9eaa..165259dc3 100644 --- a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/sofa.json +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/sofa.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "textures": { "0": "item/custom/sofa", @@ -6,9 +7,9 @@ }, "elements": [ { - "from": [1, 0, 1], - "to": [3, 3, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 1]}, + "from": [-0.07, -0.035, -0.07], + "to": [2.95, 2.495, 2.95], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.07, -0.035, -0.07]}, "faces": { "north": {"uv": [14.5, 15.25, 15, 16], "texture": "#0"}, "east": {"uv": [15, 15.25, 15.5, 16], "texture": "#0"}, @@ -19,9 +20,9 @@ } }, { - "from": [13, 0, 1], - "to": [15, 3, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 1]}, + "from": [13.05, -0.035, -0.07], + "to": [16.07, 2.495, 2.95], + "rotation": {"angle": 0, "axis": "y", "origin": [16.07, -0.035, -0.07]}, "faces": { "north": {"uv": [15, 15.25, 14.5, 16], "texture": "#0"}, "east": {"uv": [14.5, 15.25, 15, 16], "texture": "#0"}, @@ -32,9 +33,9 @@ } }, { - "from": [13, 0, 13], - "to": [15, 3, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 15]}, + "from": [13.05, -0.035, 13.05], + "to": [16.07, 2.495, 16.07], + "rotation": {"angle": 0, "axis": "y", "origin": [16.07, -0.035, 16.07]}, "faces": { "north": {"uv": [15, 15.25, 15.5, 16], "texture": "#0"}, "east": {"uv": [15, 15.25, 14.5, 16], "texture": "#0"}, @@ -45,9 +46,9 @@ } }, { - "from": [1, 0, 13], - "to": [3, 3, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 15]}, + "from": [-0.07, -0.035, 13.05], + "to": [2.95, 2.495, 16.07], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.07, -0.035, 16.07]}, "faces": { "north": {"uv": [15.5, 15.25, 15, 16], "texture": "#0"}, "east": {"uv": [15.5, 15.25, 15, 16], "texture": "#0"}, @@ -58,9 +59,9 @@ } }, { - "from": [0.01, 2.51, 0.01], - "to": [15.99, 8.49, 15.99], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, + "from": [-0.0699, 2.5001, -0.0699], + "to": [16.0699, 9.0399, 16.0699], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.08, 1.985, -0.08]}, "faces": { "north": {"uv": [4, 11.5, 8, 13], "texture": "#0"}, "east": {"uv": [8, 11.5, 4, 13], "texture": "#0"}, @@ -83,12 +84,12 @@ "scale": [0.25, 0.25, 0.25] }, "firstperson_righthand": { - "rotation": [0, 180, 0], + "rotation": [0, -180, 0], "translation": [0.5, 0.5, 0], "scale": [0.5, 0.5, 0.5] }, "firstperson_lefthand": { - "rotation": [0, 180, 0], + "rotation": [0, -180, 0], "translation": [0.5, 0.5, 0], "scale": [0.5, 0.5, 0.5] }, diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java index 81fcf2e9a..bc7e28b0d 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java @@ -465,7 +465,7 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/block/custom/pebble_3.json"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/item/custom/sofa_straight.json"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/item/custom/sofa_inner.json"); - plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/block/custom/sofa.json"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/item/custom/sofa.json"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/sofa.png"); // ores