diff --git a/gradle.properties b/gradle.properties index 878a4d1..afdf213 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ loom.platform=forge yarn_mappings=1.18.2+build.4 # Mod Properties - mod_version=0.1.0a + mod_version=0.1.0b maven_group=io.github.dovecotmc archives_base_name=LeadBeyond mod_id=lead_beyond diff --git a/src/main/java/io/github/dovecotmc/leadbeyond/LeadBeyondClient.java b/src/main/java/io/github/dovecotmc/leadbeyond/LeadBeyondClient.java index 1dd9853..427419d 100644 --- a/src/main/java/io/github/dovecotmc/leadbeyond/LeadBeyondClient.java +++ b/src/main/java/io/github/dovecotmc/leadbeyond/LeadBeyondClient.java @@ -5,6 +5,7 @@ import net.minecraft.client.render.RenderLayers; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +@SuppressWarnings("unused") public class LeadBeyondClient { public static void clientSetup(final FMLClientSetupEvent event) { RenderLayers.setRenderLayer(BlockReg.TICKET_VENDOR.get(), RenderLayer.getTranslucent()); diff --git a/src/main/java/io/github/dovecotmc/leadbeyond/common/block/CustomVoxelShapeBlock.java b/src/main/java/io/github/dovecotmc/leadbeyond/common/block/CustomVoxelShapeBlock.java new file mode 100644 index 0000000..d418450 --- /dev/null +++ b/src/main/java/io/github/dovecotmc/leadbeyond/common/block/CustomVoxelShapeBlock.java @@ -0,0 +1,29 @@ +package io.github.dovecotmc.leadbeyond.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; + +import java.util.function.Function; + +public class CustomVoxelShapeBlock extends Block { + private final Function shape; + + public CustomVoxelShapeBlock(Settings settings, Function shape) { + super(settings); + this.shape = shape; + } + + public CustomVoxelShapeBlock(Settings settings, VoxelShape shape) { + super(settings); + this.shape = (state -> shape); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return shape.apply(state); + } +} diff --git a/src/main/java/io/github/dovecotmc/leadbeyond/common/block/HorizontalCVSBlock.java b/src/main/java/io/github/dovecotmc/leadbeyond/common/block/HorizontalCVSBlock.java new file mode 100644 index 0000000..e8897ac --- /dev/null +++ b/src/main/java/io/github/dovecotmc/leadbeyond/common/block/HorizontalCVSBlock.java @@ -0,0 +1,47 @@ +package io.github.dovecotmc.leadbeyond.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +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.math.Direction; +import net.minecraft.util.shape.VoxelShape; + +import java.util.function.Function; + +public class HorizontalCVSBlock extends CustomVoxelShapeBlock { + public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; + + public HorizontalCVSBlock(Settings settings, Function shape) { + super(settings, shape); + setDefaultState(this.stateManager.getDefaultState() + .with(FACING, Direction.NORTH)); + } + + public HorizontalCVSBlock(Settings settings, VoxelShape shape) { + this(settings, (state -> shape)); + } + + public BlockState rotate(BlockState state, BlockRotation rotation) { + return state.with(FACING, rotation.rotate(state.get(FACING))); + } + + public BlockState mirror(BlockState state, BlockMirror mirror) { + return state.rotate(mirror.getRotation(state.get(FACING))); + } + + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + return this.getDefaultState() + .with(FACING, ctx.getPlayerFacing().getOpposite()); + } + + @Override + protected void appendProperties(StateManager.Builder stateManager) { + stateManager.add(FACING); + } +} diff --git a/src/main/java/io/github/dovecotmc/leadbeyond/common/block/LBSeatBlock.java b/src/main/java/io/github/dovecotmc/leadbeyond/common/block/LBSeatBlock.java new file mode 100644 index 0000000..c2a0e0e --- /dev/null +++ b/src/main/java/io/github/dovecotmc/leadbeyond/common/block/LBSeatBlock.java @@ -0,0 +1,163 @@ +package io.github.dovecotmc.leadbeyond.common.block; + +import com.simibubi.create.content.contraptions.components.actors.SeatBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +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.DyeColor; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import org.jetbrains.annotations.NotNull; + +public class LBSeatBlock extends SeatBlock { + public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; + private final VoxelShape northShape; + private final VoxelShape southShape; + private final VoxelShape westShape; + private final VoxelShape eastShape; + + public LBSeatBlock(@NotNull Settings settings) { + super(settings.nonOpaque(), DyeColor.BLUE, true); + // Preventing lag + this.northShape = makeNorthShape(); + this.southShape = makeSouthShape(); + this.westShape = makeWestShape(); + this.eastShape = makeEastShape(); + setDefaultState(this.stateManager.getDefaultState() + .with(FACING, Direction.NORTH) + .with(WATERLOGGED, false)); + } + + @Override + protected void appendProperties(@NotNull StateManager.Builder stateManager) { + super.appendProperties(stateManager.add(FACING)); + } + + public BlockState rotate(BlockState state, BlockRotation rotation) { + return state.with(FACING, rotation.rotate(state.get(FACING))); + } + + public BlockState mirror(BlockState state, BlockMirror mirror) { + return state.rotate(mirror.getRotation(state.get(FACING))); + } + + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + return this.getDefaultState() + .with(FACING, ctx.getPlayerFacing().getOpposite()) + .with(WATERLOGGED, false); + } + + @Override + public @NotNull VoxelShape getOutlineShape(@NotNull BlockState state, @NotNull BlockView world, @NotNull BlockPos pos, @NotNull ShapeContext ctx) { + return switch (state.get(FACING)) { + default -> VoxelShapes.fullCube(); + case NORTH -> northShape; + case SOUTH -> southShape; + case WEST -> westShape; + case EAST -> eastShape; + }; + } + + @Override + public @NotNull VoxelShape getCollisionShape(@NotNull BlockState state, @NotNull BlockView world, @NotNull BlockPos pos, @NotNull ShapeContext ctx) { + return getOutlineShape(state, world, pos, ctx); + } + + // Generated using Blockbench + private static VoxelShape makeNorthShape(){ + VoxelShape shape = VoxelShapes.empty(); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.8125, 0.0625, 0.375, 0.875, 0.25, 0.625)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.8125, 0, 0.1875, 0.875, 0.0625, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.125, 0.0625, 0.375, 0.1875, 0.25, 0.625)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.125, 0, 0.1875, 0.1875, 0.0625, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0, 0.4375, 0.8125, 0.0625, 0.5625)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.125, 0.25, 0, 0.875, 0.5, 0.75)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.125, 0.375, 0.578125, 0.875, 1.375, 0.828125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0, 0.25, 0.1875, 0.125, 0.6875, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0, 0.25, 0.03125, 0.125, 0.4375, 0.1875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0, 0.6875, 0.0625, 0.125, 0.8125, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.875, 0.6875, 0.0625, 1, 0.8125, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.875, 0.25, 0.1875, 1, 0.6875, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.875, 0.25, 0.03125, 1, 0.4375, 0.1875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.15625, 0.6875, 0.8125, 0.84375, 1.125, 0.84375)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.09375, 0.5625, 0.80625, 0.15625, 1.078125, 0.8375)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.84375, 0.5625, 0.80625, 0.90625, 1.078125, 0.8375)); + return shape; + } + + // Generated using Blockbench + private static VoxelShape makeSouthShape(){ + VoxelShape shape = VoxelShapes.empty(); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.125, 0.0625, 0.375, 0.1875, 0.25, 0.625)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.125, 0, 0.1875, 0.1875, 0.0625, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.8125, 0.0625, 0.375, 0.875, 0.25, 0.625)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.8125, 0, 0.1875, 0.875, 0.0625, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0, 0.4375, 0.8125, 0.0625, 0.5625)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.125, 0.25, 0.25, 0.875, 0.5, 1)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.125, 0.375, 0.171875, 0.875, 1.375, 0.421875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.875, 0.25, 0.1875, 1, 0.6875, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.875, 0.25, 0.8125, 1, 0.4375, 0.96875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.875, 0.6875, 0.1875, 1, 0.8125, 0.9375)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0, 0.6875, 0.1875, 0.125, 0.8125, 0.9375)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0, 0.25, 0.1875, 0.125, 0.6875, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0, 0.25, 0.8125, 0.125, 0.4375, 0.96875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.15625, 0.6875, 0.15625, 0.84375, 1.125, 0.1875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.84375, 0.5625, 0.1625, 0.90625, 1.078125, 0.19375)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.09375, 0.5625, 0.1625, 0.15625, 1.078125, 0.19375)); + return shape; + } + + // Generate using Blockbench + private static VoxelShape makeEastShape(){ + VoxelShape shape = VoxelShapes.empty(); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.375, 0.0625, 0.8125, 0.625, 0.25, 0.875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0, 0.8125, 0.8125, 0.0625, 0.875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.375, 0.0625, 0.125, 0.625, 0.25, 0.1875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0, 0.125, 0.8125, 0.0625, 0.1875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.4375, 0, 0.1875, 0.5625, 0.0625, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.25, 0.25, 0.125, 1, 0.5, 0.875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.171875, 0.375, 0.125, 0.421875, 1.375, 0.875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0.25, 0, 0.8125, 0.6875, 0.125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.8125, 0.25, 0, 0.96875, 0.4375, 0.125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0.6875, 0, 0.9375, 0.8125, 0.125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0.6875, 0.875, 0.9375, 0.8125, 1)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0.25, 0.875, 0.8125, 0.6875, 1)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.8125, 0.25, 0.875, 0.96875, 0.4375, 1)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.15625, 0.6875, 0.15625, 0.1875, 1.125, 0.84375)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1625, 0.5625, 0.09375, 0.19375, 1.078125, 0.15625)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1625, 0.5625, 0.84375, 0.19375, 1.078125, 0.90625)); + return shape; + } + + // Generate using Blockbench + private static VoxelShape makeWestShape(){ + VoxelShape shape = VoxelShapes.empty(); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.375, 0.0625, 0.125, 0.625, 0.25, 0.1875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0, 0.125, 0.8125, 0.0625, 0.1875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.375, 0.0625, 0.8125, 0.625, 0.25, 0.875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0, 0.8125, 0.8125, 0.0625, 0.875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.4375, 0, 0.1875, 0.5625, 0.0625, 0.8125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0, 0.25, 0.125, 0.75, 0.5, 0.875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.578125, 0.375, 0.125, 0.828125, 1.375, 0.875)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0.25, 0.875, 0.8125, 0.6875, 1)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.03125, 0.25, 0.875, 0.1875, 0.4375, 1)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.0625, 0.6875, 0.875, 0.8125, 0.8125, 1)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.0625, 0.6875, 0, 0.8125, 0.8125, 0.125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0.25, 0, 0.8125, 0.6875, 0.125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.03125, 0.25, 0, 0.1875, 0.4375, 0.125)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.8125, 0.6875, 0.15625, 0.84375, 1.125, 0.84375)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.80625, 0.5625, 0.84375, 0.8375, 1.078125, 0.90625)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.80625, 0.5625, 0.09375, 0.8375, 1.078125, 0.15625)); + return shape; + } +} diff --git a/src/main/java/io/github/dovecotmc/leadbeyond/common/reg/BlockReg.java b/src/main/java/io/github/dovecotmc/leadbeyond/common/reg/BlockReg.java index f715f21..4c35fd2 100644 --- a/src/main/java/io/github/dovecotmc/leadbeyond/common/reg/BlockReg.java +++ b/src/main/java/io/github/dovecotmc/leadbeyond/common/reg/BlockReg.java @@ -1,16 +1,38 @@ package io.github.dovecotmc.leadbeyond.common.reg; +import com.simibubi.create.AllBlocks; import io.github.dovecotmc.leadbeyond.LeadBeyond; +import io.github.dovecotmc.leadbeyond.common.block.HorizontalCVSBlock; +import io.github.dovecotmc.leadbeyond.common.block.LBSeatBlock; import io.github.dovecotmc.leadbeyond.common.block.TicketVendorBlock; import io.github.dovecotmc.leadbeyond.common.block.TurnstileBlock; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.util.DyeColor; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; public class BlockReg { + public static final VoxelShape yzNsShape = VoxelShapes.union(VoxelShapes.cuboid(0.125, 0, 0.5625, 0.1875, 0.25, 0.8125), + VoxelShapes.cuboid(0.125, 0, 0.1875, 0.1875, 0.25, 0.4375), + VoxelShapes.cuboid(0.125, 0, 0.1875, 0.1875, 0.25, 0.4375), + VoxelShapes.cuboid(0.8125, 0, 0.1875, 0.875, 0.25, 0.4375), + VoxelShapes.cuboid(0.8125, 0, 0.5625, 0.875, 0.25, 0.8125), + VoxelShapes.cuboid(0, 0.25, 0, 1, 0.5, 1), + VoxelShapes.cuboid(0, 0.5, 0.375, 0.5, 1.4375, 0.625), + VoxelShapes.cuboid(0.53125, 0.5, 0.375, 1, 1.4375, 0.625)); + public static final VoxelShape yzEwShape = VoxelShapes.union(VoxelShapes.cuboid(0.1875, 0, 0.125, 0.4375, 0.25, 0.1875), + VoxelShapes.cuboid(0.5625, 0, 0.125, 0.8125, 0.25, 0.1875), + VoxelShapes.cuboid(0.5625, 0, 0.8125, 0.8125, 0.25, 0.875), + VoxelShapes.cuboid(0.1875, 0, 0.8125, 0.4375, 0.25, 0.875), + VoxelShapes.cuboid(0, 0.25, 0, 1, 0.5, 1), + VoxelShapes.cuboid(0.375, 0.5, 0, 0.625, 1.4375, 0.5), + VoxelShapes.cuboid(0.375, 0.5, 0.53125, 0.625, 1.4375, 1)); + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, LeadBeyond.MODID); @@ -18,4 +40,14 @@ public class BlockReg { new TicketVendorBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).nonOpaque())); public static final RegistryObject TURNSTILE = BLOCKS.register("turnstile", () -> new TurnstileBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).nonOpaque())); + public static final RegistryObject RZ_SEAT = BLOCKS.register("rz_seat", () -> + new LBSeatBlock(AbstractBlock.Settings.copy(AllBlocks.SEATS.get(DyeColor.BLUE).get()))); + public static final RegistryObject YZ_SEAT2 = BLOCKS.register("yz_seat2", () -> + new HorizontalCVSBlock(AbstractBlock.Settings.copy(AllBlocks.SEATS.get(DyeColor.BLUE).get()), state -> switch (state.get(HorizontalCVSBlock.FACING)) { + default -> VoxelShapes.fullCube(); + case NORTH, SOUTH -> yzNsShape; + case WEST, EAST -> yzEwShape; + })); + + } diff --git a/src/main/java/io/github/dovecotmc/leadbeyond/common/reg/ItemReg.java b/src/main/java/io/github/dovecotmc/leadbeyond/common/reg/ItemReg.java index 7a1c1f7..cc9a9f9 100644 --- a/src/main/java/io/github/dovecotmc/leadbeyond/common/reg/ItemReg.java +++ b/src/main/java/io/github/dovecotmc/leadbeyond/common/reg/ItemReg.java @@ -22,4 +22,8 @@ public class ItemReg { new BlockItem(BlockReg.TICKET_VENDOR.get(), new Item.Settings().group(LBItemGroup.INSTANCE))); public static final RegistryObject TURNSTILE = ITEM.register("turnstile", () -> new BlockItem(BlockReg.TURNSTILE.get(), new Item.Settings().group(LBItemGroup.INSTANCE))); + public static final RegistryObject RZ_SEAT = ITEM.register("rz_seat", () -> + new BlockItem(BlockReg.RZ_SEAT.get(), new Item.Settings().group(LBItemGroup.INSTANCE))); + public static final RegistryObject YZ_SEAT2 = ITEM.register("yz_seat2", () -> + new BlockItem(BlockReg.YZ_SEAT2.get(), new Item.Settings().group(LBItemGroup.INSTANCE))); } diff --git a/src/main/resources/assets/lead_beyond/blockstates/rz_seat.json b/src/main/resources/assets/lead_beyond/blockstates/rz_seat.json new file mode 100644 index 0000000..cb7022f --- /dev/null +++ b/src/main/resources/assets/lead_beyond/blockstates/rz_seat.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "lead_beyond:block/rz_seat", "y": 0 }, + "facing=east": { "model": "lead_beyond:block/rz_seat", "y": 90 }, + "facing=south": { "model": "lead_beyond:block/rz_seat", "y": 180 }, + "facing=west": { "model": "lead_beyond:block/rz_seat", "y": 270 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lead_beyond/blockstates/yz_seat2.json b/src/main/resources/assets/lead_beyond/blockstates/yz_seat2.json new file mode 100644 index 0000000..94c142f --- /dev/null +++ b/src/main/resources/assets/lead_beyond/blockstates/yz_seat2.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "lead_beyond:block/yz_seat2", "y": 0 }, + "facing=east": { "model": "lead_beyond:block/yz_seat2", "y": 90 }, + "facing=south": { "model": "lead_beyond:block/yz_seat2", "y": 180 }, + "facing=west": { "model": "lead_beyond:block/yz_seat2", "y": 270 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lead_beyond/lang/en_us.json b/src/main/resources/assets/lead_beyond/lang/en_us.json index 677099a..f57fe71 100644 --- a/src/main/resources/assets/lead_beyond/lang/en_us.json +++ b/src/main/resources/assets/lead_beyond/lang/en_us.json @@ -6,13 +6,15 @@ "block.lead_beyond.turnstile": "Turnstile", "block.lead_beyond.ticket_vendor": "Ticket Vendor", + "block.lead_beyond.rz_seat": "Soft Seat", + "block.lead_beyond.yz_seat2": "Hard Seat", "message.lead_beyond.set_exit.true": "Set as Exit", "message.lead_beyond.set_exit.false": "Set as Entrance", - "subtitle.lead_beyond.beep_ticket_vendor": "Ticket Vendor beeps", - "subtitle.lead_beyond.beep_turnstile": "Turnstile beeps", - "subtitle.lead_beyond.ticket_out": "Ticket Vendor issues a ticket", + "subtitles.lead_beyond.beep_ticket_vendor": "Ticket Vendor beeps", + "subtitles.lead_beyond.beep_turnstile": "Turnstile beeps", + "subtitles.lead_beyond.ticket_out": "Ticket Vendor issues a ticket", "tooltip.lead_beyond.card.money": "Money: %s", "tooltip.lead_beyond.ticket.used": "Used" diff --git a/src/main/resources/assets/lead_beyond/lang/zh_cn.json b/src/main/resources/assets/lead_beyond/lang/zh_cn.json index 6ccd330..7e21c52 100644 --- a/src/main/resources/assets/lead_beyond/lang/zh_cn.json +++ b/src/main/resources/assets/lead_beyond/lang/zh_cn.json @@ -6,13 +6,15 @@ "block.lead_beyond.turnstile": "闸机", "block.lead_beyond.ticket_vendor": "售票机", + "block.lead_beyond.rz_seat": "软座", + "block.lead_beyond.yz_seat2": "硬座", "message.lead_beyond.set_exit.true": "已设置成出口", "message.lead_beyond.set_exit.false": "已设置成入口", - "subtitle.lead_beyond.beep_ticket_vendor": "售票机：哔——", - "subtitle.lead_beyond.beep_turnstile": "闸门：哔——", - "subtitle.lead_beyond.ticket_out": "售票机：出票", + "subtitles.lead_beyond.beep_ticket_vendor": "售票机：哔——", + "subtitles.lead_beyond.beep_turnstile": "闸机：哔——", + "subtitles.lead_beyond.ticket_out": "售票机：出票", "tooltip.lead_beyond.card.money": "金钱: %s", "tooltip.lead_beyond.ticket.used": "已使用" diff --git a/src/main/resources/assets/lead_beyond/models/block/rzseat.json b/src/main/resources/assets/lead_beyond/models/block/rz_seat.json similarity index 89% rename from src/main/resources/assets/lead_beyond/models/block/rzseat.json rename to src/main/resources/assets/lead_beyond/models/block/rz_seat.json index 104a148..94b1d5e 100644 --- a/src/main/resources/assets/lead_beyond/models/block/rzseat.json +++ b/src/main/resources/assets/lead_beyond/models/block/rz_seat.json @@ -1,9 +1,9 @@ { - "credit": "Made with Blockbench", + "credit": "Made with Blockbenchboombaka", "texture_size": [64, 64], "textures": { - "0": "RZSeat", - "particle": "RZSeat" + "0": "lead_beyond:block/rz_seat", + "particle": "lead_beyond:block/rz_seat" }, "elements": [ { @@ -210,5 +210,42 @@ "down": {"uv": [7.5, 10.4375, 7.25, 10.5625], "texture": "#0"} } } - ] + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, -1.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [-112.5, 0, 0], + "translation": [0, 6, 4.5] + }, + "fixed": { + "translation": [0, 0, -3.75], + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/lead_beyond/models/block/ticketvendor.json b/src/main/resources/assets/lead_beyond/models/block/ticket_vendor.json similarity index 69% rename from src/main/resources/assets/lead_beyond/models/block/ticketvendor.json rename to src/main/resources/assets/lead_beyond/models/block/ticket_vendor.json index 442c3f4..fa6a195 100644 --- a/src/main/resources/assets/lead_beyond/models/block/ticketvendor.json +++ b/src/main/resources/assets/lead_beyond/models/block/ticket_vendor.json @@ -1,9 +1,9 @@ { - "credit": "Made with Blockbench", + "credit": "Made with Blockbenchboombaka", "texture_size": [128, 128], "textures": { - "0": "Ticket Vendor", - "particle": "Ticket Vendor" + "0": "lead_beyond:block/ticket_vendor", + "particle": "lead_beyond:block/ticket_vendor" }, "elements": [ { @@ -44,8 +44,8 @@ } }, { - "from": [-0.0001, 0, 0], - "to": [0.2499, 16, 16], + "from": [0.4999, 0, 0], + "to": [0.4999, 16, 16], "faces": { "north": {"uv": [3.5, 6.375, 3.53125, 8.375], "texture": "#0"}, "east": {"uv": [0, 4, 2, 6], "texture": "#0"}, @@ -56,8 +56,8 @@ } }, { - "from": [15.75, 0, 0], - "to": [16, 16, 16], + "from": [15.5, 0, 0], + "to": [15.5, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [15.75, 0, 0]}, "faces": { "north": {"uv": [3, 6.375, 3.03125, 8.375], "texture": "#0"}, @@ -68,5 +68,41 @@ "down": {"uv": [3.40625, 6.375, 3.375, 8.375], "texture": "#0"} } } - ] + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, -45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "rotation": [0, 180, 0], + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, 180, 0] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, -2.75], + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/lead_beyond/models/block/turnstile.json b/src/main/resources/assets/lead_beyond/models/block/turnstile.json index b640f56..2a5fb74 100644 --- a/src/main/resources/assets/lead_beyond/models/block/turnstile.json +++ b/src/main/resources/assets/lead_beyond/models/block/turnstile.json @@ -1,9 +1,9 @@ { - "credit": "Made with Blockbench", + "credit": "Made with Blockbenchboombaka", "texture_size": [64, 64], "textures": { - "0": "Turnstile", - "particle": "Turnstile" + "0": "lead_beyond:block/turnstile", + "particle": "lead_beyond:block/turnstile" }, "elements": [ { @@ -147,5 +147,37 @@ "down": {"uv": [8.125, 8, 7.5, 9], "texture": "#0"} } } - ] + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "translation": [0, 0, -2.5], + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/lead_beyond/models/block/turnstile_open.json b/src/main/resources/assets/lead_beyond/models/block/turnstile_open.json new file mode 100644 index 0000000..488b26b --- /dev/null +++ b/src/main/resources/assets/lead_beyond/models/block/turnstile_open.json @@ -0,0 +1,183 @@ +{ + "credit": "Made with Blockbenchboombaka", + "texture_size": [64, 64], + "textures": { + "0": "lead_beyond:block/turnstile", + "particle": "lead_beyond:block/turnstile" + }, + "elements": [ + { + "from": [12.5, 0, 0], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [4, 6, 4.875, 9], "texture": "#0"}, + "east": {"uv": [0, 0, 4, 3], "texture": "#0"}, + "south": {"uv": [5, 6, 5.875, 9], "texture": "#0"}, + "west": {"uv": [0, 3, 4, 6], "texture": "#0"}, + "up": {"uv": [0.875, 10, 0, 6], "texture": "#0"}, + "down": {"uv": [1.875, 6, 1, 10], "texture": "#0"} + } + }, + { + "from": [12.5, 12, 2], + "to": [16, 14, 15.2], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 2.25]}, + "faces": { + "north": {"uv": [5, 9, 5.875, 9.5], "texture": "#0"}, + "east": {"uv": [6, 6, 9.3125, 6.5], "texture": "#0"}, + "south": {"uv": [9.25, 0, 10.125, 0.5], "texture": "#0"}, + "west": {"uv": [6, 6.5, 9.3125, 7], "texture": "#0"}, + "up": {"uv": [2.875, 9.3125, 2, 6], "texture": "#0"}, + "down": {"uv": [3.875, 6, 3, 9.3125], "texture": "#0"} + } + }, + { + "from": [12.4999, 11.73254, 14.65538], + "to": [16.0001, 13.93254, 15.65538], + "rotation": {"angle": -22.5, "axis": "x", "origin": [14.2503, 12.73254, 15.15538]}, + "faces": { + "north": {"uv": [8.25, 8.75, 9.125, 9.3125], "texture": "#0"}, + "east": {"uv": [9.25, 8.75, 9.5, 9.3125], "texture": "#0"}, + "south": {"uv": [4, 9, 4.875, 9.5625], "texture": "#0"}, + "west": {"uv": [2, 9.5, 2.25, 10.0625], "texture": "#0"}, + "up": {"uv": [10.125, 3.5, 9.25, 3.25], "texture": "#0"}, + "down": {"uv": [10.125, 3.5, 9.25, 3.75], "texture": "#0"} + } + }, + { + "from": [12.4999, 11.30763, -0.29311], + "to": [16.0001, 13.30763, 2.55689], + "rotation": {"angle": -45, "axis": "x", "origin": [14.25, 13.00763, 1.43189]}, + "faces": { + "north": {"uv": [9.25, 0.5, 10.125, 1], "texture": "#0"}, + "east": {"uv": [7.5, 9, 8.1875, 9.5], "texture": "#0"}, + "south": {"uv": [9.25, 1, 10.125, 1.5], "texture": "#0"}, + "west": {"uv": [9.25, 1.5, 9.9375, 2], "texture": "#0"}, + "up": {"uv": [9.125, 8.6875, 8.25, 8], "texture": "#0"}, + "down": {"uv": [9.625, 5, 8.75, 5.6875], "texture": "#0"} + } + }, + { + "from": [-0.0001, 11.30763, -0.29311], + "to": [1.0001, 13.30763, 2.55689], + "rotation": {"angle": -45, "axis": "x", "origin": [1.75, 13.00763, 1.43189]}, + "faces": { + "north": {"uv": [3.25, 9.5, 3.5, 10], "texture": "#0"}, + "east": {"uv": [9.25, 1.5, 9.9375, 2], "texture": "#0"}, + "south": {"uv": [3.5, 9.5, 3.75, 10], "texture": "#0"}, + "west": {"uv": [7.5, 9, 8.1875, 9.5], "texture": "#0"}, + "up": {"uv": [9.5, 4.4375, 9.25, 3.75], "texture": "#0"}, + "down": {"uv": [9.5, 8, 9.25, 8.6875], "texture": "#0"} + } + }, + { + "from": [0, 12, 2], + "to": [1, 14, 15.2], + "rotation": {"angle": 0, "axis": "y", "origin": [-12.5, 2, 2.25]}, + "faces": { + "north": {"uv": [3.75, 9.5, 4, 10], "texture": "#0"}, + "east": {"uv": [6, 6, 9.3125, 6.5], "texture": "#0"}, + "south": {"uv": [9.5, 3.75, 9.75, 4.25], "texture": "#0"}, + "west": {"uv": [6, 6.5, 9.3125, 7], "texture": "#0"}, + "up": {"uv": [6.75, 11.3125, 6.5, 8], "texture": "#0"}, + "down": {"uv": [7, 8, 6.75, 11.3125], "texture": "#0"} + } + }, + { + "from": [-0.0001, 11.73254, 14.65538], + "to": [1.0001, 13.93254, 15.65538], + "rotation": {"angle": -22.5, "axis": "x", "origin": [1.75, 12.73254, 15.15538]}, + "faces": { + "north": {"uv": [2, 9.5, 2.25, 10.0625], "texture": "#0"}, + "east": {"uv": [2, 9.5, 2.25, 10.0625], "texture": "#0"}, + "south": {"uv": [2.75, 9.5, 3, 10.0625], "texture": "#0"}, + "west": {"uv": [2, 9.5, 2.25, 10.0625], "texture": "#0"}, + "up": {"uv": [9.75, 7, 9.5, 6.75], "texture": "#0"}, + "down": {"uv": [9.75, 7, 9.5, 7.25], "texture": "#0"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 12, 16], + "faces": { + "north": {"uv": [7, 8, 7.25, 11], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 3], "texture": "#0"}, + "south": {"uv": [7.25, 8, 7.5, 11], "texture": "#0"}, + "west": {"uv": [4, 3, 8, 6], "texture": "#0"}, + "up": {"uv": [6.25, 12, 6, 8], "texture": "#0"}, + "down": {"uv": [6.5, 8, 6.25, 12], "texture": "#0"} + } + }, + { + "from": [12.875, 5, 9.875], + "to": [13.125, 10, 14.875], + "rotation": {"angle": -22.5, "axis": "y", "origin": [13, 7.5, 9.375]}, + "faces": { + "north": {"uv": [5, 9.5, 5.0625, 10.75], "texture": "#0"}, + "east": {"uv": [8, 1.25, 9.25, 2.5], "texture": "#0"}, + "south": {"uv": [5.25, 9.5, 5.3125, 10.75], "texture": "#0"}, + "west": {"uv": [8, 0, 9.25, 1.25], "texture": "#0"}, + "up": {"uv": [10.75, 4.3125, 9.5, 4.25], "rotation": 270, "texture": "#0"}, + "down": {"uv": [10.75, 6, 9.5, 6.0625], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0.375, 5, 9.875], + "to": [0.625, 10, 14.875], + "rotation": {"angle": 22.5, "axis": "y", "origin": [0.5, 7.5, 9.375]}, + "faces": { + "north": {"uv": [5.75, 9.5, 5.8125, 10.75], "texture": "#0"}, + "east": {"uv": [8, 2.5, 9.25, 3.75], "texture": "#0"}, + "south": {"uv": [5.5, 9.5, 5.5625, 10.75], "texture": "#0"}, + "west": {"uv": [8, 3.75, 9.25, 5], "texture": "#0"}, + "up": {"uv": [10.75, 6.3125, 9.5, 6.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.75, 6.5, 9.5, 6.5625], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [13, 13.8, 2.25], + "to": [15.5, 14.8, 6.25], + "rotation": {"angle": -22.5, "axis": "x", "origin": [14.25, 14.3, 4.25]}, + "faces": { + "north": {"uv": [9.25, 4.5, 9.875, 4.75], "texture": "#0"}, + "east": {"uv": [8.75, 5.75, 9.75, 6], "texture": "#0"}, + "south": {"uv": [9.25, 4.75, 9.875, 5], "texture": "#0"}, + "west": {"uv": [9.25, 3, 10.25, 3.25], "texture": "#0"}, + "up": {"uv": [8.625, 6, 8, 5], "texture": "#0"}, + "down": {"uv": [8.125, 8, 7.5, 9], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "translation": [0, 0, -2.5], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lead_beyond/models/block/yzseat2.json b/src/main/resources/assets/lead_beyond/models/block/yz_seat2.json similarity index 79% rename from src/main/resources/assets/lead_beyond/models/block/yzseat2.json rename to src/main/resources/assets/lead_beyond/models/block/yz_seat2.json index c4fa9ee..6da49af 100644 --- a/src/main/resources/assets/lead_beyond/models/block/yzseat2.json +++ b/src/main/resources/assets/lead_beyond/models/block/yz_seat2.json @@ -1,9 +1,9 @@ { - "credit": "Made with Blockbench", + "credit": "Made with Blockbenchboombaka", "texture_size": [64, 64], "textures": { - "0": "YZSeat2", - "particle": "YZSeat2" + "0": "lead_beyond:block/yz_seat2", + "particle": "lead_beyond:block/yz_seat2" }, "elements": [ { @@ -95,5 +95,37 @@ "down": {"uv": [10.875, 2, 9, 3], "texture": "#0"} } } - ] + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, -1.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/lead_beyond/models/block/yzseat.json b/src/main/resources/assets/lead_beyond/models/block/yzseat.json deleted file mode 100644 index 228abc0..0000000 --- a/src/main/resources/assets/lead_beyond/models/block/yzseat.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [64, 64], - "textures": { - "0": "YZSeat2", - "particle": "YZSeat2" - }, - "elements": [ - { - "from": [2, 0, 9], - "to": [3, 4, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [-11, 0, 0]}, - "faces": { - "north": {"uv": [9, 5, 9.25, 6], "texture": "#0"}, - "east": {"uv": [9, 3, 10, 4], "texture": "#0"}, - "south": {"uv": [9, 6, 9.25, 7], "texture": "#0"}, - "west": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "up": {"uv": [9.25, 8, 9, 7], "texture": "#0"}, - "down": {"uv": [9.25, 8, 9, 9], "texture": "#0"} - } - }, - { - "from": [2, 0, 3], - "to": [3, 4, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [-11, 0, -6]}, - "faces": { - "north": {"uv": [9, 5, 9.25, 6], "texture": "#0"}, - "east": {"uv": [9, 3, 10, 4], "texture": "#0"}, - "south": {"uv": [9, 6, 9.25, 7], "texture": "#0"}, - "west": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "up": {"uv": [9.25, 8, 9, 7], "texture": "#0"}, - "down": {"uv": [9.25, 8, 9, 9], "texture": "#0"} - } - }, - { - "from": [13, 0, 3], - "to": [14, 4, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, -6]}, - "faces": { - "north": {"uv": [9, 5, 9.25, 6], "texture": "#0"}, - "east": {"uv": [9, 3, 10, 4], "texture": "#0"}, - "south": {"uv": [9, 6, 9.25, 7], "texture": "#0"}, - "west": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "up": {"uv": [9.25, 8, 9, 7], "texture": "#0"}, - "down": {"uv": [9.25, 8, 9, 9], "texture": "#0"} - } - }, - { - "from": [13, 0, 9], - "to": [14, 4, 13], - "faces": { - "north": {"uv": [9, 5, 9.25, 6], "texture": "#0"}, - "east": {"uv": [9, 3, 10, 4], "texture": "#0"}, - "south": {"uv": [9, 6, 9.25, 7], "texture": "#0"}, - "west": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "up": {"uv": [9.25, 8, 9, 7], "texture": "#0"}, - "down": {"uv": [9.25, 8, 9, 9], "texture": "#0"} - } - }, - { - "from": [0, 4, 0], - "to": [16, 8, 16], - "faces": { - "north": {"uv": [4, 7.5, 8, 8.5], "texture": "#0"}, - "east": {"uv": [0, 8, 4, 9], "texture": "#0"}, - "south": {"uv": [8, 0, 12, 1], "texture": "#0"}, - "west": {"uv": [8, 1, 12, 2], "texture": "#0"}, - "up": {"uv": [4, 4, 0, 0], "texture": "#0"}, - "down": {"uv": [4, 4, 0, 8], "texture": "#0"} - } - }, - { - "from": [0, 8, 0], - "to": [8, 23, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 4, 1]}, - "faces": { - "north": {"uv": [4, 0, 6, 3.75], "texture": "#0"}, - "east": {"uv": [4, 8.5, 5, 12.25], "texture": "#0"}, - "south": {"uv": [4, 3.75, 6, 7.5], "texture": "#0"}, - "west": {"uv": [5, 8.5, 6, 12.25], "texture": "#0"}, - "up": {"uv": [8, 9.5, 6, 8.5], "texture": "#0"}, - "down": {"uv": [2, 9, 0, 10], "texture": "#0"} - } - }, - { - "from": [8.5, 8, 0], - "to": [16, 23, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 4, 1]}, - "faces": { - "north": {"uv": [6, 0, 7.875, 3.75], "texture": "#0"}, - "east": {"uv": [8, 2, 9, 5.75], "texture": "#0"}, - "south": {"uv": [6, 3.75, 7.875, 7.5], "texture": "#0"}, - "west": {"uv": [8, 5.75, 9, 9.5], "texture": "#0"}, - "up": {"uv": [3.875, 10, 2, 9], "texture": "#0"}, - "down": {"uv": [10.875, 2, 9, 3], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/lead_beyond/models/item/rz_seat.json b/src/main/resources/assets/lead_beyond/models/item/rz_seat.json new file mode 100644 index 0000000..ae7d8b7 --- /dev/null +++ b/src/main/resources/assets/lead_beyond/models/item/rz_seat.json @@ -0,0 +1,3 @@ +{ + "parent": "lead_beyond:block/rz_seat" +} \ No newline at end of file diff --git a/src/main/resources/assets/lead_beyond/models/item/yz_seat2.json b/src/main/resources/assets/lead_beyond/models/item/yz_seat2.json new file mode 100644 index 0000000..b88ac08 --- /dev/null +++ b/src/main/resources/assets/lead_beyond/models/item/yz_seat2.json @@ -0,0 +1,3 @@ +{ + "parent": "lead_beyond:block/yz_seat2" +} \ No newline at end of file diff --git a/src/main/resources/assets/lead_beyond/textures/block/rzseat.png b/src/main/resources/assets/lead_beyond/textures/block/rz_seat.png similarity index 100% rename from src/main/resources/assets/lead_beyond/textures/block/rzseat.png rename to src/main/resources/assets/lead_beyond/textures/block/rz_seat.png diff --git a/src/main/resources/assets/lead_beyond/textures/block/ticketvendor.png b/src/main/resources/assets/lead_beyond/textures/block/ticket_vendor.png similarity index 100% rename from src/main/resources/assets/lead_beyond/textures/block/ticketvendor.png rename to src/main/resources/assets/lead_beyond/textures/block/ticket_vendor.png diff --git a/src/main/resources/assets/lead_beyond/textures/block/yzseat.png b/src/main/resources/assets/lead_beyond/textures/block/yz_seat.png similarity index 100% rename from src/main/resources/assets/lead_beyond/textures/block/yzseat.png rename to src/main/resources/assets/lead_beyond/textures/block/yz_seat.png diff --git a/src/main/resources/assets/lead_beyond/textures/block/yzseat2.png b/src/main/resources/assets/lead_beyond/textures/block/yz_seat2.png similarity index 100% rename from src/main/resources/assets/lead_beyond/textures/block/yzseat2.png rename to src/main/resources/assets/lead_beyond/textures/block/yz_seat2.png