diff --git a/src/main/java/ru/betterend/blocks/basis/BlockLadder.java b/src/main/java/ru/betterend/blocks/basis/BlockLadder.java index 43806f96..7bfd710e 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockLadder.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockLadder.java @@ -1,5 +1,7 @@ package ru.betterend.blocks.basis; +import java.io.Reader; + import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -15,17 +17,20 @@ import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.BlockMirror; import net.minecraft.util.BlockRotation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.registry.Registry; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import ru.betterend.client.ERenderLayer; import ru.betterend.client.IRenderTypeable; +import ru.betterend.interfaces.Patterned; import ru.betterend.util.BlocksHelper; -public class BlockLadder extends BlockBaseNotFull implements IRenderTypeable { +public class BlockLadder extends BlockBaseNotFull implements IRenderTypeable, Patterned { public static final DirectionProperty FACING = HorizontalFacingBlock.FACING; public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; protected static final VoxelShape EAST_SHAPE = Block.createCuboidShape(0.0D, 0.0D, 0.0D, 3.0D, 16.0D, 16.0D); @@ -45,15 +50,14 @@ public class BlockLadder extends BlockBaseNotFull implements IRenderTypeable { public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { switch (state.get(FACING)) { - case NORTH: - return NORTH_SHAPE; case SOUTH: return SOUTH_SHAPE; case WEST: return WEST_SHAPE; case EAST: - default: return EAST_SHAPE; + default: + return NORTH_SHAPE; } } @@ -131,4 +135,24 @@ public class BlockLadder extends BlockBaseNotFull implements IRenderTypeable { public ERenderLayer getRenderLayer() { return ERenderLayer.CUTOUT; } + + @Override + public String getStatesPattern(Reader data, String block) { + Identifier blockId = Registry.BLOCK.getId(this); + return Patterned.createJson(data, blockId, block); + } + + @Override + public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); + if (block.contains("item")) { + return Patterned.createJson(Patterned.LADDER_ITEM_MODEL, blockId.getPath()); + } + return Patterned.createJson(Patterned.LADDER_MODEL, blockId.getPath()); + } + + @Override + public Identifier statePatternId() { + return Patterned.LADDER_STATES_PATTERN; + } } diff --git a/src/main/java/ru/betterend/interfaces/Patterned.java b/src/main/java/ru/betterend/interfaces/Patterned.java index c6f4c721..5b055f4d 100644 --- a/src/main/java/ru/betterend/interfaces/Patterned.java +++ b/src/main/java/ru/betterend/interfaces/Patterned.java @@ -28,6 +28,7 @@ public interface Patterned { public final static Identifier SAPLING_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_sapling.json"); public final static Identifier GATE_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_fence_gate.json"); public final static Identifier TRAPDOOR_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_trapdoor.json"); + public final static Identifier LADDER_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_ladder.json"); //Models Block public final static Identifier BASE_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_block.json"); @@ -56,11 +57,13 @@ public interface Patterned { public final static Identifier GATE_MODEL_OPEN = BetterEnd.makeID("patterns/block/pattern_fence_gate_open.json"); public final static Identifier GATE_MODEL_WALL_OPEN = BetterEnd.makeID("patterns/block/pattern_wall_gate_open.json"); public final static Identifier TRAPDOOR_MODEL = BetterEnd.makeID("patterns/block/pattern_trapdoor.json"); + public final static Identifier LADDER_MODEL = BetterEnd.makeID("patterns/block/pattern_ladder.json"); //Models Item public final static Identifier WALL_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_wall.json"); public final static Identifier FENCE_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_fence.json"); public final static Identifier BUTTON_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_button.json"); + public final static Identifier LADDER_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_ladder.json"); public final static Identifier ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_item.json"); default String getStatesPattern(Reader data, String name) { diff --git a/src/main/resources/assets/betterend/blockstates/pythadendron_button.json b/src/main/resources/assets/betterend/blockstates/pythadendron_button.json deleted file mode 100644 index d5047ccd..00000000 --- a/src/main/resources/assets/betterend/blockstates/pythadendron_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "betterend:block/pythadendron_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=east,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=north,powered=false": { - "model": "betterend:block/pythadendron_button", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=south,powered=false": { - "model": "betterend:block/pythadendron_button", - "x": 180 - }, - "face=ceiling,facing=south,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "x": 180 - }, - "face=ceiling,facing=west,powered=false": { - "model": "betterend:block/pythadendron_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=west,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "x": 180, - "y": 90 - }, - "face=floor,facing=east,powered=false": { - "model": "betterend:block/pythadendron_button", - "y": 90 - }, - "face=floor,facing=east,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "y": 90 - }, - "face=floor,facing=north,powered=false": { - "model": "betterend:block/pythadendron_button" - }, - "face=floor,facing=north,powered=true": { - "model": "betterend:block/pythadendron_button_pressed" - }, - "face=floor,facing=south,powered=false": { - "model": "betterend:block/pythadendron_button", - "y": 180 - }, - "face=floor,facing=south,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "y": 180 - }, - "face=floor,facing=west,powered=false": { - "model": "betterend:block/pythadendron_button", - "y": 270 - }, - "face=floor,facing=west,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "y": 270 - }, - "face=wall,facing=east,powered=false": { - "model": "betterend:block/pythadendron_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=east,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=north,powered=false": { - "model": "betterend:block/pythadendron_button", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=north,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=south,powered=false": { - "model": "betterend:block/pythadendron_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=south,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=west,powered=false": { - "model": "betterend:block/pythadendron_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=west,powered=true": { - "model": "betterend:block/pythadendron_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - } - } -} diff --git a/src/main/resources/assets/betterend/blockstates/pythadendron_crafting_table.json b/src/main/resources/assets/betterend/blockstates/pythadendron_crafting_table.json deleted file mode 100644 index a6f86464..00000000 --- a/src/main/resources/assets/betterend/blockstates/pythadendron_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "betterend:block/pythadendron_crafting_table" - } - } -} diff --git a/src/main/resources/assets/betterend/blockstates/pythadendron_door.json b/src/main/resources/assets/betterend/blockstates/pythadendron_door.json deleted file mode 100644 index 4bd19fff..00000000 --- a/src/main/resources/assets/betterend/blockstates/pythadendron_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "betterend:block/pythadendron_door_bottom" - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "betterend:block/pythadendron_door_bottom_hinge", - "y": 90 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "betterend:block/pythadendron_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "betterend:block/pythadendron_door_bottom", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "betterend:block/pythadendron_door_top" - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "betterend:block/pythadendron_door_top_hinge", - "y": 90 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "betterend:block/pythadendron_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "betterend:block/pythadendron_door_top", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "betterend:block/pythadendron_door_bottom", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "betterend:block/pythadendron_door_bottom_hinge" - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "betterend:block/pythadendron_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "betterend:block/pythadendron_door_bottom", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "betterend:block/pythadendron_door_top", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "betterend:block/pythadendron_door_top_hinge" - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "betterend:block/pythadendron_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "betterend:block/pythadendron_door_top", - "y": 180 - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "betterend:block/pythadendron_door_bottom", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "betterend:block/pythadendron_door_bottom_hinge", - "y": 180 - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "betterend:block/pythadendron_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "betterend:block/pythadendron_door_bottom" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "betterend:block/pythadendron_door_top", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "betterend:block/pythadendron_door_top_hinge", - "y": 180 - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "betterend:block/pythadendron_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "betterend:block/pythadendron_door_top" - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "betterend:block/pythadendron_door_bottom", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "betterend:block/pythadendron_door_bottom_hinge", - "y": 270 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "betterend:block/pythadendron_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "betterend:block/pythadendron_door_bottom", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "betterend:block/pythadendron_door_top", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "betterend:block/pythadendron_door_top_hinge", - "y": 270 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "betterend:block/pythadendron_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "betterend:block/pythadendron_door_top", - "y": 90 - } - } -} diff --git a/src/main/resources/assets/betterend/blockstates/pythadendron_fence.json b/src/main/resources/assets/betterend/blockstates/pythadendron_fence.json deleted file mode 100644 index d084842e..00000000 --- a/src/main/resources/assets/betterend/blockstates/pythadendron_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "betterend:block/pythadendron_fence_post" - } - }, - { - "apply": { - "model": "betterend:block/pythadendron_fence_side", - "uvlock": true - }, - "when": { - "north": true - } - }, - { - "apply": { - "model": "betterend:block/pythadendron_fence_side", - "uvlock": true, - "y": 90 - }, - "when": { - "east": true - } - }, - { - "apply": { - "model": "betterend:block/pythadendron_fence_side", - "uvlock": true, - "y": 180 - }, - "when": { - "south": true - } - }, - { - "apply": { - "model": "betterend:block/pythadendron_fence_side", - "uvlock": true, - "y": 270 - }, - "when": { - "west": true - } - } - ] -} diff --git a/src/main/resources/assets/betterend/blockstates/pythadendron_gate.json b/src/main/resources/assets/betterend/blockstates/pythadendron_gate.json deleted file mode 100644 index b66355dd..00000000 --- a/src/main/resources/assets/betterend/blockstates/pythadendron_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=east,in_wall=false,open=false": { - "model": "betterend:block/pythadendron_fence_gate_closed", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=false,open=true": { - "model": "betterend:block/pythadendron_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=false": { - "model": "betterend:block/pythadendron_wall_gate_closed", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=true": { - "model": "betterend:block/pythadendron_wall_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=north,in_wall=false,open=false": { - "model": "betterend:block/pythadendron_fence_gate_closed", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=false,open=true": { - "model": "betterend:block/pythadendron_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=false": { - "model": "betterend:block/pythadendron_wall_gate_closed", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=true": { - "model": "betterend:block/pythadendron_wall_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=south,in_wall=false,open=false": { - "model": "betterend:block/pythadendron_fence_gate_closed", - "uvlock": true - }, - "facing=south,in_wall=false,open=true": { - "model": "betterend:block/pythadendron_fence_gate_open", - "uvlock": true - }, - "facing=south,in_wall=true,open=false": { - "model": "betterend:block/pythadendron_wall_gate_closed", - "uvlock": true - }, - "facing=south,in_wall=true,open=true": { - "model": "betterend:block/pythadendron_wall_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "betterend:block/pythadendron_fence_gate_closed", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=false,open=true": { - "model": "betterend:block/pythadendron_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=false": { - "model": "betterend:block/pythadendron_wall_gate_closed", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=true": { - "model": "betterend:block/pythadendron_wall_gate_open", - "uvlock": true, - "y": 90 - } - } -} diff --git a/src/main/resources/assets/betterend/blockstates/pythadendron_ladder.json b/src/main/resources/assets/betterend/blockstates/pythadendron_ladder.json deleted file mode 100644 index 911da56a..00000000 --- a/src/main/resources/assets/betterend/blockstates/pythadendron_ladder.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=east": { - "model": "betterend:block/pythadendron_ladder", - "y": 90 - }, - "facing=north": { - "model": "betterend:block/pythadendron_ladder" - }, - "facing=south": { - "model": "betterend:block/pythadendron_ladder", - "y": 180 - }, - "facing=west": { - "model": "betterend:block/pythadendron_ladder", - "y": 270 - } - } -} diff --git a/src/main/resources/assets/betterend/blockstates/pythadendron_planks.json b/src/main/resources/assets/betterend/blockstates/pythadendron_planks.json deleted file mode 100644 index 34f944c4..00000000 --- a/src/main/resources/assets/betterend/blockstates/pythadendron_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "betterend:block/pythadendron_planks" - } - } -} diff --git a/src/main/resources/assets/betterend/blockstates/pythadendron_plate.json b/src/main/resources/assets/betterend/blockstates/pythadendron_plate.json deleted file mode 100644 index 85fa0c8c..00000000 --- a/src/main/resources/assets/betterend/blockstates/pythadendron_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "betterend:block/pythadendron_pressure_plate_up" - }, - "powered=true": { - "model": "betterend:block/pythadendron_pressure_plate_down" - } - } -} diff --git a/src/main/resources/assets/betterend/blockstates/pythadendron_slab.json b/src/main/resources/assets/betterend/blockstates/pythadendron_slab.json deleted file mode 100644 index f50b85b1..00000000 --- a/src/main/resources/assets/betterend/blockstates/pythadendron_slab.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "betterend:block/pythadendron_half_slab" - }, - "type=double": { - "model": "betterend:block/pythadendron_planks" - }, - "type=top": { - "model": "betterend:block/pythadendron_half_slab", - "uvlock": true, - "x": 180 - } - } -} diff --git a/src/main/resources/assets/betterend/blockstates/pythadendron_trapdoor.json b/src/main/resources/assets/betterend/blockstates/pythadendron_trapdoor.json deleted file mode 100644 index 1197b771..00000000 --- a/src/main/resources/assets/betterend/blockstates/pythadendron_trapdoor.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "betterend:block/pythadendron_trapdoor", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 90, - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 180, - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 270, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "betterend:block/pythadendron_trapdoor" - }, - "facing=north,half=bottom,open=true": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 90 - }, - "facing=north,half=top,open=false": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 180 - }, - "facing=north,half=top,open=true": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 270, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "betterend:block/pythadendron_trapdoor", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 90, - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 270, - "y": 0 - }, - "facing=west,half=bottom,open=false": { - "model": "betterend:block/pythadendron_trapdoor", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 90, - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "betterend:block/pythadendron_trapdoor", - "x": 270, - "y": 90 - } - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_button.json b/src/main/resources/assets/betterend/models/block/pythadendron_button.json deleted file mode 100644 index 253af5f1..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_button_inventory.json b/src/main/resources/assets/betterend/models/block/pythadendron_button_inventory.json deleted file mode 100644 index f30fc835..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_button_pressed.json b/src/main/resources/assets/betterend/models/block/pythadendron_button_pressed.json deleted file mode 100644 index 8a01c72e..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_crafting_table.json b/src/main/resources/assets/betterend/models/block/pythadendron_crafting_table.json deleted file mode 100644 index 793aa06f..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "down": "betterend:block/pythadendron_crafting_table_bottom", - "east": "betterend:block/pythadendron_crafting_table_side", - "north": "betterend:block/pythadendron_crafting_table_front", - "particle": "betterend:block/pythadendron_crafting_table_front", - "south": "betterend:block/pythadendron_crafting_table_side", - "up": "betterend:block/pythadendron_crafting_table_top", - "west": "betterend:block/pythadendron_crafting_table_front" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_door_bottom.json b/src/main/resources/assets/betterend/models/block/pythadendron_door_bottom.json deleted file mode 100644 index e69fd647..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "betterend:block/sided_door_bottom", - "textures": { - "facade": "betterend:block/pythadendron_door_bottom", - "side": "betterend:block/pythadendron_door_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_door_bottom_hinge.json b/src/main/resources/assets/betterend/models/block/pythadendron_door_bottom_hinge.json deleted file mode 100644 index 686636e8..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "betterend:block/sided_door_bottom_rh", - "textures": { - "facade": "betterend:block/pythadendron_door_bottom", - "side": "betterend:block/pythadendron_door_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_door_top.json b/src/main/resources/assets/betterend/models/block/pythadendron_door_top.json deleted file mode 100644 index fac899f9..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "betterend:block/sided_door_top", - "textures": { - "facade": "betterend:block/pythadendron_door_top", - "side": "betterend:block/pythadendron_door_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_door_top_hinge.json b/src/main/resources/assets/betterend/models/block/pythadendron_door_top_hinge.json deleted file mode 100644 index 58e92270..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "betterend:block/sided_door_top_rh", - "textures": { - "facade": "betterend:block/pythadendron_door_top", - "side": "betterend:block/pythadendron_door_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_fence_gate_closed.json b/src/main/resources/assets/betterend/models/block/pythadendron_fence_gate_closed.json deleted file mode 100644 index 01c5cb00..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_fence_gate_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_fence_gate_open.json b/src/main/resources/assets/betterend/models/block/pythadendron_fence_gate_open.json deleted file mode 100644 index cd6ae7e2..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_fence_inventory.json b/src/main/resources/assets/betterend/models/block/pythadendron_fence_inventory.json deleted file mode 100644 index 68b63d8f..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_fence_post.json b/src/main/resources/assets/betterend/models/block/pythadendron_fence_post.json deleted file mode 100644 index 96a885e6..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_fence_side.json b/src/main/resources/assets/betterend/models/block/pythadendron_fence_side.json deleted file mode 100644 index eb13dc7a..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_fence_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_half_slab.json b/src/main/resources/assets/betterend/models/block/pythadendron_half_slab.json deleted file mode 100644 index 675a62e4..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_half_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "betterend:block/pythadendron_planks", - "side": "betterend:block/pythadendron_planks", - "top": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_inner_stairs.json b/src/main/resources/assets/betterend/models/block/pythadendron_inner_stairs.json deleted file mode 100644 index 8d9d4d66..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "betterend:block/pythadendron_planks", - "side": "betterend:block/pythadendron_planks", - "top": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_ladder.json b/src/main/resources/assets/betterend/models/block/pythadendron_ladder.json deleted file mode 100644 index 0e194efc..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_ladder.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterend:block/ladder", - "textures": { - "texture": "betterend:block/pythadendron_ladder" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_planks.json b/src/main/resources/assets/betterend/models/block/pythadendron_planks.json deleted file mode 100644 index 9b96f10b..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_pressure_plate_down.json b/src/main/resources/assets/betterend/models/block/pythadendron_pressure_plate_down.json deleted file mode 100644 index e42d6424..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_pressure_plate_up.json b/src/main/resources/assets/betterend/models/block/pythadendron_pressure_plate_up.json deleted file mode 100644 index 46a39dad..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_pressure_plate_up.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_trapdoor.json b/src/main/resources/assets/betterend/models/block/pythadendron_trapdoor.json deleted file mode 100644 index e15b3700..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_trapdoor.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "betterend:block/sided_trapdoor", - "textures": { - "texture": "betterend:block/pythadendron_trapdoor", - "side": "betterend:block/pythadendron_door_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_wall_gate_closed.json b/src/main/resources/assets/betterend/models/block/pythadendron_wall_gate_closed.json deleted file mode 100644 index d29f4c9a..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_wall_gate_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pythadendron_wall_gate_open.json b/src/main/resources/assets/betterend/models/block/pythadendron_wall_gate_open.json deleted file mode 100644 index 3f3fc6df..00000000 --- a/src/main/resources/assets/betterend/models/block/pythadendron_wall_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "betterend:block/pythadendron_planks" - } -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_button.json b/src/main/resources/assets/betterend/models/item/pythadendron_button.json deleted file mode 100644 index 267ce4a9..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pythadendron_button_inventory" -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_crafting_table.json b/src/main/resources/assets/betterend/models/item/pythadendron_crafting_table.json deleted file mode 100644 index 5be3e10d..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_crafting_table.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pythadendron_crafting_table" -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_door.json b/src/main/resources/assets/betterend/models/item/pythadendron_door.json deleted file mode 100644 index 96c254c8..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:item/pythadendron_door" - } -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_fence.json b/src/main/resources/assets/betterend/models/item/pythadendron_fence.json deleted file mode 100644 index 66a057a4..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pythadendron_fence_inventory" -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_gate.json b/src/main/resources/assets/betterend/models/item/pythadendron_gate.json deleted file mode 100644 index d9381bbb..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pythadendron_fence_gate_closed" -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_ladder.json b/src/main/resources/assets/betterend/models/item/pythadendron_ladder.json deleted file mode 100644 index 7cab3f73..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_ladder.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:block/pythadendron_ladder" - } -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_planks.json b/src/main/resources/assets/betterend/models/item/pythadendron_planks.json deleted file mode 100644 index 165c5aab..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pythadendron_planks" -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_plate.json b/src/main/resources/assets/betterend/models/item/pythadendron_plate.json deleted file mode 100644 index 48be08a3..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pythadendron_pressure_plate_up" -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_slab.json b/src/main/resources/assets/betterend/models/item/pythadendron_slab.json deleted file mode 100644 index ed9180d7..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pythadendron_half_slab" -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_stairs.json b/src/main/resources/assets/betterend/models/item/pythadendron_stairs.json deleted file mode 100644 index 93e366af..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pythadendron_stairs" -} diff --git a/src/main/resources/assets/betterend/models/item/pythadendron_trapdoor.json b/src/main/resources/assets/betterend/models/item/pythadendron_trapdoor.json deleted file mode 100644 index 36b5baea..00000000 --- a/src/main/resources/assets/betterend/models/item/pythadendron_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pythadendron_trapdoor" -} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_ladder.json b/src/main/resources/assets/betterend/patterns/block/pattern_ladder.json new file mode 100644 index 00000000..579af4df --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/block/pattern_ladder.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/ladder", + "textures": { + "texture": "betterend:block/%texture%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_ladder.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_ladder.json new file mode 100644 index 00000000..2bf2f520 --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_ladder.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "betterend:pattern/%block%" + }, + "facing=east": { + "model": "betterend:pattern/%block%", + "y": 90 + }, + "facing=south": { + "model": "betterend:pattern/%block%", + "y": 180 + }, + "facing=west": { + "model": "betterend:pattern/%block%", + "y": 270 + } + } +} diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_ladder.json b/src/main/resources/assets/betterend/patterns/item/pattern_ladder.json new file mode 100644 index 00000000..79412c0a --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/item/pattern_ladder.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/%texture%" + } +}