diff --git a/src/main/java/ru/betterend/blocks/BlockProperties.java b/src/main/java/ru/betterend/blocks/BlockProperties.java index 1942abaa..72f8dab4 100644 --- a/src/main/java/ru/betterend/blocks/BlockProperties.java +++ b/src/main/java/ru/betterend/blocks/BlockProperties.java @@ -1,10 +1,14 @@ package ru.betterend.blocks; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.EnumProperty; import net.minecraft.util.StringIdentifiable; public class BlockProperties { public static final EnumProperty TRIPLE_SHAPE = EnumProperty.of("shape", TripleShape.class); + public final static EnumProperty STATE = EnumProperty.of("state", State.class); + public static final BooleanProperty HAS_ITEM = BooleanProperty.of("has_item"); + public static final BooleanProperty ACTIVATED = BooleanProperty.of("active"); public static enum TripleShape implements StringIdentifiable { TOP("top"), @@ -27,4 +31,16 @@ public class BlockProperties { return name; } } + + public static enum State implements StringIdentifiable { + DEFAULT, + BOTTOM, + TOP, + PILLAR; + + @Override + public String asString() { + return this.name().toLowerCase(); + } + } } diff --git a/src/main/java/ru/betterend/blocks/EternalPedestal.java b/src/main/java/ru/betterend/blocks/EternalPedestal.java index 4c80074d..4fab80f9 100644 --- a/src/main/java/ru/betterend/blocks/EternalPedestal.java +++ b/src/main/java/ru/betterend/blocks/EternalPedestal.java @@ -5,67 +5,67 @@ import java.util.List; import com.google.common.collect.Lists; import net.minecraft.block.Block; -import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; +import net.minecraft.loot.context.LootContextParameters; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; import net.minecraft.world.explosion.Explosion; -import ru.betterend.blocks.basis.BlockSlab; -import ru.betterend.blocks.entities.EternalPedestalBlockEntity; + +import ru.betterend.blocks.basis.BlockPedestal; +import ru.betterend.blocks.entities.PedestalBlockEntity; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; -public class EternalPedestal extends BlockSlab implements BlockEntityProvider { - public static final BooleanProperty ACTIVATED = BooleanProperty.of("active"); - public static final BooleanProperty HAS_ITEM = BooleanProperty.of("has_item"); +public class EternalPedestal extends BlockPedestal { + public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVATED; public EternalPedestal() { super(EndBlocks.FLAVOLITE_RUNED_ETERNAL); - this.setDefaultState(stateManager.getDefaultState().with(ACTIVATED, false).with(HAS_ITEM, false)); + this.setDefaultState(this.getDefaultState().with(ACTIVATED, false)); } @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - if (world.isClient) return ActionResult.CONSUME; - BlockEntity blockEntity = world.getBlockEntity(pos); - if (blockEntity instanceof EternalPedestalBlockEntity && state.isOf(this)) { - EternalPedestalBlockEntity pedestal = (EternalPedestalBlockEntity) blockEntity; - if (pedestal.isEmpty()) { - ItemStack itemStack = player.getStackInHand(hand); - if (itemStack.isEmpty()) return ActionResult.CONSUME; - if (itemStack.getItem().equals(EndItems.ETERNAL_CRYSTAL)) { - world.setBlockState(pos, state.with(ACTIVATED, true).with(HAS_ITEM, true)); + ActionResult result = super.onUse(state, world, pos, player, hand, hit); + if (result.equals(ActionResult.SUCCESS)) { + BlockEntity blockEntity = world.getBlockEntity(pos); + if (blockEntity instanceof PedestalBlockEntity) { + PedestalBlockEntity pedestal = (PedestalBlockEntity) blockEntity; + BlockState updatedState = world.getBlockState(pos); + if (pedestal.isEmpty() && updatedState.get(ACTIVATED)) { + world.setBlockState(pos, updatedState.with(ACTIVATED, false)); } else { - world.setBlockState(pos, state.with(HAS_ITEM, true)); - } - pedestal.setStack(0, itemStack.split(1)); - return ActionResult.SUCCESS; - } else { - ItemStack itemStack = pedestal.getStack(0); - if (player.giveItemStack(itemStack)) { - if (state.get(ACTIVATED)) { - world.setBlockState(pos, state.with(ACTIVATED, false).with(HAS_ITEM, false)); - } else { - world.setBlockState(pos, state.with(HAS_ITEM, false)); + ItemStack itemStack = pedestal.getStack(0); + if (itemStack.getItem() == EndItems.ETERNAL_CRYSTAL) { + world.setBlockState(pos, updatedState.with(ACTIVATED, true)); } - pedestal.removeStack(0); - return ActionResult.SUCCESS; } - return ActionResult.FAIL; } } - return ActionResult.PASS; + return result; + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { + BlockState updated = super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); + BlockProperties.State updatedState = state.get(BlockProperties.STATE); + if (updatedState.equals(BlockProperties.State.BOTTOM) || updatedState.equals(BlockProperties.State.PILLAR)) { + return updated.with(ACTIVATED, false); + } + return updated; } @Override @@ -85,17 +85,26 @@ public class EternalPedestal extends BlockSlab implements BlockEntityProvider { @Override public List getDroppedStacks(BlockState state, LootContext.Builder builder) { - return Lists.newArrayList(); + if (state.isOf(this)) { + BlockProperties.State currentState = state.get(BlockProperties.STATE); + if (currentState.equals(BlockProperties.State.BOTTOM) || currentState.equals(BlockProperties.State.PILLAR)) { + return Lists.newArrayList(); + } + } + List drop = Lists.newArrayList(); + BlockEntity blockEntity = builder.getNullable(LootContextParameters.BLOCK_ENTITY); + if (blockEntity != null && blockEntity instanceof PedestalBlockEntity) { + PedestalBlockEntity pedestal = (PedestalBlockEntity) blockEntity; + if (!pedestal.isEmpty()) { + drop.add(pedestal.getStack(0)); + } + } + return drop; } @Override protected void appendProperties(StateManager.Builder stateManager) { super.appendProperties(stateManager); - stateManager.add(ACTIVATED, HAS_ITEM); - } - - @Override - public BlockEntity createBlockEntity(BlockView world) { - return new EternalPedestalBlockEntity(); + stateManager.add(ACTIVATED); } } diff --git a/src/main/java/ru/betterend/blocks/RunedFlavolite.java b/src/main/java/ru/betterend/blocks/RunedFlavolite.java index 4cd2b9b4..dbefb13f 100644 --- a/src/main/java/ru/betterend/blocks/RunedFlavolite.java +++ b/src/main/java/ru/betterend/blocks/RunedFlavolite.java @@ -15,7 +15,7 @@ import ru.betterend.util.BlocksHelper; import ru.betterend.util.PortalFrameHelper; public class RunedFlavolite extends BlockBase { - public static final BooleanProperty ACTIVATED = BooleanProperty.of("active"); + public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVATED; public RunedFlavolite() { super(FabricBlockSettings.copyOf(EndBlocks.FLAVOLITE.polished).resistance(Blocks.OBSIDIAN.getBlastResistance()).luminance(state -> { diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java b/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java new file mode 100644 index 00000000..dd22f17b --- /dev/null +++ b/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java @@ -0,0 +1,235 @@ +package ru.betterend.blocks.basis; + +import java.util.List; + +import org.jetbrains.annotations.Nullable; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockEntityProvider; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; +import net.minecraft.loot.context.LootContextParameters; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.EnumProperty; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +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 net.minecraft.world.World; +import net.minecraft.world.WorldAccess; +import ru.betterend.blocks.BlockProperties; +import ru.betterend.blocks.BlockProperties.State; +import ru.betterend.blocks.entities.PedestalBlockEntity; +import ru.betterend.util.BlocksHelper; + +public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvider { + public final static EnumProperty STATE = BlockProperties.STATE; + public static final BooleanProperty HAS_ITEM = BlockProperties.HAS_ITEM; + + private static final VoxelShape SHAPE_DEFAULT = VoxelShapes.cuboid(0, 0, 0, 16, 14, 16); + private static final VoxelShape SHAPE_PILLAR = VoxelShapes.cuboid(3, 0, 3, 13, 16, 13); + private static final VoxelShape SHAPE_BOTTOM; + private static final VoxelShape SHAPE_TOP; + + public BlockPedestal(Block parent) { + super(FabricBlockSettings.copyOf(parent)); + this.setDefaultState(stateManager.getDefaultState().with(STATE, State.DEFAULT).with(HAS_ITEM, false)); + } + + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (world.isClient || !state.isOf(this)) return ActionResult.CONSUME; + State currentState = state.get(STATE); + if (currentState.equals(State.BOTTOM) || currentState.equals(State.PILLAR)) { + return ActionResult.PASS; + } + BlockEntity blockEntity = world.getBlockEntity(pos); + if (blockEntity instanceof PedestalBlockEntity) { + PedestalBlockEntity pedestal = (PedestalBlockEntity) blockEntity; + if (pedestal.isEmpty()) { + ItemStack itemStack = player.getStackInHand(hand); + if (itemStack.isEmpty()) return ActionResult.CONSUME; + world.setBlockState(pos, state.with(HAS_ITEM, true)); + pedestal.setStack(0, itemStack.split(1)); + return ActionResult.SUCCESS; + } else { + ItemStack itemStack = pedestal.getStack(0); + if (player.giveItemStack(itemStack)) { + world.setBlockState(pos, state.with(HAS_ITEM, false)); + pedestal.removeStack(0); + return ActionResult.SUCCESS; + } + return ActionResult.FAIL; + } + } + return ActionResult.PASS; + } + + @Override + @Nullable + public BlockState getPlacementState(ItemPlacementContext context) { + BlockPos pos = context.getBlockPos(); + Block down = context.getWorld().getBlockState(pos.down()).getBlock(); + Block up = context.getWorld().getBlockState(pos.up()).getBlock(); + if (down instanceof BlockPedestal && up instanceof BlockPedestal) { + return this.getDefaultState().with(STATE, State.PILLAR); + } else if (down instanceof BlockPedestal) { + return this.getDefaultState().with(STATE, State.TOP); + } else if (up instanceof BlockPedestal) { + return this.getDefaultState().with(STATE, State.BOTTOM); + } + return this.getDefaultState(); + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { + if (newState.getBlock() instanceof BlockPedestal) { + if (direction.equals(Direction.DOWN)) { + if (world.getBlockState(pos.up()).getBlock() instanceof BlockPedestal) { + this.moveStoredStack(world, state, pos); + return state.with(STATE, State.PILLAR); + } + return state.with(STATE, State.TOP); + } else if (direction.equals(Direction.UP)) { + this.moveStoredStack(world, state, pos); + if (world.getBlockState(pos.down()).getBlock() instanceof BlockPedestal) { + return state.with(STATE, State.PILLAR); + } + return state.with(STATE, State.BOTTOM); + } + } else { + if (direction.equals(Direction.DOWN)) { + if (world.getBlockState(pos.up()).getBlock() instanceof BlockPedestal) { + this.moveStoredStack(world, state, pos); + return state.with(STATE, State.BOTTOM); + } + return state.with(STATE, State.DEFAULT); + } else if (direction.equals(Direction.UP)) { + if (world.getBlockState(pos.down()).getBlock() instanceof BlockPedestal) { + return state.with(STATE, State.TOP); + } + return state.with(STATE, State.DEFAULT); + } + } + return super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + List drop = super.getDroppedStacks(state, builder); + if (state.isOf(this)) { + State currentState = state.get(STATE); + if (currentState.equals(State.BOTTOM) || currentState.equals(State.PILLAR)) { + return drop; + } else { + BlockEntity blockEntity = builder.getNullable(LootContextParameters.BLOCK_ENTITY); + if (blockEntity != null && blockEntity instanceof PedestalBlockEntity) { + PedestalBlockEntity pedestal = (PedestalBlockEntity) blockEntity; + if (!pedestal.isEmpty()) { + drop.add(pedestal.getStack(0)); + } + } + } + } + return drop; + } + + private void moveStoredStack(WorldAccess world, BlockState state, BlockPos pos) { + ItemStack stack = ItemStack.EMPTY; + BlockEntity blockEntity = world.getBlockEntity(pos); + if (blockEntity instanceof PedestalBlockEntity && state.isOf(this)) { + PedestalBlockEntity pedestal = (PedestalBlockEntity) blockEntity; + stack = pedestal.getStack(0); + pedestal.clear(); + BlocksHelper.setWithoutUpdate(world, pos, state.with(HAS_ITEM, false)); + } + if (!stack.isEmpty()) { + BlockPos upPos = pos.up(); + this.moveStoredStack(world, stack, world.getBlockState(upPos), upPos); + } + } + + private void moveStoredStack(WorldAccess world, ItemStack stack, BlockState state, BlockPos pos) { + BlockEntity blockEntity = world.getBlockEntity(pos); + if (state.get(STATE).equals(State.PILLAR)) { + BlockPos upPos = pos.up(); + this.moveStoredStack(world, stack, world.getBlockState(upPos), upPos); + } else if (blockEntity instanceof PedestalBlockEntity) { + PedestalBlockEntity pedestal = (PedestalBlockEntity) blockEntity; + if (pedestal.isEmpty()) { + pedestal.setStack(0, stack); + BlocksHelper.setWithoutUpdate(world, pos, state.with(HAS_ITEM, true)); + } else { + this.dropStoredStack(world, stack, pos); + } + } else { + this.dropStoredStack(world, stack, pos); + } + } + + private void dropStoredStack(WorldAccess world, ItemStack stack, BlockPos pos) { + Block.dropStack((World) world, this.getDropPos(world, pos), stack); + } + + private BlockPos getDropPos(WorldAccess world, BlockPos pos) { + BlockPos dropPos; + for(int i = 2; i < Direction.values().length; i++) { + dropPos = pos.offset(Direction.byId(i)); + if (world.getBlockState(dropPos).isAir()) { + return dropPos.toImmutable(); + } + } + return this.getDropPos(world, pos.up()); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + if (state.isOf(this)) { + switch(state.get(STATE)) { + case BOTTOM: { + return SHAPE_BOTTOM; + } + case TOP: { + return SHAPE_TOP; + } + case PILLAR: { + return SHAPE_PILLAR; + } + default: { + return SHAPE_DEFAULT; + } + } + } + return super.getOutlineShape(state, world, pos, context); + } + + @Override + protected void appendProperties(StateManager.Builder stateManager) { + stateManager.add(STATE, HAS_ITEM); + } + + @Override + public BlockEntity createBlockEntity(BlockView world) { + return new PedestalBlockEntity(); + } + + static { + VoxelShape basin = VoxelShapes.cuboid(0, 0, 0, 16, 4, 16); + VoxelShape top = VoxelShapes.cuboid(1, 12, 1, 15, 14, 15); + VoxelShape pillar = VoxelShapes.cuboid(3, 0, 3, 13, 14, 13); + SHAPE_BOTTOM = VoxelShapes.union(basin, SHAPE_PILLAR); + SHAPE_TOP = VoxelShapes.union(top, pillar); + } +} diff --git a/src/main/java/ru/betterend/blocks/entities/EternalPedestalBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java similarity index 92% rename from src/main/java/ru/betterend/blocks/entities/EternalPedestalBlockEntity.java rename to src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java index 4561de95..7fa28c09 100644 --- a/src/main/java/ru/betterend/blocks/entities/EternalPedestalBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java @@ -10,12 +10,12 @@ import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.util.Tickable; import ru.betterend.registry.EndBlockEntities; -public class EternalPedestalBlockEntity extends BlockEntity implements Inventory, Tickable { +public class PedestalBlockEntity extends BlockEntity implements Inventory, Tickable { private ItemStack activeItem = ItemStack.EMPTY; private int age; - public EternalPedestalBlockEntity() { + public PedestalBlockEntity() { super(EndBlockEntities.ETERNAL_PEDESTAL); } @@ -92,7 +92,7 @@ public class EternalPedestalBlockEntity extends BlockEntity implements Inventory public void tick() { if (!isEmpty()) { this.age++; - if (age > 10000) { + if (age > 314) { this.age = 0; } } diff --git a/src/main/java/ru/betterend/blocks/entities/render/EternalPedestalItemRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java similarity index 56% rename from src/main/java/ru/betterend/blocks/entities/render/EternalPedestalItemRenderer.java rename to src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java index bfb64544..8ba103f4 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/EternalPedestalItemRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java @@ -2,8 +2,8 @@ package ru.betterend.blocks.entities.render; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; + import net.minecraft.block.BlockState; -import net.minecraft.block.enums.SlabType; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; @@ -17,44 +17,42 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; + import ru.betterend.blocks.EternalPedestal; -import ru.betterend.blocks.entities.EternalPedestalBlockEntity; +import ru.betterend.blocks.entities.PedestalBlockEntity; import ru.betterend.client.render.BeamRenderer; +import ru.betterend.registry.EndBlocks; @Environment(EnvType.CLIENT) -public class EternalPedestalItemRenderer extends BlockEntityRenderer { +public class PedestalItemRenderer extends BlockEntityRenderer { private static final Identifier BEAM_TEXTURE = new Identifier("textures/entity/end_gateway_beam.png"); - public EternalPedestalItemRenderer(BlockEntityRenderDispatcher dispatcher) { + public PedestalItemRenderer(BlockEntityRenderDispatcher dispatcher) { super(dispatcher); } @Override - public void render(EternalPedestalBlockEntity entity, float tickDelta, MatrixStack matrices, + public void render(PedestalBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { - if (entity.isEmpty()) return; + if (blockEntity.isEmpty()) return; - BlockState state = entity.getWorld().getBlockState(entity.getPos()); - SlabType type = state.get(EternalPedestal.TYPE); - - ItemStack activeItem = entity.getStack(0); + BlockState state = blockEntity.getWorld().getBlockState(blockEntity.getPos()); + ItemStack activeItem = blockEntity.getStack(0); matrices.push(); - if (type.equals(SlabType.DOUBLE)) { - matrices.translate(0.5, 1.5, 0.5); - } else { - matrices.translate(0.5, 1.0, 0.5); - } - float altitude = MathHelper.sin((entity.getAge() + tickDelta) / 10.0F) * 0.1F; - float rotation = (entity.getAge() + tickDelta) / 25.0F + 6.0F; + matrices.translate(0.5, 1.1, 0.5); + float rotation = (blockEntity.getAge() + tickDelta) / 25.0F + 6.0F; + float altitude = MathHelper.sin((blockEntity.getAge() + tickDelta) / 10.0F) * 0.1F; matrices.translate(0.0D, altitude, 0.0D); matrices.multiply(Vector3f.POSITIVE_Y.getRadialQuaternion(rotation)); MinecraftClient minecraft = MinecraftClient.getInstance(); minecraft.getItemRenderer().renderItem(activeItem, ModelTransformation.Mode.GROUND, light, overlay, matrices, vertexConsumers); - float[] colors = DyeColor.MAGENTA.getColorComponents(); - int y = entity.getPos().getY(); - VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getBeaconBeam(BEAM_TEXTURE, true)); - BeamRenderer.renderLightBeam(matrices, vertexConsumer, tickDelta, -y, 1024 - y, colors, 0.25F, 0.15F, 0.2F); + if (state.isOf(EndBlocks.ETERNAL_PEDESTAL) && state.get(EternalPedestal.ACTIVATED)) { + float[] colors = DyeColor.MAGENTA.getColorComponents(); + int y = blockEntity.getPos().getY(); + VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getBeaconBeam(BEAM_TEXTURE, true)); + BeamRenderer.renderLightBeam(matrices, vertexConsumer, tickDelta, -y, 1024 - y, colors, 0.25F, 0.15F, 0.2F); + } matrices.pop(); } } diff --git a/src/main/java/ru/betterend/item/EternalCrystal.java b/src/main/java/ru/betterend/item/EternalCrystal.java index 39c25497..3fd76a8f 100644 --- a/src/main/java/ru/betterend/item/EternalCrystal.java +++ b/src/main/java/ru/betterend/item/EternalCrystal.java @@ -7,6 +7,7 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.util.ActionResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import ru.betterend.blocks.RunedFlavolite; import ru.betterend.registry.EndItems; import ru.betterend.util.PortalFrameHelper; @@ -19,13 +20,12 @@ public class EternalCrystal extends Item { public ActionResult useOnBlock(ItemUsageContext context) { World world = context.getWorld(); + if (world.isClient) return ActionResult.CONSUME; BlockPos usedPos = context.getBlockPos(); BlockState usedBlock = world.getBlockState(usedPos); - if (world instanceof ServerWorld) { - if (usedBlock.getBlock() instanceof RunedFlavolite && !usedBlock.get(RunedFlavolite.ACTIVATED)) { - if (PortalFrameHelper.checkPortalFrame((ServerWorld) world, usedPos, usedBlock.getBlock())) { - return ActionResult.SUCCESS; - } + if (usedBlock.getBlock() instanceof RunedFlavolite && !usedBlock.get(RunedFlavolite.ACTIVATED)) { + if (PortalFrameHelper.checkPortalFrame((ServerWorld) world, usedPos, usedBlock.getBlock())) { + return ActionResult.SUCCESS; } } return ActionResult.PASS; diff --git a/src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java b/src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java index 270ced9f..540f8128 100644 --- a/src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java @@ -16,7 +16,7 @@ import net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.util.thread.ThreadExecutor; import ru.betterend.blocks.entities.ESignBlockEntity; -import ru.betterend.blocks.entities.EternalPedestalBlockEntity; +import ru.betterend.blocks.entities.PedestalBlockEntity; import ru.betterend.client.gui.BlockSignEditScreen; @Mixin(ClientPlayNetworkHandler.class) @@ -46,7 +46,7 @@ public class ClientPlayNetworkHandlerMixin (ThreadExecutor) client); BlockPos blockPos = packet.getPos(); BlockEntity blockEntity = this.client.world.getBlockEntity(blockPos); - if (blockEntity instanceof ESignBlockEntity || blockEntity instanceof EternalPedestalBlockEntity) { + if (blockEntity instanceof ESignBlockEntity || blockEntity instanceof PedestalBlockEntity) { blockEntity.fromTag(this.client.world.getBlockState(blockPos), packet.getCompoundTag()); info.cancel(); } diff --git a/src/main/java/ru/betterend/registry/EndBlockEntities.java b/src/main/java/ru/betterend/registry/EndBlockEntities.java index 27335d6d..f19dd40a 100644 --- a/src/main/java/ru/betterend/registry/EndBlockEntities.java +++ b/src/main/java/ru/betterend/registry/EndBlockEntities.java @@ -18,13 +18,13 @@ import ru.betterend.blocks.entities.EBarrelBlockEntity; import ru.betterend.blocks.entities.EChestBlockEntity; import ru.betterend.blocks.entities.ESignBlockEntity; import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; -import ru.betterend.blocks.entities.EternalPedestalBlockEntity; +import ru.betterend.blocks.entities.PedestalBlockEntity; public class EndBlockEntities { public final static BlockEntityType END_STONE_SMELTER = registerBlockEntity(EndStoneSmelter.ID, BlockEntityType.Builder.create(EndStoneSmelterBlockEntity::new, EndBlocks.END_STONE_SMELTER)); - public final static BlockEntityType ETERNAL_PEDESTAL = registerBlockEntity("eternal_pedestal", - BlockEntityType.Builder.create(EternalPedestalBlockEntity::new, EndBlocks.ETERNAL_PEDESTAL)); + public final static BlockEntityType ETERNAL_PEDESTAL = registerBlockEntity("eternal_pedestal", + BlockEntityType.Builder.create(PedestalBlockEntity::new, EndBlocks.ETERNAL_PEDESTAL)); public static final BlockEntityType CHEST = registerBlockEntity("chest", BlockEntityType.Builder.create(EChestBlockEntity::new, getChests())); public static final BlockEntityType BARREL = registerBlockEntity("barrel", diff --git a/src/main/java/ru/betterend/registry/EndBlockEntityRenders.java b/src/main/java/ru/betterend/registry/EndBlockEntityRenders.java index e27a018e..5d9277e6 100644 --- a/src/main/java/ru/betterend/registry/EndBlockEntityRenders.java +++ b/src/main/java/ru/betterend/registry/EndBlockEntityRenders.java @@ -5,13 +5,13 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry; import ru.betterend.blocks.entities.render.EChestBlockEntityRenderer; import ru.betterend.blocks.entities.render.ESignBlockEntityRenderer; -import ru.betterend.blocks.entities.render.EternalPedestalItemRenderer; +import ru.betterend.blocks.entities.render.PedestalItemRenderer; @Environment(EnvType.CLIENT) public class EndBlockEntityRenders { public static void register() { BlockEntityRendererRegistry.INSTANCE.register(EndBlockEntities.CHEST, EChestBlockEntityRenderer::new); BlockEntityRendererRegistry.INSTANCE.register(EndBlockEntities.SIGN, ESignBlockEntityRenderer::new); - BlockEntityRendererRegistry.INSTANCE.register(EndBlockEntities.ETERNAL_PEDESTAL, EternalPedestalItemRenderer::new); + BlockEntityRendererRegistry.INSTANCE.register(EndBlockEntities.ETERNAL_PEDESTAL, PedestalItemRenderer::new); } } diff --git a/src/main/resources/assets/betterend/blockstates/eternal_pedestal.json b/src/main/resources/assets/betterend/blockstates/eternal_pedestal.json index bc171582..d011f939 100644 --- a/src/main/resources/assets/betterend/blockstates/eternal_pedestal.json +++ b/src/main/resources/assets/betterend/blockstates/eternal_pedestal.json @@ -1,197 +1,105 @@ { "variants": { - "type=bottom,active=false": [ + "state=default,active=false": [ { - "model": "betterend:block/eternal_pedestal_1", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_1" }, { - "model": "betterend:block/eternal_pedestal_2", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_2" }, { - "model": "betterend:block/eternal_pedestal_3", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_3" }, { - "model": "betterend:block/eternal_pedestal_4", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_4" }, { - "model": "betterend:block/eternal_pedestal_5", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_5" }, { - "model": "betterend:block/eternal_pedestal_6", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_6" }, { - "model": "betterend:block/eternal_pedestal_7", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_7" } ], - "type=bottom,active=true": [ + "state=default,active=true": [ { - "model": "betterend:block/eternal_pedestal_active_1", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_active_1" }, { - "model": "betterend:block/eternal_pedestal_active_2", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_active_2" }, { - "model": "betterend:block/eternal_pedestal_active_3", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_active_3" }, { - "model": "betterend:block/eternal_pedestal_active_4", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_active_4" }, { - "model": "betterend:block/eternal_pedestal_active_5", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_active_5" }, { - "model": "betterend:block/eternal_pedestal_active_6", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_active_6" }, { - "model": "betterend:block/eternal_pedestal_active_7", - "uvlock": true + "model": "betterend:block/eternal_pedestal_default_active_7" } ], - "type=top,active=false": [ + "state=top,active=false": [ { - "model": "betterend:block/eternal_pedestal_1", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_1" }, { - "model": "betterend:block/eternal_pedestal_2", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_2" }, { - "model": "betterend:block/eternal_pedestal_3", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_3" }, { - "model": "betterend:block/eternal_pedestal_4", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_4" }, { - "model": "betterend:block/eternal_pedestal_5", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_5" }, { - "model": "betterend:block/eternal_pedestal_6", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_6" }, { - "model": "betterend:block/eternal_pedestal_7", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_7" } ], - "type=top,active=true": [ + "state=top,active=true": [ { - "model": "betterend:block/eternal_pedestal_active_1", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_active_1" }, { - "model": "betterend:block/eternal_pedestal_active_2", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_active_2" }, { - "model": "betterend:block/eternal_pedestal_active_3", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_active_3" }, { - "model": "betterend:block/eternal_pedestal_active_4", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_active_4" }, { - "model": "betterend:block/eternal_pedestal_active_5", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_active_5" }, { - "model": "betterend:block/eternal_pedestal_active_6", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_active_6" }, { - "model": "betterend:block/eternal_pedestal_active_7", - "uvlock": true, - "x": 180 + "model": "betterend:block/eternal_pedestal_top_active_7" } ], - "type=double,active=false": [ + "state=bottom": [ { - "model": "betterend:block/eternal_pedestal_double_1", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_2", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_3", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_4", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_5", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_6", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_7", - "uvlock": true + "model": "betterend:block/eternal_pedestal_bottom" } ], - "type=double,active=true": [ + "state=pillar": [ { - "model": "betterend:block/eternal_pedestal_double_active_1", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_active_2", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_active_3", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_active_4", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_active_5", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_active_6", - "uvlock": true - }, - { - "model": "betterend:block/eternal_pedestal_double_active_7", - "uvlock": true + "model": "betterend:block/eternal_pedestal_pillar" } ] } diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_1.json deleted file mode 100644 index a895bd4d..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_1.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_1", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_2.json deleted file mode 100644 index 21b46551..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_2.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_2", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_3.json deleted file mode 100644 index 54d39f0f..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_3.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_3", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_4.json deleted file mode 100644 index 29d0e568..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_4.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_4", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_5.json deleted file mode 100644 index 16a66df9..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_5.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_5", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_6.json deleted file mode 100644 index 6acb66e8..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_6.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_6", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_7.json deleted file mode 100644 index d6629082..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_7.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_7", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_1.json deleted file mode 100644 index d6a8f909..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_1.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_active_1", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_active_1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_2.json deleted file mode 100644 index e2970f74..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_2.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_active_2", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_active_2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_3.json deleted file mode 100644 index 9509663f..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_3.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_active_3", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_active_3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_4.json deleted file mode 100644 index e3f3960f..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_4.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_active_4", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_active_4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_5.json deleted file mode 100644 index 2262eb59..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_5.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_active_5", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_active_5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_6.json deleted file mode 100644 index 319bd7e6..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_6.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_active_6", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_active_6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_7.json deleted file mode 100644 index eb68c202..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_active_7.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "top": "betterend:block/flavolite_runed_active_7", - "side": "betterend:block/flavolite_tiles", - "bottom": "betterend:block/flavolite_runed_active_7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_bottom.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_bottom.json new file mode 100644 index 00000000..2dbf9150 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_bottom", + "textures": { + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_1.json new file mode 100644 index 00000000..d399728b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_1.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_1", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_2.json new file mode 100644 index 00000000..65ffdfba --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_2.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_2", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_3.json new file mode 100644 index 00000000..7afab1b7 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_3.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_3", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_4.json new file mode 100644 index 00000000..be18bb5f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_4.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_4", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_5.json new file mode 100644 index 00000000..e8395c7d --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_5.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_5", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_6.json new file mode 100644 index 00000000..b26f8e22 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_6.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_6", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_7.json new file mode 100644 index 00000000..fd28499f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_7.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_7", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_1.json new file mode 100644 index 00000000..1f6a7b7c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_1.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_1", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_2.json new file mode 100644 index 00000000..22129058 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_2.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_2", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_3.json new file mode 100644 index 00000000..c500f6d1 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_3.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_3", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_4.json new file mode 100644 index 00000000..2ef01019 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_4.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_4", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_5.json new file mode 100644 index 00000000..890e3d9e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_5.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_5", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_6.json new file mode 100644 index 00000000..94547e59 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_6.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_6", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_7.json new file mode 100644 index 00000000..47eaba09 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_7.json @@ -0,0 +1,9 @@ +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_7", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_1.json deleted file mode 100644 index 025e1de4..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_1", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_2.json deleted file mode 100644 index 6b8fee63..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_2", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_3.json deleted file mode 100644 index f5e1d6b1..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_3", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_4.json deleted file mode 100644 index 800c587f..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_4", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_5.json deleted file mode 100644 index d81517ff..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_5.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_5", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_6.json deleted file mode 100644 index d2bc09bf..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_6.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_6", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_7.json deleted file mode 100644 index 0633cd17..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_7.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_7", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_1.json deleted file mode 100644 index ca4b4cea..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_active_1", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_2.json deleted file mode 100644 index ad6a0b20..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_active_2", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_3.json deleted file mode 100644 index 5409bee4..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_active_3", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_4.json deleted file mode 100644 index cc270bc6..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_active_4", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_5.json deleted file mode 100644 index 7e14b1c6..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_5.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_active_5", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_6.json deleted file mode 100644 index 368ead0b..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_6.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_active_6", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_7.json deleted file mode 100644 index c4a23980..00000000 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_double_active_7.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/flavolite_runed_active_7", - "side": "betterend:block/flavolite_pillar_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_pillar.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_pillar.json new file mode 100644 index 00000000..3ae1661f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_pillar.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/pedestal_pillar", + "textures": { + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_1.json new file mode 100644 index 00000000..909cb57b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_1.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_1", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_2.json new file mode 100644 index 00000000..0eed1d7f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_2.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_2", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_3.json new file mode 100644 index 00000000..85caab43 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_3.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_3", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_4.json new file mode 100644 index 00000000..251de68a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_4.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_4", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_5.json new file mode 100644 index 00000000..30f3b183 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_5.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_5", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_6.json new file mode 100644 index 00000000..18c3ce2d --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_6.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_6", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_7.json new file mode 100644 index 00000000..66bcc62c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_7.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_7", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_1.json new file mode 100644 index 00000000..ca28b3eb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_1.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_1", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_2.json new file mode 100644 index 00000000..06657e93 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_2.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_2", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_3.json new file mode 100644 index 00000000..30363dce --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_3.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_3", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_4.json new file mode 100644 index 00000000..30be7c14 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_4.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_4", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_5.json new file mode 100644 index 00000000..5ac44a9b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_5.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_5", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_6.json new file mode 100644 index 00000000..92fb6770 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_6.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_6", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_7.json new file mode 100644 index 00000000..d0c9dfc2 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_7.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_7", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pedestal_bottom.json b/src/main/resources/assets/betterend/models/block/pedestal_bottom.json new file mode 100644 index 00000000..3183845a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/pedestal_bottom.json @@ -0,0 +1,44 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#base" + }, + "elements": [ + { + "__comment": "basin_1", + "from": [ 0, 0, 0 ], + "to": [ 16, 3, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#base" }, + "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#base" }, + "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#base" }, + "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#base" } + } + }, + { + "__comment": "basin_2", + "from": [ 2, 3, 2 ], + "to": [ 14, 4, 14 ], + "faces": { + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, + "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#base" }, + "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#base" }, + "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#base" }, + "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#base" } + } + }, + { + "__comment": "pillar", + "from": [ 3, 4, 3 ], + "to": [ 13, 16, 13 ], + "faces": { + "north": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pedestal_default.json b/src/main/resources/assets/betterend/models/block/pedestal_default.json new file mode 100644 index 00000000..baac7a3e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/pedestal_default.json @@ -0,0 +1,57 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#base" + }, + "elements": [ + { + "__comment": "basin_1", + "from": [ 0, 0, 0 ], + "to": [ 16, 3, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#base" }, + "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#base" }, + "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#base" }, + "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#base" } + } + }, + { + "__comment": "basin_2", + "from": [ 2, 3, 2 ], + "to": [ 14, 4, 14 ], + "faces": { + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, + "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#base" }, + "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#base" }, + "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#base" }, + "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#base" } + } + }, + { + "__comment": "pillar", + "from": [ 3, 4, 3 ], + "to": [ 13, 12, 13 ], + "faces": { + "north": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" } + } + }, + { + "__comment": "top", + "from": [ 1, 12, 1 ], + "to": [ 15, 14, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#bottom" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, + "north": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, + "south": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, + "west": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, + "east": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pedestal_pillar.json b/src/main/resources/assets/betterend/models/block/pedestal_pillar.json new file mode 100644 index 00000000..dea3004c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/pedestal_pillar.json @@ -0,0 +1,19 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#pillar" + }, + "elements": [ + { + "__comment": "pillar", + "from": [ 3, 0, 3 ], + "to": [ 13, 16, 13 ], + "faces": { + "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pedestal_top.json b/src/main/resources/assets/betterend/models/block/pedestal_top.json new file mode 100644 index 00000000..aedf1f75 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/pedestal_top.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#base" + }, + "elements": [ + { + "__comment": "pillar", + "from": [ 3, 0, 3 ], + "to": [ 13, 12, 13 ], + "faces": { + "north": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" } + } + }, + { + "__comment": "top", + "from": [ 1, 12, 1 ], + "to": [ 15, 14, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, + "north": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, + "south": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, + "west": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, + "east": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/test_pillar_top.json b/src/main/resources/assets/betterend/models/block/test_pillar_top.json new file mode 100644 index 00000000..1d2c1780 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/test_pillar_top.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 1, 5, 1 ], + "to": [ 15, 8, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#texture" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#rune" }, + "north": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" }, + "south": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" }, + "west": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" }, + "east": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 0, 3 ], + "to": [ 13, 5, 13 ], + "faces": { + "north": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/eternal_pedestal.json b/src/main/resources/assets/betterend/models/item/eternal_pedestal.json index c70f55a6..0cb3c9d0 100644 --- a/src/main/resources/assets/betterend/models/item/eternal_pedestal.json +++ b/src/main/resources/assets/betterend/models/item/eternal_pedestal.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/eternal_pedestal_1" + "parent": "betterend:block/eternal_pedestal_default_1" }