From e1f88b453a658ec9dd12381c4883fd566fefbd8a Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 26 Sep 2020 16:51:12 +0300 Subject: [PATCH] Default ID fix, renames --- .../render/EChestBlockEntityRenderer.java | 6 +- .../render/ESignBlockEntityRenderer.java | 2 +- utilities/paulevs/wooden/Helper.java | 18 ++- utility_res/block/%name%_bark.json | 8 +- utility_res/block/%name%_barrel.json | 8 ++ utility_res/block/%name%_barrel_open.json | 8 ++ utility_res/block/%name%_button.json | 8 +- .../block/%name%_button_inventory.json | 8 +- utility_res/block/%name%_button_pressed.json | 8 +- utility_res/block/%name%_crafting_table.json | 12 ++ utility_res/block/%name%_door_bottom.json | 10 +- .../block/%name%_door_bottom_hinge.json | 10 +- utility_res/block/%name%_door_top.json | 10 +- utility_res/block/%name%_door_top_hinge.json | 10 +- utility_res/block/%name%_empty.json | 5 + .../block/%name%_fence_gate_closed.json | 8 +- utility_res/block/%name%_fence_gate_open.json | 8 +- utility_res/block/%name%_fence_inventory.json | 8 +- utility_res/block/%name%_fence_post.json | 8 +- utility_res/block/%name%_fence_side.json | 8 +- utility_res/block/%name%_half_slab.json | 12 +- utility_res/block/%name%_inner_stairs.json | 12 +- utility_res/block/%name%_ladder.json | 8 +- utility_res/block/%name%_log.json | 20 ++-- utility_res/block/%name%_outer_stairs.json | 12 +- utility_res/block/%name%_planks.json | 8 +- .../block/%name%_pressure_plate_down.json | 8 +- .../block/%name%_pressure_plate_up.json | 8 +- utility_res/block/%name%_stairs.json | 12 +- utility_res/block/%name%_striped_bark.json | 6 + utility_res/block/%name%_striped_log.json | 12 ++ utility_res/block/%name%_trapdoor.json | 66 +---------- .../block/%name%_wall_gate_closed.json | 8 +- utility_res/block/%name%_wall_gate_open.json | 8 +- utility_res/block/barrel_%name%.json | 8 -- utility_res/block/barrel_%name%_open.json | 8 -- utility_res/block/crafting_table_%name%.json | 12 -- utility_res/block/striped_bark_%name%.json | 6 - utility_res/block/striped_log_%name%.json | 12 -- utility_res/blockstates/%name%_bark.json | 10 +- utility_res/blockstates/%name%_button.json | 52 ++++----- utility_res/blockstates/%name%_door.json | 68 +++++------ utility_res/blockstates/%name%_fence.json | 30 ++--- utility_res/blockstates/%name%_gate.json | 36 +++--- utility_res/blockstates/%name%_ladder.json | 12 +- utility_res/blockstates/%name%_log.json | 10 +- utility_res/blockstates/%name%_planks.json | 6 +- utility_res/blockstates/%name%_plate.json | 8 +- utility_res/blockstates/%name%_slab.json | 10 +- utility_res/blockstates/%name%_stairs.json | 84 +++++++------- utility_res/blockstates/%name%_trapdoor.json | 36 +++--- utility_res/blockstates/bar_stool_%name%.json | 4 +- utility_res/blockstates/barrel_%name%.json | 106 +++++++++--------- utility_res/blockstates/chair_%name%.json | 4 +- utility_res/blockstates/chest_%name%.json | 8 +- .../blockstates/crafting_table_%name%.json | 8 +- utility_res/blockstates/sign_%name%.json | 6 +- .../blockstates/striped_bark_%name%.json | 10 +- .../blockstates/striped_log_%name%.json | 10 +- utility_res/blockstates/taburet_%name%.json | 4 +- utility_res/item/%name%_bark.json | 2 +- utility_res/item/%name%_barrel.json | 3 + utility_res/item/%name%_button.json | 2 +- utility_res/item/%name%_chest.json | 6 + utility_res/item/%name%_crafting_table.json | 3 + utility_res/item/%name%_door.json | 6 +- utility_res/item/%name%_fence.json | 2 +- utility_res/item/%name%_gate.json | 2 +- utility_res/item/%name%_ladder.json | 6 +- utility_res/item/%name%_log.json | 2 +- utility_res/item/%name%_planks.json | 2 +- utility_res/item/%name%_plate.json | 2 +- utility_res/item/%name%_sign.json | 6 + utility_res/item/%name%_slab.json | 2 +- utility_res/item/%name%_stairs.json | 2 +- utility_res/item/%name%_striped_bark.json | 3 + utility_res/item/%name%_striped_log.json | 3 + utility_res/item/%name%_taburet.json | 3 + utility_res/item/%name%_trapdoor.json | 2 +- utility_res/item/bar_stool_%name%.json | 3 - utility_res/item/barrel_%name%.json | 3 - utility_res/item/chair_%name%.json | 15 --- utility_res/item/chest_%name%.json | 6 - utility_res/item/crafting_table_%name%.json | 3 - utility_res/item/sign_%name%.json | 6 - utility_res/item/striped_bark_%name%.json | 3 - utility_res/item/striped_log_%name%.json | 3 - utility_res/item/taburet_%name%.json | 3 - 88 files changed, 482 insertions(+), 561 deletions(-) create mode 100644 utility_res/block/%name%_barrel.json create mode 100644 utility_res/block/%name%_barrel_open.json create mode 100644 utility_res/block/%name%_crafting_table.json create mode 100644 utility_res/block/%name%_empty.json create mode 100644 utility_res/block/%name%_striped_bark.json create mode 100644 utility_res/block/%name%_striped_log.json delete mode 100644 utility_res/block/barrel_%name%.json delete mode 100644 utility_res/block/barrel_%name%_open.json delete mode 100644 utility_res/block/crafting_table_%name%.json delete mode 100644 utility_res/block/striped_bark_%name%.json delete mode 100644 utility_res/block/striped_log_%name%.json create mode 100644 utility_res/item/%name%_barrel.json create mode 100644 utility_res/item/%name%_chest.json create mode 100644 utility_res/item/%name%_crafting_table.json create mode 100644 utility_res/item/%name%_sign.json create mode 100644 utility_res/item/%name%_striped_bark.json create mode 100644 utility_res/item/%name%_striped_log.json create mode 100644 utility_res/item/%name%_taburet.json delete mode 100644 utility_res/item/bar_stool_%name%.json delete mode 100644 utility_res/item/barrel_%name%.json delete mode 100644 utility_res/item/chair_%name%.json delete mode 100644 utility_res/item/chest_%name%.json delete mode 100644 utility_res/item/crafting_table_%name%.json delete mode 100644 utility_res/item/sign_%name%.json delete mode 100644 utility_res/item/striped_bark_%name%.json delete mode 100644 utility_res/item/striped_log_%name%.json delete mode 100644 utility_res/item/taburet_%name%.json diff --git a/src/main/java/ru/betterend/blocks/entities/render/EChestBlockEntityRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/EChestBlockEntityRenderer.java index 0f52b4c1..83015d17 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/EChestBlockEntityRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/EChestBlockEntityRenderer.java @@ -165,9 +165,9 @@ public class EChestBlockEntityRenderer extends BlockEntityRenderer { diff --git a/src/main/java/ru/betterend/blocks/entities/render/ESignBlockEntityRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/ESignBlockEntityRenderer.java index 99431095..11cd2ec6 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/ESignBlockEntityRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/ESignBlockEntityRenderer.java @@ -105,7 +105,7 @@ public class ESignBlockEntityRenderer extends BlockEntityRenderer { if (item instanceof BlockItem) { diff --git a/utilities/paulevs/wooden/Helper.java b/utilities/paulevs/wooden/Helper.java index dbb33e7f..801dae37 100644 --- a/utilities/paulevs/wooden/Helper.java +++ b/utilities/paulevs/wooden/Helper.java @@ -30,13 +30,17 @@ public class Helper public static final String[] BLOCKS = new String[] { "%name%_bark.json", + "%name%_barrel.json", + "%name%_barrel_open.json", "%name%_button.json", "%name%_button_inventory.json", "%name%_button_pressed.json", + "%name%_crafting_table.json", "%name%_door_bottom.json", "%name%_door_bottom_hinge.json", "%name%_door_top.json", "%name%_door_top_hinge.json", + "%name%_empty.json", "%name%_fence_gate_closed.json", "%name%_fence_gate_open.json", "%name%_fence_inventory.json", @@ -51,19 +55,11 @@ public class Helper "%name%_pressure_plate_down.json", "%name%_pressure_plate_up.json", "%name%_stairs.json", + "%name%_striped_bark.json", + "%name%_striped_log.json", "%name%_trapdoor.json", "%name%_wall_gate_closed.json", - "%name%_wall_gate_open.json", - "barrel_%name%.json", - "barrel_%name%_open.json", - "bar_stool_%name%.json", - "chair_%name%.json", - "chair_%name%_top.json", - "crafting_table_%name%.json", - "empty_%name%.json", - "striped_bark_%name%.json", - "striped_log_%name%.json", - "taburet_%name%.json" + "%name%_wall_gate_open.json" }; public static final String[] ITEMS = new String[] { diff --git a/utility_res/block/%name%_bark.json b/utility_res/block/%name%_bark.json index cceda3df..614c9422 100644 --- a/utility_res/block/%name%_bark.json +++ b/utility_res/block/%name%_bark.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", - "textures": { - "all": "betternether:block/%name%_log_side" - } + "parent": "block/cube_all", + "textures": { + "all": "betternether:block/%name%_log_side" + } } diff --git a/utility_res/block/%name%_barrel.json b/utility_res/block/%name%_barrel.json new file mode 100644 index 00000000..71b7ed35 --- /dev/null +++ b/utility_res/block/%name%_barrel.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "betternether:block/%name%_barrel_top", + "bottom": "betternether:block/%name%_barrel_bottom", + "side": "betternether:block/%name%_barrel_side" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_barrel_open.json b/utility_res/block/%name%_barrel_open.json new file mode 100644 index 00000000..4e1b1480 --- /dev/null +++ b/utility_res/block/%name%_barrel_open.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "betternether:block/%name%_barrel_top_open", + "bottom": "betternether:block/%name%_barrel_bottom", + "side": "betternether:block/%name%_barrel_side" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_button.json b/utility_res/block/%name%_button.json index 1b61ccc1..b12353a2 100644 --- a/utility_res/block/%name%_button.json +++ b/utility_res/block/%name%_button.json @@ -1,6 +1,6 @@ { - "parent": "block/button", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/button", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_button_inventory.json b/utility_res/block/%name%_button_inventory.json index 66c59d16..d46a9705 100644 --- a/utility_res/block/%name%_button_inventory.json +++ b/utility_res/block/%name%_button_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/button_inventory", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/button_inventory", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_button_pressed.json b/utility_res/block/%name%_button_pressed.json index 1e4a8b9b..6daeb65a 100644 --- a/utility_res/block/%name%_button_pressed.json +++ b/utility_res/block/%name%_button_pressed.json @@ -1,6 +1,6 @@ { - "parent": "block/button_pressed", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/button_pressed", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_crafting_table.json b/utility_res/block/%name%_crafting_table.json new file mode 100644 index 00000000..0c62afc2 --- /dev/null +++ b/utility_res/block/%name%_crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "betternether:block/%name%_crafting_table_front", + "north": "betternether:block/%name%_crafting_table_front", + "south": "betternether:block/%name%_crafting_table_side", + "east": "betternether:block/%name%_crafting_table_side", + "west": "betternether:block/%name%_crafting_table_front", + "up": "betternether:block/%name%_crafting_table_top", + "down": "betternether:block/%name%_crafting_table_bottom" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_door_bottom.json b/utility_res/block/%name%_door_bottom.json index 721931cd..85ce555f 100644 --- a/utility_res/block/%name%_door_bottom.json +++ b/utility_res/block/%name%_door_bottom.json @@ -1,7 +1,7 @@ { - "parent": "block/door_bottom", - "textures": { - "bottom": "betternether:block/%name%_door_bottom", - "top": "betternether:block/%name%_door_bottom" - } + "parent": "block/door_bottom", + "textures": { + "bottom": "betternether:block/%name%_door_bottom", + "top": "betternether:block/%name%_door_bottom" + } } diff --git a/utility_res/block/%name%_door_bottom_hinge.json b/utility_res/block/%name%_door_bottom_hinge.json index 59b865c1..85a9b848 100644 --- a/utility_res/block/%name%_door_bottom_hinge.json +++ b/utility_res/block/%name%_door_bottom_hinge.json @@ -1,7 +1,7 @@ { - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "betternether:block/%name%_door_bottom", - "top": "betternether:block/%name%_door_bottom" - } + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "betternether:block/%name%_door_bottom", + "top": "betternether:block/%name%_door_bottom" + } } diff --git a/utility_res/block/%name%_door_top.json b/utility_res/block/%name%_door_top.json index c92e6798..29ee3b71 100644 --- a/utility_res/block/%name%_door_top.json +++ b/utility_res/block/%name%_door_top.json @@ -1,7 +1,7 @@ { - "parent": "block/door_top", - "textures": { - "bottom": "betternether:block/%name%_door_top", - "top": "betternether:block/%name%_door_top" - } + "parent": "block/door_top", + "textures": { + "bottom": "betternether:block/%name%_door_top", + "top": "betternether:block/%name%_door_top" + } } diff --git a/utility_res/block/%name%_door_top_hinge.json b/utility_res/block/%name%_door_top_hinge.json index df2c68fd..f17b4b6c 100644 --- a/utility_res/block/%name%_door_top_hinge.json +++ b/utility_res/block/%name%_door_top_hinge.json @@ -1,7 +1,7 @@ { - "parent": "block/door_top_rh", - "textures": { - "bottom": "betternether:block/%name%_door_top", - "top": "betternether:block/%name%_door_top" - } + "parent": "block/door_top_rh", + "textures": { + "bottom": "betternether:block/%name%_door_top", + "top": "betternether:block/%name%_door_top" + } } diff --git a/utility_res/block/%name%_empty.json b/utility_res/block/%name%_empty.json new file mode 100644 index 00000000..86435462 --- /dev/null +++ b/utility_res/block/%name%_empty.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "betternether:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_fence_gate_closed.json b/utility_res/block/%name%_fence_gate_closed.json index 4526f463..47fd54ad 100644 --- a/utility_res/block/%name%_fence_gate_closed.json +++ b/utility_res/block/%name%_fence_gate_closed.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/template_fence_gate", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_fence_gate_open.json b/utility_res/block/%name%_fence_gate_open.json index 01f0103e..8d500906 100644 --- a/utility_res/block/%name%_fence_gate_open.json +++ b/utility_res/block/%name%_fence_gate_open.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/template_fence_gate_open", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_fence_inventory.json b/utility_res/block/%name%_fence_inventory.json index 222171d9..185e8967 100644 --- a/utility_res/block/%name%_fence_inventory.json +++ b/utility_res/block/%name%_fence_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_inventory", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/fence_inventory", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_fence_post.json b/utility_res/block/%name%_fence_post.json index ec5ab1d7..d8f61c06 100644 --- a/utility_res/block/%name%_fence_post.json +++ b/utility_res/block/%name%_fence_post.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_post", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/fence_post", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_fence_side.json b/utility_res/block/%name%_fence_side.json index c3d81744..8cdbc515 100644 --- a/utility_res/block/%name%_fence_side.json +++ b/utility_res/block/%name%_fence_side.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_side", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/fence_side", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_half_slab.json b/utility_res/block/%name%_half_slab.json index eedbc534..a7682e65 100644 --- a/utility_res/block/%name%_half_slab.json +++ b/utility_res/block/%name%_half_slab.json @@ -1,8 +1,8 @@ { - "parent": "block/slab", - "textures": { - "bottom": "betternether:block/%name%_planks", - "top": "betternether:block/%name%_planks", - "side": "betternether:block/%name%_planks" - } + "parent": "block/slab", + "textures": { + "bottom": "betternether:block/%name%_planks", + "top": "betternether:block/%name%_planks", + "side": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_inner_stairs.json b/utility_res/block/%name%_inner_stairs.json index 686edd99..71b0011a 100644 --- a/utility_res/block/%name%_inner_stairs.json +++ b/utility_res/block/%name%_inner_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/inner_stairs", - "textures": { - "bottom": "betternether:block/%name%_planks", - "top": "betternether:block/%name%_planks", - "side": "betternether:block/%name%_planks" - } + "parent": "block/inner_stairs", + "textures": { + "bottom": "betternether:block/%name%_planks", + "top": "betternether:block/%name%_planks", + "side": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_ladder.json b/utility_res/block/%name%_ladder.json index b1b1a149..b0fac21c 100644 --- a/utility_res/block/%name%_ladder.json +++ b/utility_res/block/%name%_ladder.json @@ -1,7 +1,7 @@ { - "parent": "betternether:block/reeds_ladder", - "textures": { - "particle": "betternether:block/%name%_ladder", + "parent": "betternether:block/reeds_ladder", + "textures": { + "particle": "betternether:block/%name%_ladder", "texture": "betternether:block/%name%_ladder" - } + } } diff --git a/utility_res/block/%name%_log.json b/utility_res/block/%name%_log.json index 231f4f62..f04ecde4 100644 --- a/utility_res/block/%name%_log.json +++ b/utility_res/block/%name%_log.json @@ -1,12 +1,12 @@ { - "parent": "block/cube", - "textures": { - "particle": "betternether:block/%name%_log_side", - "down": "betternether:block/%name%_log_top", - "up": "betternether:block/%name%_log_top", - "north": "betternether:block/%name%_log_side", - "east": "betternether:block/%name%_log_side", - "south": "betternether:block/%name%_log_side", - "west": "betternether:block/%name%_log_side" - } + "parent": "block/cube", + "textures": { + "particle": "betternether:block/%name%_log_side", + "down": "betternether:block/%name%_log_top", + "up": "betternether:block/%name%_log_top", + "north": "betternether:block/%name%_log_side", + "east": "betternether:block/%name%_log_side", + "south": "betternether:block/%name%_log_side", + "west": "betternether:block/%name%_log_side" + } } \ No newline at end of file diff --git a/utility_res/block/%name%_outer_stairs.json b/utility_res/block/%name%_outer_stairs.json index 6a05a3ff..54619de5 100644 --- a/utility_res/block/%name%_outer_stairs.json +++ b/utility_res/block/%name%_outer_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/outer_stairs", - "textures": { - "bottom": "betternether:block/%name%_planks", - "top": "betternether:block/%name%_planks", - "side": "betternether:block/%name%_planks" - } + "parent": "block/outer_stairs", + "textures": { + "bottom": "betternether:block/%name%_planks", + "top": "betternether:block/%name%_planks", + "side": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_planks.json b/utility_res/block/%name%_planks.json index 7732858e..5fecef7d 100644 --- a/utility_res/block/%name%_planks.json +++ b/utility_res/block/%name%_planks.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", - "textures": { - "all": "betternether:block/%name%_planks" - } + "parent": "block/cube_all", + "textures": { + "all": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_pressure_plate_down.json b/utility_res/block/%name%_pressure_plate_down.json index fad108c4..33ca601c 100644 --- a/utility_res/block/%name%_pressure_plate_down.json +++ b/utility_res/block/%name%_pressure_plate_down.json @@ -1,6 +1,6 @@ { - "parent": "block/pressure_plate_down", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/pressure_plate_down", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_pressure_plate_up.json b/utility_res/block/%name%_pressure_plate_up.json index 23f3869a..49c69d67 100644 --- a/utility_res/block/%name%_pressure_plate_up.json +++ b/utility_res/block/%name%_pressure_plate_up.json @@ -1,6 +1,6 @@ { - "parent": "block/pressure_plate_up", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/pressure_plate_up", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_stairs.json b/utility_res/block/%name%_stairs.json index 42ec26ff..7e144a1b 100644 --- a/utility_res/block/%name%_stairs.json +++ b/utility_res/block/%name%_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/stairs", - "textures": { - "bottom": "betternether:block/%name%_planks", - "top": "betternether:block/%name%_planks", - "side": "betternether:block/%name%_planks" - } + "parent": "block/stairs", + "textures": { + "bottom": "betternether:block/%name%_planks", + "top": "betternether:block/%name%_planks", + "side": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_striped_bark.json b/utility_res/block/%name%_striped_bark.json new file mode 100644 index 00000000..85395d1c --- /dev/null +++ b/utility_res/block/%name%_striped_bark.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betternether:block/%name%_striped_log_side" + } +} diff --git a/utility_res/block/%name%_striped_log.json b/utility_res/block/%name%_striped_log.json new file mode 100644 index 00000000..69c6f6e8 --- /dev/null +++ b/utility_res/block/%name%_striped_log.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "betternether:block/%name%_striped_log_side", + "down": "betternether:block/%name%_striped_log_top", + "up": "betternether:block/%name%_striped_log_top", + "north": "betternether:block/%name%_striped_log_side", + "east": "betternether:block/%name%_striped_log_side", + "south": "betternether:block/%name%_striped_log_side", + "west": "betternether:block/%name%_striped_log_side" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_trapdoor.json b/utility_res/block/%name%_trapdoor.json index 968a0140..b37eb3de 100644 --- a/utility_res/block/%name%_trapdoor.json +++ b/utility_res/block/%name%_trapdoor.json @@ -1,68 +1,6 @@ { - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", + "parent": "block/template_orientable_trapdoor_bottom", "textures": { - "particle": "betternether:block/%name%_trapdoor", - "texture": "betternether:block/%name%_trapdoor", - "side": "betternether:block/%name%_planks" + "texture": "betternether:block/%name%_trapdoor" }, - "elements": [ - { - "__comment": "Box1", - "from": [ 0, 0, 0 ], - "to": [ 2, 3, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 2, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 2, 16 ], "texture": "#texture" }, - "north": { "uv": [ 14, 12, 16, 15 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 12, 2, 15 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 12, 16, 15 ], "texture": "#side", "cullface": "west" }, - "east": { "uv": [ 0, 12, 16, 15 ], "texture": "#side" } - } - }, - { - "__comment": "Box1", - "from": [ 14, 0, 0 ], - "to": [ 16, 3, 16 ], - "faces": { - "down": { "uv": [ 14, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 14, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 2, 15 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 14, 12, 16, 15 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 12, 16, 15 ], "texture": "#side" }, - "east": { "uv": [ 0, 12, 16, 15 ], "texture": "#side", "cullface": "east" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 0, 0 ], - "to": [ 14, 3, 2 ], - "faces": { - "down": { "uv": [ 2, 14, 14, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 2, 0, 14, 2 ], "texture": "#texture" }, - "north": { "uv": [ 2, 12, 14, 15 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 2, 12, 14, 15 ], "texture": "#side" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 0, 14 ], - "to": [ 14, 3, 16 ], - "faces": { - "down": { "uv": [ 2, 0, 14, 2 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 2, 14, 14, 16 ], "texture": "#texture" }, - "north": { "uv": [ 2, 12, 14, 15 ], "texture": "#side" }, - "south": { "uv": [ 2, 12, 14, 15 ], "texture": "#side", "cullface": "south" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 1, 2 ], - "to": [ 14, 2, 14 ], - "faces": { - "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture" } - } - } - ] } \ No newline at end of file diff --git a/utility_res/block/%name%_wall_gate_closed.json b/utility_res/block/%name%_wall_gate_closed.json index 18491fdf..60d83218 100644 --- a/utility_res/block/%name%_wall_gate_closed.json +++ b/utility_res/block/%name%_wall_gate_closed.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/template_fence_gate_wall", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/%name%_wall_gate_open.json b/utility_res/block/%name%_wall_gate_open.json index 7cf9d039..6a8ea2d5 100644 --- a/utility_res/block/%name%_wall_gate_open.json +++ b/utility_res/block/%name%_wall_gate_open.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "betternether:block/%name%_planks" - } + "parent": "block/template_fence_gate_wall_open", + "textures": { + "texture": "betternether:block/%name%_planks" + } } diff --git a/utility_res/block/barrel_%name%.json b/utility_res/block/barrel_%name%.json deleted file mode 100644 index a781d98f..00000000 --- a/utility_res/block/barrel_%name%.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "betternether:block/barrel_%name%_top", - "bottom": "betternether:block/barrel_%name%_bottom", - "side": "betternether:block/barrel_%name%_side" - } -} \ No newline at end of file diff --git a/utility_res/block/barrel_%name%_open.json b/utility_res/block/barrel_%name%_open.json deleted file mode 100644 index 5fa6a8f1..00000000 --- a/utility_res/block/barrel_%name%_open.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "betternether:block/barrel_%name%_top_open", - "bottom": "betternether:block/barrel_%name%_bottom", - "side": "betternether:block/barrel_%name%_side" - } -} \ No newline at end of file diff --git a/utility_res/block/crafting_table_%name%.json b/utility_res/block/crafting_table_%name%.json deleted file mode 100644 index aadad9c0..00000000 --- a/utility_res/block/crafting_table_%name%.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "betternether:block/crafting_table_%name%_front", - "north": "betternether:block/crafting_table_%name%_front", - "south": "betternether:block/crafting_table_%name%_side", - "east": "betternether:block/crafting_table_%name%_side", - "west": "betternether:block/crafting_table_%name%_front", - "up": "betternether:block/crafting_table_%name%_top", - "down": "betternether:block/crafting_table_%name%_bottom" - } -} \ No newline at end of file diff --git a/utility_res/block/striped_bark_%name%.json b/utility_res/block/striped_bark_%name%.json deleted file mode 100644 index 7de47feb..00000000 --- a/utility_res/block/striped_bark_%name%.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betternether:block/striped_log_%name%_side" - } -} diff --git a/utility_res/block/striped_log_%name%.json b/utility_res/block/striped_log_%name%.json deleted file mode 100644 index 22e3ec7e..00000000 --- a/utility_res/block/striped_log_%name%.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betternether:block/striped_log_%name%_side", - "down": "betternether:block/striped_log_%name%_top", - "up": "betternether:block/striped_log_%name%_top", - "north": "betternether:block/striped_log_%name%_side", - "east": "betternether:block/striped_log_%name%_side", - "south": "betternether:block/striped_log_%name%_side", - "west": "betternether:block/striped_log_%name%_side" - } -} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_bark.json b/utility_res/blockstates/%name%_bark.json index 8bb93936..dfb84643 100644 --- a/utility_res/blockstates/%name%_bark.json +++ b/utility_res/blockstates/%name%_bark.json @@ -1,7 +1,7 @@ { - "variants": { - "axis=y": { "model": "betternether:block/%name%_bark" }, - "axis=z": { "model": "betternether:block/%name%_bark", "x": 90 }, - "axis=x": { "model": "betternether:block/%name%_bark", "x": 90, "y": 90 } - } + "variants": { + "axis=y": { "model": "betternether:block/%name%_bark" }, + "axis=z": { "model": "betternether:block/%name%_bark", "x": 90 }, + "axis=x": { "model": "betternether:block/%name%_bark", "x": 90, "y": 90 } + } } \ No newline at end of file diff --git a/utility_res/blockstates/%name%_button.json b/utility_res/blockstates/%name%_button.json index 88075756..12ef1b5f 100644 --- a/utility_res/blockstates/%name%_button.json +++ b/utility_res/blockstates/%name%_button.json @@ -1,28 +1,28 @@ { - "variants": { - "face=floor,facing=east,powered=false": { "model": "betternether:block/%name%_button", "y": 90 }, - "face=floor,facing=west,powered=false": { "model": "betternether:block/%name%_button", "y": 270 }, - "face=floor,facing=south,powered=false": { "model": "betternether:block/%name%_button", "y": 180 }, - "face=floor,facing=north,powered=false": { "model": "betternether:block/%name%_button" }, - "face=wall,facing=east,powered=false": { "model": "betternether:block/%name%_button", "uvlock": true, "x": 90, "y": 90 }, - "face=wall,facing=west,powered=false": { "model": "betternether:block/%name%_button", "uvlock": true, "x": 90, "y": 270 }, - "face=wall,facing=south,powered=false": { "model": "betternether:block/%name%_button", "uvlock": true, "x": 90, "y": 180 }, - "face=wall,facing=north,powered=false": { "model": "betternether:block/%name%_button", "uvlock": true, "x": 90 }, - "face=ceiling,facing=east,powered=false": { "model": "betternether:block/%name%_button", "x": 180, "y": 270 }, - "face=ceiling,facing=west,powered=false": { "model": "betternether:block/%name%_button", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=false": { "model": "betternether:block/%name%_button", "x": 180 }, - "face=ceiling,facing=north,powered=false": { "model": "betternether:block/%name%_button", "x": 180, "y": 180 }, - "face=floor,facing=east,powered=true": { "model": "betternether:block/%name%_button_pressed", "y": 90 }, - "face=floor,facing=west,powered=true": { "model": "betternether:block/%name%_button_pressed", "y": 270 }, - "face=floor,facing=south,powered=true": { "model": "betternether:block/%name%_button_pressed", "y": 180 }, - "face=floor,facing=north,powered=true": { "model": "betternether:block/%name%_button_pressed" }, - "face=wall,facing=east,powered=true": { "model": "betternether:block/%name%_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "face=wall,facing=west,powered=true": { "model": "betternether:block/%name%_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "face=wall,facing=south,powered=true": { "model": "betternether:block/%name%_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "face=wall,facing=north,powered=true": { "model": "betternether:block/%name%_button_pressed", "uvlock": true, "x": 90 }, - "face=ceiling,facing=east,powered=true": { "model": "betternether:block/%name%_button_pressed", "x": 180, "y": 270 }, - "face=ceiling,facing=west,powered=true": { "model": "betternether:block/%name%_button_pressed", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=true": { "model": "betternether:block/%name%_button_pressed", "x": 180 }, - "face=ceiling,facing=north,powered=true": { "model": "betternether:block/%name%_button_pressed", "x": 180, "y": 180 } - } + "variants": { + "face=floor,facing=east,powered=false": { "model": "betternether:block/%name%_button", "y": 90 }, + "face=floor,facing=west,powered=false": { "model": "betternether:block/%name%_button", "y": 270 }, + "face=floor,facing=south,powered=false": { "model": "betternether:block/%name%_button", "y": 180 }, + "face=floor,facing=north,powered=false": { "model": "betternether:block/%name%_button" }, + "face=wall,facing=east,powered=false": { "model": "betternether:block/%name%_button", "uvlock": true, "x": 90, "y": 90 }, + "face=wall,facing=west,powered=false": { "model": "betternether:block/%name%_button", "uvlock": true, "x": 90, "y": 270 }, + "face=wall,facing=south,powered=false": { "model": "betternether:block/%name%_button", "uvlock": true, "x": 90, "y": 180 }, + "face=wall,facing=north,powered=false": { "model": "betternether:block/%name%_button", "uvlock": true, "x": 90 }, + "face=ceiling,facing=east,powered=false": { "model": "betternether:block/%name%_button", "x": 180, "y": 270 }, + "face=ceiling,facing=west,powered=false": { "model": "betternether:block/%name%_button", "x": 180, "y": 90 }, + "face=ceiling,facing=south,powered=false": { "model": "betternether:block/%name%_button", "x": 180 }, + "face=ceiling,facing=north,powered=false": { "model": "betternether:block/%name%_button", "x": 180, "y": 180 }, + "face=floor,facing=east,powered=true": { "model": "betternether:block/%name%_button_pressed", "y": 90 }, + "face=floor,facing=west,powered=true": { "model": "betternether:block/%name%_button_pressed", "y": 270 }, + "face=floor,facing=south,powered=true": { "model": "betternether:block/%name%_button_pressed", "y": 180 }, + "face=floor,facing=north,powered=true": { "model": "betternether:block/%name%_button_pressed" }, + "face=wall,facing=east,powered=true": { "model": "betternether:block/%name%_button_pressed", "uvlock": true, "x": 90, "y": 90 }, + "face=wall,facing=west,powered=true": { "model": "betternether:block/%name%_button_pressed", "uvlock": true, "x": 90, "y": 270 }, + "face=wall,facing=south,powered=true": { "model": "betternether:block/%name%_button_pressed", "uvlock": true, "x": 90, "y": 180 }, + "face=wall,facing=north,powered=true": { "model": "betternether:block/%name%_button_pressed", "uvlock": true, "x": 90 }, + "face=ceiling,facing=east,powered=true": { "model": "betternether:block/%name%_button_pressed", "x": 180, "y": 270 }, + "face=ceiling,facing=west,powered=true": { "model": "betternether:block/%name%_button_pressed", "x": 180, "y": 90 }, + "face=ceiling,facing=south,powered=true": { "model": "betternether:block/%name%_button_pressed", "x": 180 }, + "face=ceiling,facing=north,powered=true": { "model": "betternether:block/%name%_button_pressed", "x": 180, "y": 180 } + } } diff --git a/utility_res/blockstates/%name%_door.json b/utility_res/blockstates/%name%_door.json index edbe21cb..573595ac 100644 --- a/utility_res/blockstates/%name%_door.json +++ b/utility_res/blockstates/%name%_door.json @@ -1,36 +1,36 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "betternether:block/%name%_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "betternether:block/%name%_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "betternether:block/%name%_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "betternether:block/%name%_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "betternether:block/%name%_door_bottom_hinge" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "betternether:block/%name%_door_bottom_hinge" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "betternether:block/%name%_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "betternether:block/%name%_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "betternether:block/%name%_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "betternether:block/%name%_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "betternether:block/%name%_door_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "betternether:block/%name%_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "betternether:block/%name%_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "betternether:block/%name%_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "betternether:block/%name%_door_top_hinge" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "betternether:block/%name%_door_top_hinge", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "betternether:block/%name%_door_top_hinge", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "betternether:block/%name%_door_top_hinge", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "betternether:block/%name%_door_top_hinge", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "betternether:block/%name%_door_top_hinge", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "betternether:block/%name%_door_top_hinge", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "betternether:block/%name%_door_top_hinge" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "betternether:block/%name%_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "betternether:block/%name%_door_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "betternether:block/%name%_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "betternether:block/%name%_door_top", "y": 180 } - } + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "betternether:block/%name%_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "betternether:block/%name%_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "betternether:block/%name%_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "betternether:block/%name%_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "betternether:block/%name%_door_bottom_hinge" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "betternether:block/%name%_door_bottom_hinge", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "betternether:block/%name%_door_bottom_hinge" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "betternether:block/%name%_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "betternether:block/%name%_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "betternether:block/%name%_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "betternether:block/%name%_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "betternether:block/%name%_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "betternether:block/%name%_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "betternether:block/%name%_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "betternether:block/%name%_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "betternether:block/%name%_door_top_hinge" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "betternether:block/%name%_door_top_hinge", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "betternether:block/%name%_door_top_hinge", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "betternether:block/%name%_door_top_hinge", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "betternether:block/%name%_door_top_hinge", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "betternether:block/%name%_door_top_hinge", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "betternether:block/%name%_door_top_hinge", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "betternether:block/%name%_door_top_hinge" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "betternether:block/%name%_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "betternether:block/%name%_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "betternether:block/%name%_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "betternether:block/%name%_door_top", "y": 180 } + } } diff --git a/utility_res/blockstates/%name%_fence.json b/utility_res/blockstates/%name%_fence.json index 65f79820..f371c623 100644 --- a/utility_res/blockstates/%name%_fence.json +++ b/utility_res/blockstates/%name%_fence.json @@ -1,17 +1,17 @@ { - "multipart": [ - { "apply": { "model": "betternether:block/%name%_fence_post" }}, - { "when": { "north": true }, - "apply": { "model": "betternether:block/%name%_fence_side", "uvlock": true } - }, - { "when": { "east": true }, - "apply": { "model": "betternether:block/%name%_fence_side", "y": 90, "uvlock": true } - }, - { "when": { "south": true }, - "apply": { "model": "betternether:block/%name%_fence_side", "y": 180, "uvlock": true } - }, - { "when": { "west": true }, - "apply": { "model": "betternether:block/%name%_fence_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { "apply": { "model": "betternether:block/%name%_fence_post" }}, + { "when": { "north": true }, + "apply": { "model": "betternether:block/%name%_fence_side", "uvlock": true } + }, + { "when": { "east": true }, + "apply": { "model": "betternether:block/%name%_fence_side", "y": 90, "uvlock": true } + }, + { "when": { "south": true }, + "apply": { "model": "betternether:block/%name%_fence_side", "y": 180, "uvlock": true } + }, + { "when": { "west": true }, + "apply": { "model": "betternether:block/%name%_fence_side", "y": 270, "uvlock": true } + } + ] } diff --git a/utility_res/blockstates/%name%_gate.json b/utility_res/blockstates/%name%_gate.json index dc4b5f19..03d82c52 100644 --- a/utility_res/blockstates/%name%_gate.json +++ b/utility_res/blockstates/%name%_gate.json @@ -1,20 +1,20 @@ { - "variants": { - "facing=south,in_wall=false,open=false": { "model": "betternether:block/%name%_fence_gate_closed", "uvlock": true }, - "facing=west,in_wall=false,open=false": { "model": "betternether:block/%name%_fence_gate_closed", "uvlock": true, "y": 90 }, - "facing=north,in_wall=false,open=false": { "model": "betternether:block/%name%_fence_gate_closed", "uvlock": true, "y": 180 }, - "facing=east,in_wall=false,open=false": { "model": "betternether:block/%name%_fence_gate_closed", "uvlock": true, "y": 270 }, - "facing=south,in_wall=false,open=true": { "model": "betternether:block/%name%_fence_gate_open", "uvlock": true }, - "facing=west,in_wall=false,open=true": { "model": "betternether:block/%name%_fence_gate_open", "uvlock": true, "y": 90 }, - "facing=north,in_wall=false,open=true": { "model": "betternether:block/%name%_fence_gate_open", "uvlock": true, "y": 180 }, - "facing=east,in_wall=false,open=true": { "model": "betternether:block/%name%_fence_gate_open", "uvlock": true, "y": 270 }, - "facing=south,in_wall=true,open=false": { "model": "betternether:block/%name%_wall_gate_closed", "uvlock": true }, - "facing=west,in_wall=true,open=false": { "model": "betternether:block/%name%_wall_gate_closed", "uvlock": true, "y": 90 }, - "facing=north,in_wall=true,open=false": { "model": "betternether:block/%name%_wall_gate_closed", "uvlock": true, "y": 180 }, - "facing=east,in_wall=true,open=false": { "model": "betternether:block/%name%_wall_gate_closed", "uvlock": true, "y": 270 }, - "facing=south,in_wall=true,open=true": { "model": "betternether:block/%name%_wall_gate_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { "model": "betternether:block/%name%_wall_gate_open", "uvlock": true, "y": 90 }, - "facing=north,in_wall=true,open=true": { "model": "betternether:block/%name%_wall_gate_open", "uvlock": true, "y": 180 }, - "facing=east,in_wall=true,open=true": { "model": "betternether:block/%name%_wall_gate_open", "uvlock": true, "y": 270 } - } + "variants": { + "facing=south,in_wall=false,open=false": { "model": "betternether:block/%name%_fence_gate_closed", "uvlock": true }, + "facing=west,in_wall=false,open=false": { "model": "betternether:block/%name%_fence_gate_closed", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=false": { "model": "betternether:block/%name%_fence_gate_closed", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=false": { "model": "betternether:block/%name%_fence_gate_closed", "uvlock": true, "y": 270 }, + "facing=south,in_wall=false,open=true": { "model": "betternether:block/%name%_fence_gate_open", "uvlock": true }, + "facing=west,in_wall=false,open=true": { "model": "betternether:block/%name%_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=true": { "model": "betternether:block/%name%_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=true": { "model": "betternether:block/%name%_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=false": { "model": "betternether:block/%name%_wall_gate_closed", "uvlock": true }, + "facing=west,in_wall=true,open=false": { "model": "betternether:block/%name%_wall_gate_closed", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=false": { "model": "betternether:block/%name%_wall_gate_closed", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=false": { "model": "betternether:block/%name%_wall_gate_closed", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=true": { "model": "betternether:block/%name%_wall_gate_open", "uvlock": true }, + "facing=west,in_wall=true,open=true": { "model": "betternether:block/%name%_wall_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=true": { "model": "betternether:block/%name%_wall_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=true": { "model": "betternether:block/%name%_wall_gate_open", "uvlock": true, "y": 270 } + } } diff --git a/utility_res/blockstates/%name%_ladder.json b/utility_res/blockstates/%name%_ladder.json index a0bf640c..5e6b95c7 100644 --- a/utility_res/blockstates/%name%_ladder.json +++ b/utility_res/blockstates/%name%_ladder.json @@ -1,8 +1,8 @@ { - "variants": { - "facing=north": { "model": "betternether:block/%name%_ladder" }, - "facing=east": { "model": "betternether:block/%name%_ladder", "y": 90 }, - "facing=south": { "model": "betternether:block/%name%_ladder", "y": 180 }, - "facing=west": { "model": "betternether:block/%name%_ladder", "y": 270 } - } + "variants": { + "facing=north": { "model": "betternether:block/%name%_ladder" }, + "facing=east": { "model": "betternether:block/%name%_ladder", "y": 90 }, + "facing=south": { "model": "betternether:block/%name%_ladder", "y": 180 }, + "facing=west": { "model": "betternether:block/%name%_ladder", "y": 270 } + } } diff --git a/utility_res/blockstates/%name%_log.json b/utility_res/blockstates/%name%_log.json index e1aafe3c..ae1b13f3 100644 --- a/utility_res/blockstates/%name%_log.json +++ b/utility_res/blockstates/%name%_log.json @@ -1,7 +1,7 @@ { - "variants": { - "axis=y": { "model": "betternether:block/%name%_log" }, - "axis=z": { "model": "betternether:block/%name%_log", "x": 90 }, - "axis=x": { "model": "betternether:block/%name%_log", "x": 90, "y": 90 } - } + "variants": { + "axis=y": { "model": "betternether:block/%name%_log" }, + "axis=z": { "model": "betternether:block/%name%_log", "x": 90 }, + "axis=x": { "model": "betternether:block/%name%_log", "x": 90, "y": 90 } + } } diff --git a/utility_res/blockstates/%name%_planks.json b/utility_res/blockstates/%name%_planks.json index bfbea749..06a4c1b8 100644 --- a/utility_res/blockstates/%name%_planks.json +++ b/utility_res/blockstates/%name%_planks.json @@ -1,6 +1,6 @@ { - "variants": + "variants": { - "": { "model": "betternether:block/%name%_planks" } - } + "": { "model": "betternether:block/%name%_planks" } + } } \ No newline at end of file diff --git a/utility_res/blockstates/%name%_plate.json b/utility_res/blockstates/%name%_plate.json index 98d2250a..128423ae 100644 --- a/utility_res/blockstates/%name%_plate.json +++ b/utility_res/blockstates/%name%_plate.json @@ -1,6 +1,6 @@ { - "variants": { - "powered=false": { "model": "betternether:block/%name%_pressure_plate_up" }, - "powered=true": { "model": "betternether:block/%name%_pressure_plate_down" } - } + "variants": { + "powered=false": { "model": "betternether:block/%name%_pressure_plate_up" }, + "powered=true": { "model": "betternether:block/%name%_pressure_plate_down" } + } } diff --git a/utility_res/blockstates/%name%_slab.json b/utility_res/blockstates/%name%_slab.json index f4733314..0e963dc4 100644 --- a/utility_res/blockstates/%name%_slab.json +++ b/utility_res/blockstates/%name%_slab.json @@ -1,8 +1,8 @@ { - "variants": + "variants": { - "type=bottom": { "model": "betternether:block/%name%_half_slab" }, - "type=top": { "model": "betternether:block/%name%_half_slab", "x": 180, "uvlock": true }, - "type=double": { "model": "betternether:block/%name%_planks" } - } + "type=bottom": { "model": "betternether:block/%name%_half_slab" }, + "type=top": { "model": "betternether:block/%name%_half_slab", "x": 180, "uvlock": true }, + "type=double": { "model": "betternether:block/%name%_planks" } + } } diff --git a/utility_res/blockstates/%name%_stairs.json b/utility_res/blockstates/%name%_stairs.json index 75b6ab9e..e6644dda 100644 --- a/utility_res/blockstates/%name%_stairs.json +++ b/utility_res/blockstates/%name%_stairs.json @@ -1,44 +1,44 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "betternether:block/%name%_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "betternether:block/%name%_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "betternether:block/%name%_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "betternether:block/%name%_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "betternether:block/%name%_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "betternether:block/%name%_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "betternether:block/%name%_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "betternether:block/%name%_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 270, "uvlock": true } - } + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "betternether:block/%name%_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "betternether:block/%name%_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "betternether:block/%name%_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "betternether:block/%name%_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "betternether:block/%name%_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "betternether:block/%name%_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "betternether:block/%name%_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "betternether:block/%name%_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "betternether:block/%name%_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "betternether:block/%name%_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } } diff --git a/utility_res/blockstates/%name%_trapdoor.json b/utility_res/blockstates/%name%_trapdoor.json index 802d7d5e..e88ce010 100644 --- a/utility_res/blockstates/%name%_trapdoor.json +++ b/utility_res/blockstates/%name%_trapdoor.json @@ -1,20 +1,20 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "betternether:block/%name%_trapdoor" }, - "facing=south,half=bottom,open=false": { "model": "betternether:block/%name%_trapdoor", "y": 180 }, - "facing=east,half=bottom,open=false": { "model": "betternether:block/%name%_trapdoor", "y": 90 }, - "facing=west,half=bottom,open=false": { "model": "betternether:block/%name%_trapdoor", "y": 270 }, - "facing=north,half=top,open=false": { "model": "betternether:block/%name%_trapdoor", "x": 180 }, - "facing=south,half=top,open=false": { "model": "betternether:block/%name%_trapdoor", "x": 180, "y": 180 }, - "facing=east,half=top,open=false": { "model": "betternether:block/%name%_trapdoor", "x": 180, "y": 90 }, - "facing=west,half=top,open=false": { "model": "betternether:block/%name%_trapdoor", "x": 180, "y": 270 }, - "facing=north,half=bottom,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 90 }, - "facing=south,half=bottom,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 90, "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 90, "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 90, "y": 270 }, - "facing=north,half=top,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 270, "y": 180 }, - "facing=south,half=top,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 270, "y": 0 }, - "facing=east,half=top,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 270, "y": 270 }, - "facing=west,half=top,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 270, "y": 90 } - } + "variants": { + "facing=north,half=bottom,open=false": { "model": "betternether:block/%name%_trapdoor" }, + "facing=south,half=bottom,open=false": { "model": "betternether:block/%name%_trapdoor", "y": 180 }, + "facing=east,half=bottom,open=false": { "model": "betternether:block/%name%_trapdoor", "y": 90 }, + "facing=west,half=bottom,open=false": { "model": "betternether:block/%name%_trapdoor", "y": 270 }, + "facing=north,half=top,open=false": { "model": "betternether:block/%name%_trapdoor", "x": 180 }, + "facing=south,half=top,open=false": { "model": "betternether:block/%name%_trapdoor", "x": 180, "y": 180 }, + "facing=east,half=top,open=false": { "model": "betternether:block/%name%_trapdoor", "x": 180, "y": 90 }, + "facing=west,half=top,open=false": { "model": "betternether:block/%name%_trapdoor", "x": 180, "y": 270 }, + "facing=north,half=bottom,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 90 }, + "facing=south,half=bottom,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 90, "y": 180 }, + "facing=east,half=bottom,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 90, "y": 90 }, + "facing=west,half=bottom,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 90, "y": 270 }, + "facing=north,half=top,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 270, "y": 180 }, + "facing=south,half=top,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 270, "y": 0 }, + "facing=east,half=top,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 270, "y": 270 }, + "facing=west,half=top,open=true": { "model": "betternether:block/%name%_trapdoor", "x": 270, "y": 90 } + } } diff --git a/utility_res/blockstates/bar_stool_%name%.json b/utility_res/blockstates/bar_stool_%name%.json index 9d2ed3fd..00e5a5d8 100644 --- a/utility_res/blockstates/bar_stool_%name%.json +++ b/utility_res/blockstates/bar_stool_%name%.json @@ -1,7 +1,7 @@ { "variants": { - "facing=east": { "model": "betternether:block/bar_stool_%name%" }, - "facing=west": { "model": "betternether:block/bar_stool_%name%", "y": 180 }, + "facing=east": { "model": "betternether:block/bar_stool_%name%" }, + "facing=west": { "model": "betternether:block/bar_stool_%name%", "y": 180 }, "facing=south": { "model": "betternether:block/bar_stool_%name%", "y": 90 }, "facing=north": { "model": "betternether:block/bar_stool_%name%", "y": 270 } } diff --git a/utility_res/blockstates/barrel_%name%.json b/utility_res/blockstates/barrel_%name%.json index 6b998642..7b8a8b94 100644 --- a/utility_res/blockstates/barrel_%name%.json +++ b/utility_res/blockstates/barrel_%name%.json @@ -1,56 +1,56 @@ { - "variants": { - "facing=down,open=false": { - "x": 180, - "model": "betternether:block/barrel_%name%" - }, - "facing=down,open=true": { - "x": 180, - "model": "betternether:block/barrel_%name%_open" - }, - "facing=east,open=false": { - "x": 90, - "y": 90, - "model": "betternether:block/barrel_%name%" - }, - "facing=east,open=true": { - "x": 90, - "y": 90, - "model": "betternether:block/barrel_%name%_open" - }, - "facing=north,open=false": { - "x": 90, - "model": "betternether:block/barrel_%name%" - }, - "facing=north,open=true": { - "x": 90, - "model": "betternether:block/barrel_%name%_open" - }, - "facing=south,open=false": { - "x": 90, - "y": 180, - "model": "betternether:block/barrel_%name%" - }, - "facing=south,open=true": { - "x": 90, - "y": 180, - "model": "betternether:block/barrel_%name%_open" - }, - "facing=up,open=false": { - "model": "betternether:block/barrel_%name%" - }, - "facing=up,open=true": { - "model": "betternether:block/barrel_%name%_open" - }, - "facing=west,open=false": { - "x": 90, - "y": 270, - "model": "betternether:block/barrel_%name%" - }, - "facing=west,open=true": { - "x": 90, - "y": 270, - "model": "betternether:block/barrel_%name%_open" + "variants": { + "facing=down,open=false": { + "x": 180, + "model": "betternether:block/barrel_%name%" + }, + "facing=down,open=true": { + "x": 180, + "model": "betternether:block/barrel_%name%_open" + }, + "facing=east,open=false": { + "x": 90, + "y": 90, + "model": "betternether:block/barrel_%name%" + }, + "facing=east,open=true": { + "x": 90, + "y": 90, + "model": "betternether:block/barrel_%name%_open" + }, + "facing=north,open=false": { + "x": 90, + "model": "betternether:block/barrel_%name%" + }, + "facing=north,open=true": { + "x": 90, + "model": "betternether:block/barrel_%name%_open" + }, + "facing=south,open=false": { + "x": 90, + "y": 180, + "model": "betternether:block/barrel_%name%" + }, + "facing=south,open=true": { + "x": 90, + "y": 180, + "model": "betternether:block/barrel_%name%_open" + }, + "facing=up,open=false": { + "model": "betternether:block/barrel_%name%" + }, + "facing=up,open=true": { + "model": "betternether:block/barrel_%name%_open" + }, + "facing=west,open=false": { + "x": 90, + "y": 270, + "model": "betternether:block/barrel_%name%" + }, + "facing=west,open=true": { + "x": 90, + "y": 270, + "model": "betternether:block/barrel_%name%_open" + } } - } } \ No newline at end of file diff --git a/utility_res/blockstates/chair_%name%.json b/utility_res/blockstates/chair_%name%.json index 5967351d..e15f56f6 100644 --- a/utility_res/blockstates/chair_%name%.json +++ b/utility_res/blockstates/chair_%name%.json @@ -1,7 +1,7 @@ { "variants": { - "facing=east,top=false": { "model": "betternether:block/chair_%name%", "y": 90 }, - "facing=west,top=false": { "model": "betternether:block/chair_%name%", "y": 270 }, + "facing=east,top=false": { "model": "betternether:block/chair_%name%", "y": 90 }, + "facing=west,top=false": { "model": "betternether:block/chair_%name%", "y": 270 }, "facing=south,top=false": { "model": "betternether:block/chair_%name%", "y": 180 }, "facing=north,top=false": { "model": "betternether:block/chair_%name%" }, "top=true": { "model": "betternether:block/chair_%name%_top" } diff --git a/utility_res/blockstates/chest_%name%.json b/utility_res/blockstates/chest_%name%.json index 0b6cf624..124b4eb1 100644 --- a/utility_res/blockstates/chest_%name%.json +++ b/utility_res/blockstates/chest_%name%.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "betternether:block/empty_%name%" + "variants": { + "": { + "model": "betternether:block/empty_%name%" + } } - } } \ No newline at end of file diff --git a/utility_res/blockstates/crafting_table_%name%.json b/utility_res/blockstates/crafting_table_%name%.json index 39b13fe5..80bca2da 100644 --- a/utility_res/blockstates/crafting_table_%name%.json +++ b/utility_res/blockstates/crafting_table_%name%.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "betternether:block/crafting_table_%name%" + "variants": { + "": { + "model": "betternether:block/crafting_table_%name%" + } } - } } \ No newline at end of file diff --git a/utility_res/blockstates/sign_%name%.json b/utility_res/blockstates/sign_%name%.json index 1569accd..802ba202 100644 --- a/utility_res/blockstates/sign_%name%.json +++ b/utility_res/blockstates/sign_%name%.json @@ -1,5 +1,5 @@ { - "variants": { - "": { "model": "betternether:block/empty_%name%" } - } + "variants": { + "": { "model": "betternether:block/%name%_empty" } + } } \ No newline at end of file diff --git a/utility_res/blockstates/striped_bark_%name%.json b/utility_res/blockstates/striped_bark_%name%.json index 8891ea19..51f8074c 100644 --- a/utility_res/blockstates/striped_bark_%name%.json +++ b/utility_res/blockstates/striped_bark_%name%.json @@ -1,7 +1,7 @@ { - "variants": { - "axis=y": { "model": "betternether:block/striped_bark_%name%" }, - "axis=z": { "model": "betternether:block/striped_bark_%name%", "x": 90 }, - "axis=x": { "model": "betternether:block/striped_bark_%name%", "x": 90, "y": 90 } - } + "variants": { + "axis=y": { "model": "betternether:block/striped_bark_%name%" }, + "axis=z": { "model": "betternether:block/striped_bark_%name%", "x": 90 }, + "axis=x": { "model": "betternether:block/striped_bark_%name%", "x": 90, "y": 90 } + } } \ No newline at end of file diff --git a/utility_res/blockstates/striped_log_%name%.json b/utility_res/blockstates/striped_log_%name%.json index 9fb75d59..d034030d 100644 --- a/utility_res/blockstates/striped_log_%name%.json +++ b/utility_res/blockstates/striped_log_%name%.json @@ -1,7 +1,7 @@ { - "variants": { - "axis=y": { "model": "betternether:block/striped_log_%name%" }, - "axis=z": { "model": "betternether:block/striped_log_%name%", "x": 90 }, - "axis=x": { "model": "betternether:block/striped_log_%name%", "x": 90, "y": 90 } - } + "variants": { + "axis=y": { "model": "betternether:block/striped_log_%name%" }, + "axis=z": { "model": "betternether:block/striped_log_%name%", "x": 90 }, + "axis=x": { "model": "betternether:block/striped_log_%name%", "x": 90, "y": 90 } + } } diff --git a/utility_res/blockstates/taburet_%name%.json b/utility_res/blockstates/taburet_%name%.json index f3220b2c..2e00d464 100644 --- a/utility_res/blockstates/taburet_%name%.json +++ b/utility_res/blockstates/taburet_%name%.json @@ -1,7 +1,7 @@ { "variants": { - "facing=east": { "model": "betternether:block/taburet_%name%" }, - "facing=west": { "model": "betternether:block/taburet_%name%", "y": 180 }, + "facing=east": { "model": "betternether:block/taburet_%name%" }, + "facing=west": { "model": "betternether:block/taburet_%name%", "y": 180 }, "facing=south": { "model": "betternether:block/taburet_%name%", "y": 90 }, "facing=north": { "model": "betternether:block/taburet_%name%", "y": 270 } } diff --git a/utility_res/item/%name%_bark.json b/utility_res/item/%name%_bark.json index 0356b8a0..6f3d9ab8 100644 --- a/utility_res/item/%name%_bark.json +++ b/utility_res/item/%name%_bark.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/%name%_bark" + "parent": "betternether:block/%name%_bark" } diff --git a/utility_res/item/%name%_barrel.json b/utility_res/item/%name%_barrel.json new file mode 100644 index 00000000..8172a7aa --- /dev/null +++ b/utility_res/item/%name%_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "betternether:block/barrel_%name%" +} \ No newline at end of file diff --git a/utility_res/item/%name%_button.json b/utility_res/item/%name%_button.json index 76497cd1..21bf2e3b 100644 --- a/utility_res/item/%name%_button.json +++ b/utility_res/item/%name%_button.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/%name%_button_inventory" + "parent": "betternether:block/%name%_button_inventory" } diff --git a/utility_res/item/%name%_chest.json b/utility_res/item/%name%_chest.json new file mode 100644 index 00000000..d3431645 --- /dev/null +++ b/utility_res/item/%name%_chest.json @@ -0,0 +1,6 @@ +{ + "parent": "betternether:block/chest_item", + "textures": { + "texture": "betternether:entity/chest/%name%_chest" + } +} diff --git a/utility_res/item/%name%_crafting_table.json b/utility_res/item/%name%_crafting_table.json new file mode 100644 index 00000000..116d81b5 --- /dev/null +++ b/utility_res/item/%name%_crafting_table.json @@ -0,0 +1,3 @@ +{ + "parent": "betternether:block/crafting_table_%name%" +} diff --git a/utility_res/item/%name%_door.json b/utility_res/item/%name%_door.json index c912ffb8..234f06a2 100644 --- a/utility_res/item/%name%_door.json +++ b/utility_res/item/%name%_door.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "betternether:item/%name%_door" - } + "textures": { + "layer0": "betternether:item/%name%_door" + } } diff --git a/utility_res/item/%name%_fence.json b/utility_res/item/%name%_fence.json index ebb987f7..3d139255 100644 --- a/utility_res/item/%name%_fence.json +++ b/utility_res/item/%name%_fence.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/%name%_fence_inventory" + "parent": "betternether:block/%name%_fence_inventory" } diff --git a/utility_res/item/%name%_gate.json b/utility_res/item/%name%_gate.json index 9a4dcf38..52e4c23c 100644 --- a/utility_res/item/%name%_gate.json +++ b/utility_res/item/%name%_gate.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/%name%_fence_gate_closed" + "parent": "betternether:block/%name%_fence_gate_closed" } diff --git a/utility_res/item/%name%_ladder.json b/utility_res/item/%name%_ladder.json index 4f9a06b5..b502917e 100644 --- a/utility_res/item/%name%_ladder.json +++ b/utility_res/item/%name%_ladder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "betternether:block/%name%_ladder" - } + "textures": { + "layer0": "betternether:block/%name%_ladder" + } } diff --git a/utility_res/item/%name%_log.json b/utility_res/item/%name%_log.json index 280c3020..28d19a4e 100644 --- a/utility_res/item/%name%_log.json +++ b/utility_res/item/%name%_log.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/%name%_log" + "parent": "betternether:block/%name%_log" } diff --git a/utility_res/item/%name%_planks.json b/utility_res/item/%name%_planks.json index 16ce9447..ca086ea7 100644 --- a/utility_res/item/%name%_planks.json +++ b/utility_res/item/%name%_planks.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/%name%_planks" + "parent": "betternether:block/%name%_planks" } diff --git a/utility_res/item/%name%_plate.json b/utility_res/item/%name%_plate.json index f1204af4..244da389 100644 --- a/utility_res/item/%name%_plate.json +++ b/utility_res/item/%name%_plate.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/%name%_pressure_plate_up" + "parent": "betternether:block/%name%_pressure_plate_up" } diff --git a/utility_res/item/%name%_sign.json b/utility_res/item/%name%_sign.json new file mode 100644 index 00000000..28928af4 --- /dev/null +++ b/utility_res/item/%name%_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betternether:item/sign_%name%" + } +} diff --git a/utility_res/item/%name%_slab.json b/utility_res/item/%name%_slab.json index 0583c080..0836d4a8 100644 --- a/utility_res/item/%name%_slab.json +++ b/utility_res/item/%name%_slab.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/%name%_half_slab" + "parent": "betternether:block/%name%_half_slab" } diff --git a/utility_res/item/%name%_stairs.json b/utility_res/item/%name%_stairs.json index 00b8e822..b31f2f67 100644 --- a/utility_res/item/%name%_stairs.json +++ b/utility_res/item/%name%_stairs.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/%name%_stairs" + "parent": "betternether:block/%name%_stairs" } diff --git a/utility_res/item/%name%_striped_bark.json b/utility_res/item/%name%_striped_bark.json new file mode 100644 index 00000000..36c95026 --- /dev/null +++ b/utility_res/item/%name%_striped_bark.json @@ -0,0 +1,3 @@ +{ + "parent": "betternether:block/striped_bark_%name%" +} diff --git a/utility_res/item/%name%_striped_log.json b/utility_res/item/%name%_striped_log.json new file mode 100644 index 00000000..b0e2c35b --- /dev/null +++ b/utility_res/item/%name%_striped_log.json @@ -0,0 +1,3 @@ +{ + "parent": "betternether:block/striped_log_%name%" +} diff --git a/utility_res/item/%name%_taburet.json b/utility_res/item/%name%_taburet.json new file mode 100644 index 00000000..8f01e8e0 --- /dev/null +++ b/utility_res/item/%name%_taburet.json @@ -0,0 +1,3 @@ +{ + "parent": "betternether:block/taburet_%name%" +} \ No newline at end of file diff --git a/utility_res/item/%name%_trapdoor.json b/utility_res/item/%name%_trapdoor.json index c321933a..335a9f9e 100644 --- a/utility_res/item/%name%_trapdoor.json +++ b/utility_res/item/%name%_trapdoor.json @@ -1,3 +1,3 @@ { - "parent": "betternether:block/%name%_trapdoor" + "parent": "betternether:block/%name%_trapdoor" } diff --git a/utility_res/item/bar_stool_%name%.json b/utility_res/item/bar_stool_%name%.json deleted file mode 100644 index b2eba944..00000000 --- a/utility_res/item/bar_stool_%name%.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betternether:block/bar_stool_%name%" -} \ No newline at end of file diff --git a/utility_res/item/barrel_%name%.json b/utility_res/item/barrel_%name%.json deleted file mode 100644 index 8bbfcac6..00000000 --- a/utility_res/item/barrel_%name%.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betternether:block/barrel_%name%" -} \ No newline at end of file diff --git a/utility_res/item/chair_%name%.json b/utility_res/item/chair_%name%.json deleted file mode 100644 index ba93346b..00000000 --- a/utility_res/item/chair_%name%.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "betternether:block/chair_%name%", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, -1.4, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.5, 0.5, 0.5 ] - } - } -} \ No newline at end of file diff --git a/utility_res/item/chest_%name%.json b/utility_res/item/chest_%name%.json deleted file mode 100644 index ff1ca460..00000000 --- a/utility_res/item/chest_%name%.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betternether:block/chest_item", - "textures": { - "texture": "betternether:entity/chest/chest_%name%" - } -} diff --git a/utility_res/item/crafting_table_%name%.json b/utility_res/item/crafting_table_%name%.json deleted file mode 100644 index 3c1be142..00000000 --- a/utility_res/item/crafting_table_%name%.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betternether:block/crafting_table_%name%" -} diff --git a/utility_res/item/sign_%name%.json b/utility_res/item/sign_%name%.json deleted file mode 100644 index 1eeb38df..00000000 --- a/utility_res/item/sign_%name%.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betternether:item/sign_%name%" - } -} diff --git a/utility_res/item/striped_bark_%name%.json b/utility_res/item/striped_bark_%name%.json deleted file mode 100644 index ebb186a2..00000000 --- a/utility_res/item/striped_bark_%name%.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betternether:block/striped_bark_%name%" -} diff --git a/utility_res/item/striped_log_%name%.json b/utility_res/item/striped_log_%name%.json deleted file mode 100644 index 453297e9..00000000 --- a/utility_res/item/striped_log_%name%.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betternether:block/striped_log_%name%" -} diff --git a/utility_res/item/taburet_%name%.json b/utility_res/item/taburet_%name%.json deleted file mode 100644 index 397339e7..00000000 --- a/utility_res/item/taburet_%name%.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betternether:block/taburet_%name%" -} \ No newline at end of file