From b0ca912ef8471cc47aaef569e2f7c238767630db Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 1 Jun 2020 15:09:49 +0200 Subject: [PATCH] Chitin stairs and slabs now have coverings --- .../unicopia/block/SmartSlabBlock.java | 30 ++++ .../unicopia/block/SmartStairsBlock.java | 32 ++++ .../blockstates/chitin_shell_slab.json | 8 +- .../blockstates/chitin_shell_stairs.json | 164 +++++++++++++----- .../chitin_shell_inner_stairs_covered.json | 5 + ...chitin_shell_inner_stairs_top_covered.json | 6 + .../chitin_shell_outer_stairs_covered.json | 5 + ...chitin_shell_outer_stairs_top_covered.json | 6 + .../block/chitin_shell_slab_top_covered.json | 8 + .../block/chitin_shell_slab_top_snow.json | 8 + .../block/chitin_shell_stairs_covered.json | 5 + .../chitin_shell_stairs_top_covered.json | 6 + .../enchanted_cloud_inner_stairs_top.json | 2 +- 13 files changed, 242 insertions(+), 43 deletions(-) create mode 100644 src/main/resources/assets/unicopia/models/block/chitin_shell_inner_stairs_covered.json create mode 100644 src/main/resources/assets/unicopia/models/block/chitin_shell_inner_stairs_top_covered.json create mode 100644 src/main/resources/assets/unicopia/models/block/chitin_shell_outer_stairs_covered.json create mode 100644 src/main/resources/assets/unicopia/models/block/chitin_shell_outer_stairs_top_covered.json create mode 100644 src/main/resources/assets/unicopia/models/block/chitin_shell_slab_top_covered.json create mode 100644 src/main/resources/assets/unicopia/models/block/chitin_shell_slab_top_snow.json create mode 100644 src/main/resources/assets/unicopia/models/block/chitin_shell_stairs_covered.json create mode 100644 src/main/resources/assets/unicopia/models/block/chitin_shell_stairs_top_covered.json diff --git a/src/main/java/com/minelittlepony/unicopia/block/SmartSlabBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SmartSlabBlock.java index 5677b27c..1e756991 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/SmartSlabBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/SmartSlabBlock.java @@ -2,15 +2,21 @@ package com.minelittlepony.unicopia.block; import java.util.Random; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SlabBlock; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemPlacementContext; import net.minecraft.server.world.ServerWorld; +import net.minecraft.state.StateManager; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; +import net.minecraft.world.IWorld; import net.minecraft.world.World; public class SmartSlabBlock extends SlabBlock { @@ -63,4 +69,28 @@ public class SmartSlabBlock extends SlabBlock { public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView worldIn, BlockPos pos) { return modelState.calcBlockBreakingDelta(player, worldIn, pos); } + + @Override + @Nullable + public BlockState getPlacementState(ItemPlacementContext context) { + return super.getPlacementState(context).with(Covering.PROPERTY, Covering.getCovering(context.getWorld(), context.getBlockPos().up())); + } + + @Override + @Deprecated + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState other, IWorld world, BlockPos pos, BlockPos otherPos) { + state = super.getStateForNeighborUpdate(state, direction, other, world, pos, otherPos); + + if (direction == Direction.UP) { + return state.with(Covering.PROPERTY, Covering.getCovering(world, otherPos)); + } + + return state; + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + super.appendProperties(builder); + builder.add(Covering.PROPERTY); + } } diff --git a/src/main/java/com/minelittlepony/unicopia/block/SmartStairsBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SmartStairsBlock.java index e0412af0..6239fec9 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/SmartStairsBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/SmartStairsBlock.java @@ -1,12 +1,19 @@ package com.minelittlepony.unicopia.block; +import javax.annotation.Nullable; + +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.StairsBlock; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; +import net.minecraft.world.IWorld; import net.minecraft.world.World; public class SmartStairsBlock extends StairsBlock { @@ -15,6 +22,7 @@ public class SmartStairsBlock extends StairsBlock { public SmartStairsBlock(BlockState inherited, Settings settings) { super(inherited, settings); + setDefaultState(getDefaultState().with(Covering.PROPERTY, Covering.UNCOVERED)); baseBlockState = inherited; } @@ -48,4 +56,28 @@ public class SmartStairsBlock extends StairsBlock { public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) { return baseBlockState.calcBlockBreakingDelta(player, world, pos); } + + @Override + @Nullable + public BlockState getPlacementState(ItemPlacementContext context) { + return super.getPlacementState(context).with(Covering.PROPERTY, Covering.getCovering(context.getWorld(), context.getBlockPos().up())); + } + + @Override + @Deprecated + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState other, IWorld world, BlockPos pos, BlockPos otherPos) { + state = super.getStateForNeighborUpdate(state, direction, other, world, pos, otherPos); + + if (direction == Direction.UP) { + return state.with(Covering.PROPERTY, Covering.getCovering(world, otherPos)); + } + + return state; + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + super.appendProperties(builder); + builder.add(Covering.PROPERTY); + } } diff --git a/src/main/resources/assets/unicopia/blockstates/chitin_shell_slab.json b/src/main/resources/assets/unicopia/blockstates/chitin_shell_slab.json index fbcca682..93712870 100644 --- a/src/main/resources/assets/unicopia/blockstates/chitin_shell_slab.json +++ b/src/main/resources/assets/unicopia/blockstates/chitin_shell_slab.json @@ -1,7 +1,11 @@ { "variants": { "type=bottom": { "model": "unicopia:block/chitin_shell_slab" }, - "type=top": { "model": "unicopia:block/chitin_shell_slab_top" }, - "type=double": { "model": "unicopia:block/chitin_shell_block" } + "type=top,covering=uncovered": { "model": "unicopia:block/chitin_shell_slab_top" }, + "type=top,covering=covered": { "model": "unicopia:block/chitin_shell_slab_top_covered" }, + "type=top,covering=snow_covered": { "model": "unicopia:block/chitin_shell_slab_top_snow" }, + "type=double,covering=uncovered": { "model": "unicopia:block/chitin_shell_block" }, + "type=double,covering=covered": { "model": "unicopia:block/chitin_shell_block_covered" }, + "type=double,covering=snow_covered": { "model": "unicopia:block/chitin_shell_block_snow" } } } \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/chitin_shell_stairs.json b/src/main/resources/assets/unicopia/blockstates/chitin_shell_stairs.json index 0468eb19..99aa567a 100644 --- a/src/main/resources/assets/unicopia/blockstates/chitin_shell_stairs.json +++ b/src/main/resources/assets/unicopia/blockstates/chitin_shell_stairs.json @@ -1,45 +1,129 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "unicopia:block/chitin_shell_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "unicopia:block/chitin_shell_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "unicopia:block/chitin_shell_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "unicopia:block/chitin_shell_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=straight,covering=uncovered": { "model": "unicopia:block/chitin_shell_stairs" }, + "facing=west,half=bottom,shape=straight,covering=uncovered": { "model": "unicopia:block/chitin_shell_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,covering=uncovered": { "model": "unicopia:block/chitin_shell_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,covering=uncovered": { "model": "unicopia:block/chitin_shell_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 270, "uvlock": true } + "facing=east,half=top,shape=straight,covering=uncovered": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,covering=uncovered": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,covering=uncovered": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,covering=uncovered": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left,covering=uncovered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 270, "uvlock": true }, + + "facing=east,half=bottom,shape=straight,covering=covered": { "model": "unicopia:block/chitin_shell_stairs_covered" }, + "facing=west,half=bottom,shape=straight,covering=covered": { "model": "unicopia:block/chitin_shell_stairs_covered", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,covering=covered": { "model": "unicopia:block/chitin_shell_stairs_covered", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,covering=covered": { "model": "unicopia:block/chitin_shell_stairs_covered", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_covered" }, + "facing=west,half=bottom,shape=outer_right,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_covered", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_covered", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_covered", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_covered", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_covered", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_covered" }, + "facing=north,half=bottom,shape=outer_left,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_covered", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_covered" }, + "facing=west,half=bottom,shape=inner_right,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_covered", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_covered", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_covered", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_covered", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_covered", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_covered" }, + "facing=north,half=bottom,shape=inner_left,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_covered", "y": 180, "uvlock": true }, + + "facing=east,half=top,shape=straight,covering=covered": { "model": "unicopia:block/chitin_shell_stairs_top_covered", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,covering=covered": { "model": "unicopia:block/chitin_shell_stairs_top_covered", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,covering=covered": { "model": "unicopia:block/chitin_shell_stairs_top_covered", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,covering=covered": { "model": "unicopia:block/chitin_shell_stairs_top_covered", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top_covered", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top_covered", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top_covered", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top_covered", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top_covered", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top_covered", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top_covered", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left,covering=covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top_covered", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top_covered", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top_covered", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top_covered", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top_covered", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top_covered", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top_covered", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top_covered", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left,covering=covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top_covered", "x": 180, "y": 270, "uvlock": true }, + + "facing=east,half=bottom,shape=straight,covering=snow_covered": { "model": "unicopia:block/chitin_shell_stairs" }, + "facing=west,half=bottom,shape=straight,covering=snow_covered": { "model": "unicopia:block/chitin_shell_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,covering=snow_covered": { "model": "unicopia:block/chitin_shell_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,covering=snow_covered": { "model": "unicopia:block/chitin_shell_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 180, "uvlock": true }, + + "facing=east,half=top,shape=straight,covering=snow_covered": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,covering=snow_covered": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,covering=snow_covered": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,covering=snow_covered": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left,covering=snow_covered": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/unicopia/models/block/chitin_shell_inner_stairs_covered.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_inner_stairs_covered.json new file mode 100644 index 00000000..11a1ab8c --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/chitin_shell_inner_stairs_covered.json @@ -0,0 +1,5 @@ +{ "parent": "unicopia:block/chitin_shell_inner_stairs", + "textures": { + "side": "unicopia:blocks/chitin_block_covered" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/chitin_shell_inner_stairs_top_covered.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_inner_stairs_top_covered.json new file mode 100644 index 00000000..a9e68d59 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/chitin_shell_inner_stairs_top_covered.json @@ -0,0 +1,6 @@ +{ "parent": "unicopia:block/chitin_shell_inner_stairs_top", + "textures": { + "side": "unicopia:blocks/chitin_block_covered", + "step": "unicopia:blocks/chitin_block_covered" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/chitin_shell_outer_stairs_covered.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_outer_stairs_covered.json new file mode 100644 index 00000000..616eb06a --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/chitin_shell_outer_stairs_covered.json @@ -0,0 +1,5 @@ +{ "parent": "unicopia:block/chitin_shell_outer_stairs", + "textures": { + "side": "unicopia:blocks/chitin_block_covered" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/chitin_shell_outer_stairs_top_covered.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_outer_stairs_top_covered.json new file mode 100644 index 00000000..7c766964 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/chitin_shell_outer_stairs_top_covered.json @@ -0,0 +1,6 @@ +{ "parent": "unicopia:block/chitin_shell_outer_stairs_top", + "textures": { + "side": "unicopia:blocks/chitin_block_covered", + "step": "unicopia:blocks/chitin_block_covered" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/chitin_shell_slab_top_covered.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_slab_top_covered.json new file mode 100644 index 00000000..9067f181 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/chitin_shell_slab_top_covered.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "unicopia:blocks/chitin_block_covered", + "top": "unicopia:blocks/chitin_block_top", + "side": "unicopia:blocks/chitin_block_covered" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/chitin_shell_slab_top_snow.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_slab_top_snow.json new file mode 100644 index 00000000..9cf2e30f --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/chitin_shell_slab_top_snow.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "unicopia:blocks/chitin_block_covered", + "top": "unicopia:blocks/chitin_block_top", + "side": "unicopia:blocks/chitin_block_snow_covered" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/chitin_shell_stairs_covered.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_stairs_covered.json new file mode 100644 index 00000000..7d04771b --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/chitin_shell_stairs_covered.json @@ -0,0 +1,5 @@ +{ "parent": "unicopia:block/chitin_shell_stairs", + "textures": { + "side": "unicopia:blocks/chitin_block_covered" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/chitin_shell_stairs_top_covered.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_stairs_top_covered.json new file mode 100644 index 00000000..9abd45af --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/chitin_shell_stairs_top_covered.json @@ -0,0 +1,6 @@ +{ "parent": "unicopia:block/chitin_shell_stairs_top", + "textures": { + "side": "unicopia:blocks/chitin_block_covered", + "step": "unicopia:blocks/chitin_block_covered" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/enchanted_cloud_inner_stairs_top.json b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_inner_stairs_top.json index 158f4cd6..da90db89 100644 --- a/src/main/resources/assets/unicopia/models/block/enchanted_cloud_inner_stairs_top.json +++ b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_inner_stairs_top.json @@ -1,4 +1,4 @@ -{ "parent": "unicopia:block/enthanted_cloud_inner_stairs", +{ "parent": "unicopia:block/enchanted_cloud_inner_stairs", "textures": { "bottom": "unicopia:blocks/enchanted_cloud_block_top", "top": "unicopia:blocks/enchanted_cloud_block_bottom"