From 11be1eadf3563ea1e35c9914ec0587687c49145c Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 17 Dec 2020 14:54:20 +0300 Subject: [PATCH] Composter fixes --- .../java/ru/betterend/patterns/Patterns.java | 104 +++++++++--------- ...tern_barrel_open.json => barrel_open.json} | 0 .../block/{pattern_block.json => block.json} | 0 ..._bottom_top.json => block_bottom_top.json} | 0 ...tern_block_sided.json => block_sided.json} | 0 .../{pattern_button.json => button.json} | 0 ...utton_pressed.json => button_pressed.json} | 0 .../betterend/patterns/block/composter.json | 10 +- ...tern_door_bottom.json => door_bottom.json} | 0 ...ttom_hinge.json => door_bottom_hinge.json} | 0 .../{pattern_door_top.json => door_top.json} | 0 ...oor_top_hinge.json => door_top_hinge.json} | 0 .../block/{pattern_empty.json => empty.json} | 0 ...ate_closed.json => fence_gate_closed.json} | 0 ...ce_gate_open.json => fence_gate_open.json} | 0 ...attern_fence_post.json => fence_post.json} | 0 ...attern_fence_side.json => fence_side.json} | 0 ...rn_inner_stairs.json => inner_stairs.json} | 0 .../{pattern_ladder.json => ladder.json} | 0 ...rn_outer_stairs.json => outer_stairs.json} | 0 ...estal_bottom.json => pedestal_bottom.json} | 0 ...estal_column.json => pedestal_column.json} | 0 ...lumn_top.json => pedestal_column_top.json} | 0 ...tal_default.json => pedestal_default.json} | 0 ...estal_pillar.json => pedestal_pillar.json} | 0 ...rn_pedestal_top.json => pedestal_top.json} | 0 .../{pattern_pillar.json => pillar.json} | 0 ...ate_down.json => pressure_plate_down.json} | 0 ...e_plate_up.json => pressure_plate_up.json} | 0 .../{pattern_sapling.json => sapling.json} | 0 .../block/{pattern_slab.json => slab.json} | 0 .../{pattern_stairs.json => stairs.json} | 0 .../{pattern_trapdoor.json => trapdoor.json} | 0 ...gate_closed.json => wall_gate_closed.json} | 0 ...all_gate_open.json => wall_gate_open.json} | 0 ...all_inventory.json => wall_inventory.json} | 0 ...{pattern_wall_post.json => wall_post.json} | 0 ...{pattern_wall_side.json => wall_side.json} | 0 ...all_side_tall.json => wall_side_tall.json} | 0 .../{pattern_barrel.json => barrel.json} | 0 .../{pattern_block.json => block.json} | 0 .../{pattern_button.json => button.json} | 0 .../{pattern_direct.json => direct.json} | 0 .../{pattern_door.json => door.json} | 0 .../{pattern_fence.json => fence.json} | 0 ...attern_fence_gate.json => fence_gate.json} | 0 .../{pattern_ladder.json => ladder.json} | 0 .../{pattern_pedestal.json => pedestal.json} | 0 .../{pattern_pillar.json => pillar.json} | 0 ...ressure_plate.json => pressure_plate.json} | 0 .../{pattern_sapling.json => sapling.json} | 0 .../{pattern_slab.json => slab.json} | 0 .../{pattern_stairs.json => stairs.json} | 0 .../{pattern_trapdoor.json => trapdoor.json} | 0 .../{pattern_wall.json => wall.json} | 0 .../mossy_glowshroom_composter_bottom.png | Bin 0 -> 284 bytes .../block/mossy_glowshroom_composter_side.png | Bin 0 -> 340 bytes .../block/mossy_glowshroom_composter_top.png | Bin 0 -> 213 bytes 58 files changed, 57 insertions(+), 57 deletions(-) rename src/main/resources/assets/betterend/patterns/block/{pattern_barrel_open.json => barrel_open.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_block.json => block.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_block_bottom_top.json => block_bottom_top.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_block_sided.json => block_sided.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_button.json => button.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_button_pressed.json => button_pressed.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_door_bottom.json => door_bottom.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_door_bottom_hinge.json => door_bottom_hinge.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_door_top.json => door_top.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_door_top_hinge.json => door_top_hinge.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_empty.json => empty.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_fence_gate_closed.json => fence_gate_closed.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_fence_gate_open.json => fence_gate_open.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_fence_post.json => fence_post.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_fence_side.json => fence_side.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_inner_stairs.json => inner_stairs.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_ladder.json => ladder.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_outer_stairs.json => outer_stairs.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_pedestal_bottom.json => pedestal_bottom.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_pedestal_column.json => pedestal_column.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_pedestal_column_top.json => pedestal_column_top.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_pedestal_default.json => pedestal_default.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_pedestal_pillar.json => pedestal_pillar.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_pedestal_top.json => pedestal_top.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_pillar.json => pillar.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_pressure_plate_down.json => pressure_plate_down.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_pressure_plate_up.json => pressure_plate_up.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_sapling.json => sapling.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_slab.json => slab.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_stairs.json => stairs.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_trapdoor.json => trapdoor.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_wall_gate_closed.json => wall_gate_closed.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_wall_gate_open.json => wall_gate_open.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_wall_inventory.json => wall_inventory.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_wall_post.json => wall_post.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_wall_side.json => wall_side.json} (100%) rename src/main/resources/assets/betterend/patterns/block/{pattern_wall_side_tall.json => wall_side_tall.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_barrel.json => barrel.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_block.json => block.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_button.json => button.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_direct.json => direct.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_door.json => door.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_fence.json => fence.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_fence_gate.json => fence_gate.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_ladder.json => ladder.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_pedestal.json => pedestal.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_pillar.json => pillar.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_pressure_plate.json => pressure_plate.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_sapling.json => sapling.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_slab.json => slab.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_stairs.json => stairs.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_trapdoor.json => trapdoor.json} (100%) rename src/main/resources/assets/betterend/patterns/blockstate/{pattern_wall.json => wall.json} (100%) create mode 100644 src/main/resources/assets/betterend/textures/block/mossy_glowshroom_composter_bottom.png create mode 100644 src/main/resources/assets/betterend/textures/block/mossy_glowshroom_composter_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/mossy_glowshroom_composter_top.png diff --git a/src/main/java/ru/betterend/patterns/Patterns.java b/src/main/java/ru/betterend/patterns/Patterns.java index 890fd4fe..0da7c155 100644 --- a/src/main/java/ru/betterend/patterns/Patterns.java +++ b/src/main/java/ru/betterend/patterns/Patterns.java @@ -19,63 +19,63 @@ import ru.betterend.BetterEnd; public class Patterns { //Blockstates - public final static Identifier STATE_SIMPLE = BetterEnd.makeID("patterns/blockstate/pattern_block.json"); - public final static Identifier STATE_SLAB = BetterEnd.makeID("patterns/blockstate/pattern_slab.json"); - public final static Identifier STATE_STAIRS = BetterEnd.makeID("patterns/blockstate/pattern_stairs.json"); - public final static Identifier STATE_WALL = BetterEnd.makeID("patterns/blockstate/pattern_wall.json"); - public final static Identifier STATE_FENCE = BetterEnd.makeID("patterns/blockstate/pattern_fence.json"); - public final static Identifier STATE_BUTTON = BetterEnd.makeID("patterns/blockstate/pattern_button.json"); - public final static Identifier STATE_PILLAR = BetterEnd.makeID("patterns/blockstate/pattern_pillar.json"); - public final static Identifier STATE_PLATE = BetterEnd.makeID("patterns/blockstate/pattern_pressure_plate.json"); - public final static Identifier STATE_DOOR = BetterEnd.makeID("patterns/blockstate/pattern_door.json"); - public final static Identifier STATE_SAPLING = BetterEnd.makeID("patterns/blockstate/pattern_sapling.json"); - public final static Identifier STATE_GATE = BetterEnd.makeID("patterns/blockstate/pattern_fence_gate.json"); - public final static Identifier STATE_TRAPDOOR = BetterEnd.makeID("patterns/blockstate/pattern_trapdoor.json"); - public final static Identifier STATE_LADDER = BetterEnd.makeID("patterns/blockstate/pattern_ladder.json"); - public final static Identifier STATE_BARREL = BetterEnd.makeID("patterns/blockstate/pattern_barrel.json"); - public final static Identifier STATE_PEDESTAL = BetterEnd.makeID("patterns/blockstate/pattern_pedestal.json"); + public final static Identifier STATE_SIMPLE = BetterEnd.makeID("patterns/blockstate/block.json"); + public final static Identifier STATE_SLAB = BetterEnd.makeID("patterns/blockstate/slab.json"); + public final static Identifier STATE_STAIRS = BetterEnd.makeID("patterns/blockstate/stairs.json"); + public final static Identifier STATE_WALL = BetterEnd.makeID("patterns/blockstate/wall.json"); + public final static Identifier STATE_FENCE = BetterEnd.makeID("patterns/blockstate/fence.json"); + public final static Identifier STATE_BUTTON = BetterEnd.makeID("patterns/blockstate/button.json"); + public final static Identifier STATE_PILLAR = BetterEnd.makeID("patterns/blockstate/pillar.json"); + public final static Identifier STATE_PLATE = BetterEnd.makeID("patterns/blockstate/pressure_plate.json"); + public final static Identifier STATE_DOOR = BetterEnd.makeID("patterns/blockstate/door.json"); + public final static Identifier STATE_SAPLING = BetterEnd.makeID("patterns/blockstate/sapling.json"); + public final static Identifier STATE_GATE = BetterEnd.makeID("patterns/blockstate/fence_gate.json"); + public final static Identifier STATE_TRAPDOOR = BetterEnd.makeID("patterns/blockstate/trapdoor.json"); + public final static Identifier STATE_LADDER = BetterEnd.makeID("patterns/blockstate/ladder.json"); + public final static Identifier STATE_BARREL = BetterEnd.makeID("patterns/blockstate/barrel.json"); + public final static Identifier STATE_PEDESTAL = BetterEnd.makeID("patterns/blockstate/pedestal.json"); public final static Identifier STATE_STONE_LANTERN = BetterEnd.makeID("patterns/blockstate/stone_lantern.json"); - public final static Identifier STATE_DIRECT = BetterEnd.makeID("patterns/blockstate/pattern_direct.json"); + public final static Identifier STATE_DIRECT = BetterEnd.makeID("patterns/blockstate/direct.json"); public final static Identifier STATE_BULB_LANTERN = BetterEnd.makeID("patterns/blockstate/bulb_lantern.json"); public final static Identifier STATE_COMPOSTER = BetterEnd.makeID("patterns/blockstate/composter.json"); //Models Block - public final static Identifier BLOCK_EMPTY = BetterEnd.makeID("patterns/block/pattern_empty.json"); - public final static Identifier BLOCK_BASE = BetterEnd.makeID("patterns/block/pattern_block.json"); - public final static Identifier BLOCK_SIDED = BetterEnd.makeID("patterns/block/pattern_block_sided.json"); - public final static Identifier BLOCK_BOTTOM_TOP = BetterEnd.makeID("patterns/block/pattern_block_bottom_top.json"); - public final static Identifier BLOCK_SLAB = BetterEnd.makeID("patterns/block/pattern_slab.json"); - public final static Identifier BLOCK_STAIR = BetterEnd.makeID("patterns/block/pattern_stairs.json"); - public final static Identifier BLOCK_STAIR_INNER = BetterEnd.makeID("patterns/block/pattern_inner_stairs.json"); - public final static Identifier BLOCK_STAIR_OUTER = BetterEnd.makeID("patterns/block/pattern_outer_stairs.json"); - public final static Identifier BLOCK_WALL_POST = BetterEnd.makeID("patterns/block/pattern_wall_post.json"); - public final static Identifier BLOCK_WALL_SIDE = BetterEnd.makeID("patterns/block/pattern_wall_side.json"); - public final static Identifier BLOCK_WALL_SIDE_TALL = BetterEnd.makeID("patterns/block/pattern_wall_side_tall.json"); - public final static Identifier BLOCK_FENCE_POST = BetterEnd.makeID("patterns/block/pattern_fence_post.json"); - public final static Identifier BLOCK_FENCE_SIDE = BetterEnd.makeID("patterns/block/pattern_fence_side.json"); - public final static Identifier BLOCK_BUTTON = BetterEnd.makeID("patterns/block/pattern_button.json"); - public final static Identifier BLOCK_BUTTON_PRESSED = BetterEnd.makeID("patterns/block/pattern_button_pressed.json"); - public final static Identifier BLOCK_PILLAR = BetterEnd.makeID("patterns/block/pattern_pillar.json"); - public final static Identifier BLOCK_PLATE_UP = BetterEnd.makeID("patterns/block/pattern_pressure_plate_up.json"); - public final static Identifier BLOCK_PLATE_DOWN = BetterEnd.makeID("patterns/block/pattern_pressure_plate_down.json"); - public final static Identifier BLOCK_DOOR_TOP = BetterEnd.makeID("patterns/block/pattern_door_top.json"); - public final static Identifier BLOCK_DOOR_TOP_HINGE = BetterEnd.makeID("patterns/block/pattern_door_top_hinge.json"); - public final static Identifier BLOCK_DOOR_BOTTOM = BetterEnd.makeID("patterns/block/pattern_door_bottom.json"); - public final static Identifier BLOCK_DOOR_BOTTOM_HINGE = BetterEnd.makeID("patterns/block/pattern_door_bottom_hinge.json"); - public final static Identifier BLOCK_SAPLING = BetterEnd.makeID("patterns/block/pattern_sapling.json"); - public final static Identifier BLOCK_GATE_CLOSED = BetterEnd.makeID("patterns/block/pattern_fence_gate_closed.json"); - public final static Identifier BLOCK_GATE_CLOSED_WALL = BetterEnd.makeID("patterns/block/pattern_wall_gate_closed.json"); - public final static Identifier BLOCK_GATE_OPEN = BetterEnd.makeID("patterns/block/pattern_fence_gate_open.json"); - public final static Identifier BLOCK_GATE_OPEN_WALL = BetterEnd.makeID("patterns/block/pattern_wall_gate_open.json"); - public final static Identifier BLOCK_TRAPDOOR = BetterEnd.makeID("patterns/block/pattern_trapdoor.json"); - public final static Identifier BLOCK_LADDER = BetterEnd.makeID("patterns/block/pattern_ladder.json"); - public final static Identifier BLOCK_BARREL_OPEN = BetterEnd.makeID("patterns/block/pattern_barrel_open.json"); - public final static Identifier BLOCK_PEDESTAL_DEFAULT = BetterEnd.makeID("patterns/block/pattern_pedestal_default.json"); - public final static Identifier BLOKC_PEDESTAL_COLUMN = BetterEnd.makeID("patterns/block/pattern_pedestal_column.json"); - public final static Identifier BLOCK_PEDESTAL_COLUMN_TOP = BetterEnd.makeID("patterns/block/pattern_pedestal_column_top.json"); - public final static Identifier BLOCK_PEDESTAL_TOP = BetterEnd.makeID("patterns/block/pattern_pedestal_top.json"); - public final static Identifier BLOCK_PEDESTAL_BOTTOM = BetterEnd.makeID("patterns/block/pattern_pedestal_bottom.json"); - public final static Identifier BLOCK_PEDESTAL_PILLAR = BetterEnd.makeID("patterns/block/pattern_pedestal_pillar.json"); + public final static Identifier BLOCK_EMPTY = BetterEnd.makeID("patterns/block/empty.json"); + public final static Identifier BLOCK_BASE = BetterEnd.makeID("patterns/block/block.json"); + public final static Identifier BLOCK_SIDED = BetterEnd.makeID("patterns/block/block_sided.json"); + public final static Identifier BLOCK_BOTTOM_TOP = BetterEnd.makeID("patterns/block/block_bottom_top.json"); + public final static Identifier BLOCK_SLAB = BetterEnd.makeID("patterns/block/slab.json"); + public final static Identifier BLOCK_STAIR = BetterEnd.makeID("patterns/block/stairs.json"); + public final static Identifier BLOCK_STAIR_INNER = BetterEnd.makeID("patterns/block/inner_stairs.json"); + public final static Identifier BLOCK_STAIR_OUTER = BetterEnd.makeID("patterns/block/outer_stairs.json"); + public final static Identifier BLOCK_WALL_POST = BetterEnd.makeID("patterns/block/wall_post.json"); + public final static Identifier BLOCK_WALL_SIDE = BetterEnd.makeID("patterns/block/wall_side.json"); + public final static Identifier BLOCK_WALL_SIDE_TALL = BetterEnd.makeID("patterns/block/wall_side_tall.json"); + public final static Identifier BLOCK_FENCE_POST = BetterEnd.makeID("patterns/block/fence_post.json"); + public final static Identifier BLOCK_FENCE_SIDE = BetterEnd.makeID("patterns/block/fence_side.json"); + public final static Identifier BLOCK_BUTTON = BetterEnd.makeID("patterns/block/button.json"); + public final static Identifier BLOCK_BUTTON_PRESSED = BetterEnd.makeID("patterns/block/button_pressed.json"); + public final static Identifier BLOCK_PILLAR = BetterEnd.makeID("patterns/block/pillar.json"); + public final static Identifier BLOCK_PLATE_UP = BetterEnd.makeID("patterns/block/pressure_plate_up.json"); + public final static Identifier BLOCK_PLATE_DOWN = BetterEnd.makeID("patterns/block/pressure_plate_down.json"); + public final static Identifier BLOCK_DOOR_TOP = BetterEnd.makeID("patterns/block/door_top.json"); + public final static Identifier BLOCK_DOOR_TOP_HINGE = BetterEnd.makeID("patterns/block/door_top_hinge.json"); + public final static Identifier BLOCK_DOOR_BOTTOM = BetterEnd.makeID("patterns/block/door_bottom.json"); + public final static Identifier BLOCK_DOOR_BOTTOM_HINGE = BetterEnd.makeID("patterns/block/door_bottom_hinge.json"); + public final static Identifier BLOCK_SAPLING = BetterEnd.makeID("patterns/block/sapling.json"); + public final static Identifier BLOCK_GATE_CLOSED = BetterEnd.makeID("patterns/block/fence_gate_closed.json"); + public final static Identifier BLOCK_GATE_CLOSED_WALL = BetterEnd.makeID("patterns/block/wall_gate_closed.json"); + public final static Identifier BLOCK_GATE_OPEN = BetterEnd.makeID("patterns/block/fence_gate_open.json"); + public final static Identifier BLOCK_GATE_OPEN_WALL = BetterEnd.makeID("patterns/block/wall_gate_open.json"); + public final static Identifier BLOCK_TRAPDOOR = BetterEnd.makeID("patterns/block/trapdoor.json"); + public final static Identifier BLOCK_LADDER = BetterEnd.makeID("patterns/block/ladder.json"); + public final static Identifier BLOCK_BARREL_OPEN = BetterEnd.makeID("patterns/block/barrel_open.json"); + public final static Identifier BLOCK_PEDESTAL_DEFAULT = BetterEnd.makeID("patterns/block/pedestal_default.json"); + public final static Identifier BLOKC_PEDESTAL_COLUMN = BetterEnd.makeID("patterns/block/pedestal_column.json"); + public final static Identifier BLOCK_PEDESTAL_COLUMN_TOP = BetterEnd.makeID("patterns/block/pedestal_column_top.json"); + public final static Identifier BLOCK_PEDESTAL_TOP = BetterEnd.makeID("patterns/block/pedestal_top.json"); + public final static Identifier BLOCK_PEDESTAL_BOTTOM = BetterEnd.makeID("patterns/block/pedestal_bottom.json"); + public final static Identifier BLOCK_PEDESTAL_PILLAR = BetterEnd.makeID("patterns/block/pedestal_pillar.json"); public final static Identifier BLOCK_BOOKSHELF = BetterEnd.makeID("patterns/block/bookshelf.json"); public final static Identifier BLOCK_STONE_LANTERN_CEIL = BetterEnd.makeID("patterns/block/stone_lantern_ceil.json"); public final static Identifier BLOCK_STONE_LANTERN_FLOOR = BetterEnd.makeID("patterns/block/stone_lantern_floor.json"); diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_barrel_open.json b/src/main/resources/assets/betterend/patterns/block/barrel_open.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_barrel_open.json rename to src/main/resources/assets/betterend/patterns/block/barrel_open.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_block.json b/src/main/resources/assets/betterend/patterns/block/block.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_block.json rename to src/main/resources/assets/betterend/patterns/block/block.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_block_bottom_top.json b/src/main/resources/assets/betterend/patterns/block/block_bottom_top.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_block_bottom_top.json rename to src/main/resources/assets/betterend/patterns/block/block_bottom_top.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_block_sided.json b/src/main/resources/assets/betterend/patterns/block/block_sided.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_block_sided.json rename to src/main/resources/assets/betterend/patterns/block/block_sided.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_button.json b/src/main/resources/assets/betterend/patterns/block/button.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_button.json rename to src/main/resources/assets/betterend/patterns/block/button.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_button_pressed.json b/src/main/resources/assets/betterend/patterns/block/button_pressed.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_button_pressed.json rename to src/main/resources/assets/betterend/patterns/block/button_pressed.json diff --git a/src/main/resources/assets/betterend/patterns/block/composter.json b/src/main/resources/assets/betterend/patterns/block/composter.json index 122a4090..f741a469 100644 --- a/src/main/resources/assets/betterend/patterns/block/composter.json +++ b/src/main/resources/assets/betterend/patterns/block/composter.json @@ -1,11 +1,11 @@ { "parent": "block/block", "textures": { - "particle": "block/%texture%_side", - "top": "block/%texture%_top", - "bottom": "block/%texture%_bottom", - "side": "block/%texture%_side", - "inside": "block/%texture%_bottom" + "particle": "betterend:block/%texture%_side", + "top": "betterend:block/%texture%_top", + "bottom": "betterend:block/%texture%_bottom", + "side": "betterend:block/%texture%_side", + "inside": "betterend:block/%texture%_bottom" }, "elements": [ { diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_door_bottom.json b/src/main/resources/assets/betterend/patterns/block/door_bottom.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_door_bottom.json rename to src/main/resources/assets/betterend/patterns/block/door_bottom.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_door_bottom_hinge.json b/src/main/resources/assets/betterend/patterns/block/door_bottom_hinge.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_door_bottom_hinge.json rename to src/main/resources/assets/betterend/patterns/block/door_bottom_hinge.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_door_top.json b/src/main/resources/assets/betterend/patterns/block/door_top.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_door_top.json rename to src/main/resources/assets/betterend/patterns/block/door_top.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_door_top_hinge.json b/src/main/resources/assets/betterend/patterns/block/door_top_hinge.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_door_top_hinge.json rename to src/main/resources/assets/betterend/patterns/block/door_top_hinge.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_empty.json b/src/main/resources/assets/betterend/patterns/block/empty.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_empty.json rename to src/main/resources/assets/betterend/patterns/block/empty.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_closed.json b/src/main/resources/assets/betterend/patterns/block/fence_gate_closed.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_closed.json rename to src/main/resources/assets/betterend/patterns/block/fence_gate_closed.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_open.json b/src/main/resources/assets/betterend/patterns/block/fence_gate_open.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_open.json rename to src/main/resources/assets/betterend/patterns/block/fence_gate_open.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_fence_post.json b/src/main/resources/assets/betterend/patterns/block/fence_post.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_fence_post.json rename to src/main/resources/assets/betterend/patterns/block/fence_post.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_fence_side.json b/src/main/resources/assets/betterend/patterns/block/fence_side.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_fence_side.json rename to src/main/resources/assets/betterend/patterns/block/fence_side.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_inner_stairs.json b/src/main/resources/assets/betterend/patterns/block/inner_stairs.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_inner_stairs.json rename to src/main/resources/assets/betterend/patterns/block/inner_stairs.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_ladder.json b/src/main/resources/assets/betterend/patterns/block/ladder.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_ladder.json rename to src/main/resources/assets/betterend/patterns/block/ladder.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_outer_stairs.json b/src/main/resources/assets/betterend/patterns/block/outer_stairs.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_outer_stairs.json rename to src/main/resources/assets/betterend/patterns/block/outer_stairs.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_bottom.json b/src/main/resources/assets/betterend/patterns/block/pedestal_bottom.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_pedestal_bottom.json rename to src/main/resources/assets/betterend/patterns/block/pedestal_bottom.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column.json b/src/main/resources/assets/betterend/patterns/block/pedestal_column.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column.json rename to src/main/resources/assets/betterend/patterns/block/pedestal_column.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column_top.json b/src/main/resources/assets/betterend/patterns/block/pedestal_column_top.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column_top.json rename to src/main/resources/assets/betterend/patterns/block/pedestal_column_top.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_default.json b/src/main/resources/assets/betterend/patterns/block/pedestal_default.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_pedestal_default.json rename to src/main/resources/assets/betterend/patterns/block/pedestal_default.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_pillar.json b/src/main/resources/assets/betterend/patterns/block/pedestal_pillar.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_pedestal_pillar.json rename to src/main/resources/assets/betterend/patterns/block/pedestal_pillar.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_top.json b/src/main/resources/assets/betterend/patterns/block/pedestal_top.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_pedestal_top.json rename to src/main/resources/assets/betterend/patterns/block/pedestal_top.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pillar.json b/src/main/resources/assets/betterend/patterns/block/pillar.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_pillar.json rename to src/main/resources/assets/betterend/patterns/block/pillar.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_down.json b/src/main/resources/assets/betterend/patterns/block/pressure_plate_down.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_down.json rename to src/main/resources/assets/betterend/patterns/block/pressure_plate_down.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_up.json b/src/main/resources/assets/betterend/patterns/block/pressure_plate_up.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_up.json rename to src/main/resources/assets/betterend/patterns/block/pressure_plate_up.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_sapling.json b/src/main/resources/assets/betterend/patterns/block/sapling.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_sapling.json rename to src/main/resources/assets/betterend/patterns/block/sapling.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_slab.json b/src/main/resources/assets/betterend/patterns/block/slab.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_slab.json rename to src/main/resources/assets/betterend/patterns/block/slab.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_stairs.json b/src/main/resources/assets/betterend/patterns/block/stairs.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_stairs.json rename to src/main/resources/assets/betterend/patterns/block/stairs.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_trapdoor.json b/src/main/resources/assets/betterend/patterns/block/trapdoor.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_trapdoor.json rename to src/main/resources/assets/betterend/patterns/block/trapdoor.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_closed.json b/src/main/resources/assets/betterend/patterns/block/wall_gate_closed.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_closed.json rename to src/main/resources/assets/betterend/patterns/block/wall_gate_closed.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_open.json b/src/main/resources/assets/betterend/patterns/block/wall_gate_open.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_open.json rename to src/main/resources/assets/betterend/patterns/block/wall_gate_open.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_inventory.json b/src/main/resources/assets/betterend/patterns/block/wall_inventory.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_wall_inventory.json rename to src/main/resources/assets/betterend/patterns/block/wall_inventory.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_post.json b/src/main/resources/assets/betterend/patterns/block/wall_post.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_wall_post.json rename to src/main/resources/assets/betterend/patterns/block/wall_post.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_side.json b/src/main/resources/assets/betterend/patterns/block/wall_side.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_wall_side.json rename to src/main/resources/assets/betterend/patterns/block/wall_side.json diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_side_tall.json b/src/main/resources/assets/betterend/patterns/block/wall_side_tall.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/block/pattern_wall_side_tall.json rename to src/main/resources/assets/betterend/patterns/block/wall_side_tall.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_barrel.json b/src/main/resources/assets/betterend/patterns/blockstate/barrel.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_barrel.json rename to src/main/resources/assets/betterend/patterns/blockstate/barrel.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_block.json b/src/main/resources/assets/betterend/patterns/blockstate/block.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_block.json rename to src/main/resources/assets/betterend/patterns/blockstate/block.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_button.json b/src/main/resources/assets/betterend/patterns/blockstate/button.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_button.json rename to src/main/resources/assets/betterend/patterns/blockstate/button.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_direct.json b/src/main/resources/assets/betterend/patterns/blockstate/direct.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_direct.json rename to src/main/resources/assets/betterend/patterns/blockstate/direct.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_door.json b/src/main/resources/assets/betterend/patterns/blockstate/door.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_door.json rename to src/main/resources/assets/betterend/patterns/blockstate/door.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_fence.json b/src/main/resources/assets/betterend/patterns/blockstate/fence.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_fence.json rename to src/main/resources/assets/betterend/patterns/blockstate/fence.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_fence_gate.json b/src/main/resources/assets/betterend/patterns/blockstate/fence_gate.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_fence_gate.json rename to src/main/resources/assets/betterend/patterns/blockstate/fence_gate.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_ladder.json b/src/main/resources/assets/betterend/patterns/blockstate/ladder.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_ladder.json rename to src/main/resources/assets/betterend/patterns/blockstate/ladder.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pedestal.json b/src/main/resources/assets/betterend/patterns/blockstate/pedestal.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_pedestal.json rename to src/main/resources/assets/betterend/patterns/blockstate/pedestal.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pillar.json b/src/main/resources/assets/betterend/patterns/blockstate/pillar.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_pillar.json rename to src/main/resources/assets/betterend/patterns/blockstate/pillar.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pressure_plate.json b/src/main/resources/assets/betterend/patterns/blockstate/pressure_plate.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_pressure_plate.json rename to src/main/resources/assets/betterend/patterns/blockstate/pressure_plate.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_sapling.json b/src/main/resources/assets/betterend/patterns/blockstate/sapling.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_sapling.json rename to src/main/resources/assets/betterend/patterns/blockstate/sapling.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_slab.json b/src/main/resources/assets/betterend/patterns/blockstate/slab.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_slab.json rename to src/main/resources/assets/betterend/patterns/blockstate/slab.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_stairs.json b/src/main/resources/assets/betterend/patterns/blockstate/stairs.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_stairs.json rename to src/main/resources/assets/betterend/patterns/blockstate/stairs.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_trapdoor.json b/src/main/resources/assets/betterend/patterns/blockstate/trapdoor.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_trapdoor.json rename to src/main/resources/assets/betterend/patterns/blockstate/trapdoor.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_wall.json b/src/main/resources/assets/betterend/patterns/blockstate/wall.json similarity index 100% rename from src/main/resources/assets/betterend/patterns/blockstate/pattern_wall.json rename to src/main/resources/assets/betterend/patterns/blockstate/wall.json diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_composter_bottom.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_composter_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..1ecdada8908c25f1e57ce41d31d39e8582c725b4 GIT binary patch literal 284 zcmV+%0ptFOP)?zayBAVk0# z6f4BE@A(&B4*-}Q@Or1QL^awG5r&FpL;uZ6#f^6DG6M$cTVYDo~H_IxCN=Q&jYv$3Ls zqOz&Vuh9BPgiQ+g*?y4CB(jrICLXo`l%IrcW^Z6*!_Z>ne?ZuNWqCXkC^OA&%j|qP iT-GepmqK{SQ{_^000018CVi*ci1=&=iS!TC>zb&d%F5BXi%_P4;jo$@d@JjdoSlaliBs4RFuK} zEnHt6_={odDtsGR!1uuU2{{}o%xE#{g68G*#2I+ZOX&be584j04EjFl!5^N5Ri4Zf=V*wQ!H!$2*;4UFMw2^OD|6znI`0_?qSDd7wKP NJYD@<);T3K0RS0&RQCV? literal 0 HcmV?d00001