diff --git a/common/src/main/java/com/starfish_studios/building_but_better/block/AbstractBlockBlock.java b/common/src/main/java/com/starfish_studios/building_but_better/block/AbstractBlockBlock.java deleted file mode 100644 index e4aad755..00000000 --- a/common/src/main/java/com/starfish_studios/building_but_better/block/AbstractBlockBlock.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Decompiled with CFR 0.2.0 (FabricMC d28b102d). - */ -package com.starfish_studios.building_but_better.block; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import com.starfish_studios.building_but_better.block.entity.BlockBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.core.component.DataComponents; -import net.minecraft.util.StringRepresentable; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.animal.armadillo.Armadillo; -import net.minecraft.world.item.Equipable; -import net.minecraft.world.level.block.BaseEntityBlock; -import net.minecraft.world.level.block.StairBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.pathfinder.PathComputationType; - -public abstract class AbstractBlockBlock extends BaseEntityBlock implements Equipable { - public final BlockBlock.Types type; - - public AbstractBlockBlock(BlockBlock.Types type, Properties properties) { - super(properties); - this.type = type; - } - - @Override - public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { - return new BlockBlockEntity(blockPos, blockState); - } - - public BlockBlock.Types getType() { - return this.type; - } - - @Override - protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) { - return false; - } - - @Override - public EquipmentSlot getEquipmentSlot() { - return EquipmentSlot.HEAD; - } -} - diff --git a/common/src/main/java/com/starfish_studios/building_but_better/block/BalustradeBlock.java b/common/src/main/java/com/starfish_studios/building_but_better/block/BalustradeBlock.java index 3c219867..e887e89c 100644 --- a/common/src/main/java/com/starfish_studios/building_but_better/block/BalustradeBlock.java +++ b/common/src/main/java/com/starfish_studios/building_but_better/block/BalustradeBlock.java @@ -65,11 +65,12 @@ public BalustradeBlock(Properties properties) { @Override protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) { - if (!player.getItemInHand(hand).is(ModItemTags.HAMMERS)) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + if (!stack.is(ModItemTags.HAMMERS)) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; - if (hitResult.getLocation().y - (double)pos.getY() > 0.5D) { + boolean half = hitResult.getLocation().y - (double)pos.getY() > 0.5D; + if (half) { level.setBlockAndUpdate(pos, state.cycle(TOP)); - } else if (hitResult.getLocation().y - (double)pos.getY() < 0.5D) { + } else { level.setBlockAndUpdate(pos, state.cycle(BOTTOM)); } level.playSound(player, pos, state.getSoundType().getPlaceSound(), player.getSoundSource(), 1.0F, 1.0F); diff --git a/common/src/main/java/com/starfish_studios/building_but_better/block/BlockBlock.java b/common/src/main/java/com/starfish_studios/building_but_better/block/BlockBlock.java index 26e07b62..92f592cf 100644 --- a/common/src/main/java/com/starfish_studios/building_but_better/block/BlockBlock.java +++ b/common/src/main/java/com/starfish_studios/building_but_better/block/BlockBlock.java @@ -1,49 +1,32 @@ package com.starfish_studios.building_but_better.block; -import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import io.netty.buffer.ByteBuf; +import com.starfish_studios.building_but_better.block.properties.BBBBlockStateProperties; import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.util.ByIdMap; -import net.minecraft.util.StringRepresentable; +import net.minecraft.core.Direction; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.Equipable; -import net.minecraft.world.item.component.FireworkExplosion; +import net.minecraft.world.item.Items; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.block.state.properties.RotationSegment; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import java.util.function.IntFunction; - -public class BlockBlock extends AbstractBlockBlock implements Equipable { - public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( - (instance) -> instance.group(BlockBlock.Types.CODEC.fieldOf("type") - .forGetter(e -> e.type),propertiesCodec()) - .apply(instance, BlockBlock::new)); - @Override - protected MapCodec codec() { - return CODEC; - } - - public static final int MAX = RotationSegment.getMaxSegmentIndex(); +public class BlockBlock extends Block implements Equipable { + public static final int MAX = 3; private static final int ROTATIONS = MAX + 1; - public static final IntegerProperty ROTATION = BlockStateProperties.ROTATION_16; + public static final IntegerProperty ROTATION = BBBBlockStateProperties.ROTATION_4; protected static final VoxelShape SHAPE = Block.box(4.0, 0.0, 4.0, 12.0, 8.0, 12.0); - public BlockBlock(Types type, Properties properties) { - super(type, properties); + public BlockBlock(Properties properties) { + super(properties); this.registerDefaultState(this.stateDefinition.any().setValue(ROTATION, 0)); } @@ -53,14 +36,9 @@ public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, Block return SHAPE; } - @Override - public VoxelShape getOcclusionShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos) { - return Shapes.empty(); - } - @Override public BlockState getStateForPlacement(BlockPlaceContext blockPlaceContext) { - return this.defaultBlockState().setValue(ROTATION, RotationSegment.convertToSegment(blockPlaceContext.getRotation())); + return this.defaultBlockState().setValue(ROTATION, RotationSegment.convertToSegment(blockPlaceContext.getRotation()) % 4); } @Override @@ -78,38 +56,9 @@ protected void createBlockStateDefinition(StateDefinition.Builder BY_ID = ByIdMap.continuous(Types::getId, values(), ByIdMap.OutOfBoundsStrategy.ZERO); - public static final Codec CODEC = StringRepresentable.fromValues(Types::values); - private final int id; - private final String name; - - Types(final int id, final String name) { - this.id = id; - this.name = name; - } - - public int getId() { - return this.id; - } - - public static Types byId(int id) { - return BY_ID.apply(id); - } - - public String getSerializedName() { - return this.name; - } + @Override + public EquipmentSlot getEquipmentSlot() { + return EquipmentSlot.HEAD; } } diff --git a/common/src/main/java/com/starfish_studios/building_but_better/block/BrazierBlock.java b/common/src/main/java/com/starfish_studios/building_but_better/block/BrazierBlock.java index 5c0558d5..a38afab6 100644 --- a/common/src/main/java/com/starfish_studios/building_but_better/block/BrazierBlock.java +++ b/common/src/main/java/com/starfish_studios/building_but_better/block/BrazierBlock.java @@ -60,7 +60,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev } if (stack.is(Items.FLINT_AND_STEEL) && !state.getValue(LIT)) { - //stack.hurtAndBreak(1, player, (playerEntity) -> { playerEntity.broadcastBreakEvent(interactionHand); }); + stack.hurtAndBreak(1, player, LivingEntity.getSlotForHand(hand)); level.playSound(null, pos, SoundEvents.FLINTANDSTEEL_USE, SoundSource.BLOCKS, 1.0F, level.random.nextFloat() * 0.4F + 0.8F); level.setBlock(pos, state.setValue(LIT, true), 11); return ItemInteractionResult.SUCCESS; diff --git a/common/src/main/java/com/starfish_studios/building_but_better/block/LatticeBlock.java b/common/src/main/java/com/starfish_studios/building_but_better/block/LatticeBlock.java index eafcf129..8c54064a 100644 --- a/common/src/main/java/com/starfish_studios/building_but_better/block/LatticeBlock.java +++ b/common/src/main/java/com/starfish_studios/building_but_better/block/LatticeBlock.java @@ -12,6 +12,7 @@ import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; @@ -200,40 +201,36 @@ public void attack(BlockState blockState, Level level, BlockPos blockPos, Player } } - public static InteractionResult use(@Nullable Entity entity, BlockState blockState, Level level, BlockPos blockPos) { - - return InteractionResult.PASS; - } - - public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - if (!level.isClientSide && player.getItemInHand(hand).is(Items.SHEARS)) { + @Override + protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) { + if (!level.isClientSide && stack.is(Items.SHEARS)) { LatticePlantType plantType = state.getValue(PLANT_TYPE); if (state.getValue(BERRIES)) { level.setBlock(pos, state.setValue(PLANT_TYPE, LatticePlantType.NONE), 3); - return CaveVines.use(null, state, level, pos); + return CaveVines.use(null, state, level, pos) == InteractionResult.SUCCESS ? ItemInteractionResult.SUCCESS : ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } else if (PLANT_TYPE_TO_ITEM.containsKey(plantType)) { Item item = PLANT_TYPE_TO_ITEM.get(plantType); if (item != null) { level.setBlock(pos, state.setValue(PLANT_TYPE, LatticePlantType.NONE), 3); popResource(level, pos, new ItemStack(item)); level.playSound(null, pos, SoundEvents.VINE_BREAK, SoundSource.BLOCKS, 1.0F, 1.0F); - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } } } if (state.getValue(PLANT_TYPE) == LatticePlantType.NONE) { - ItemStack itemStack = player.getItemInHand(hand); - if (PLANT_TYPE_TO_ITEM.containsValue(itemStack.getItem())) { + if (PLANT_TYPE_TO_ITEM.containsValue(stack.getItem())) { for (Map.Entry entry : PLANT_TYPE_TO_ITEM.entrySet()) { - if (entry.getValue() == itemStack.getItem()) { + if (entry.getValue() == stack.getItem()) { level.setBlock(pos, state.setValue(PLANT_TYPE, entry.getKey()), 3); level.playSound(null, pos, entry.getKey() == LatticePlantType.VINES ? SoundEvents.VINE_PLACE : SoundEvents.GRASS_PLACE, SoundSource.BLOCKS, 1.0F, 1.0F); - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } } } } - return CaveVines.use(null, state, level, pos); + //return CaveVines.use(null, state, level, pos); + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } diff --git a/common/src/main/java/com/starfish_studios/building_but_better/block/LayerBlock.java b/common/src/main/java/com/starfish_studios/building_but_better/block/LayerBlock.java index b2b8f67c..ada2edaf 100644 --- a/common/src/main/java/com/starfish_studios/building_but_better/block/LayerBlock.java +++ b/common/src/main/java/com/starfish_studios/building_but_better/block/LayerBlock.java @@ -5,6 +5,7 @@ import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; @@ -74,7 +75,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev if (state.getValue(LAYERS) > 1) { level.setBlock(pos, state.setValue(LAYERS, state.getValue(LAYERS) - 1), 3); Block.popResource(level, pos, this.asItem().getDefaultInstance()); - //stack.hurtAndBreak(1, player, (playerEntity) -> playerEntity.broadcastBreakEvent(hand)); + stack.hurtAndBreak(1, player, LivingEntity.getSlotForHand(hand)); level.playSound(player, pos, level.getBlockState(pos).getBlock().defaultBlockState().getSoundType().getBreakSound(), player.getSoundSource(), 1.0F, 1.0F); return ItemInteractionResult.SUCCESS; } else if (state.getValue(LAYERS) == 1) { diff --git a/common/src/main/java/com/starfish_studios/building_but_better/block/WallBlockBlock.java b/common/src/main/java/com/starfish_studios/building_but_better/block/WallBlockBlock.java index 2bad7f33..59a9ea27 100644 --- a/common/src/main/java/com/starfish_studios/building_but_better/block/WallBlockBlock.java +++ b/common/src/main/java/com/starfish_studios/building_but_better/block/WallBlockBlock.java @@ -2,15 +2,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.util.StringRepresentable; -import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -20,16 +15,7 @@ import java.util.Map; -public class WallBlockBlock extends AbstractBlockBlock { - public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( - (instance) -> instance.group(BlockBlock.Types.CODEC.fieldOf("type") - .forGetter(e -> e.type),propertiesCodec()) - .apply(instance, WallBlockBlock::new)); - @Override - protected MapCodec codec() { - return CODEC; - } - +public class WallBlockBlock extends Block { public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING; private static final Map AABBS = Maps.newEnumMap(ImmutableMap.of( @@ -38,29 +24,21 @@ protected MapCodec codec() { Direction.EAST, Block.box(0.0, 4.0, 4.0, 8.0, 12.0, 12.0), Direction.WEST, Block.box(8.0, 4.0, 4.0, 16.0, 12.0, 12.0))); - public WallBlockBlock(BlockBlock.Types type, Properties properties) { - super(type, properties); + public WallBlockBlock(Properties properties) { + super(properties); this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); } @Override - public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) { - return AABBS.get(blockState.getValue(FACING)); + public BlockState getStateForPlacement(BlockPlaceContext blockPlaceContext) { + Direction dir = blockPlaceContext.getClickedFace(); + if (dir.getAxis().isVertical()) return null; + return this.defaultBlockState().setValue(FACING, dir); } @Override - public BlockState getStateForPlacement(BlockPlaceContext blockPlaceContext) { - BlockState blockState = this.defaultBlockState(); - Level blockGetter = blockPlaceContext.getLevel(); - BlockPos blockPos = blockPlaceContext.getClickedPos(); - for (Direction direction : blockPlaceContext.getNearestLookingDirections()) { - if (!direction.getAxis().isHorizontal()) continue; - Direction direction2 = direction.getOpposite(); - blockState = blockState.setValue(FACING, direction2); - if (blockGetter.getBlockState(blockPos.relative(direction)).canBeReplaced(blockPlaceContext)) continue; - return blockState; - } - return null; + public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) { + return AABBS.get(blockState.getValue(FACING)); } @Override diff --git a/common/src/main/java/com/starfish_studios/building_but_better/block/properties/BBBBlockStateProperties.java b/common/src/main/java/com/starfish_studios/building_but_better/block/properties/BBBBlockStateProperties.java index 69c07c00..3ee1132e 100644 --- a/common/src/main/java/com/starfish_studios/building_but_better/block/properties/BBBBlockStateProperties.java +++ b/common/src/main/java/com/starfish_studios/building_but_better/block/properties/BBBBlockStateProperties.java @@ -26,4 +26,5 @@ public class BBBBlockStateProperties { public static final BooleanProperty LAYER_2 = BooleanProperty.create("layer_2"); public static final BooleanProperty LAYER_3 = BooleanProperty.create("layer_3"); public static final BooleanProperty LAYER_4 = BooleanProperty.create("layer_4"); + public static final IntegerProperty ROTATION_4 = IntegerProperty.create("rotation", 0, 3); } \ No newline at end of file diff --git a/common/src/main/java/com/starfish_studios/building_but_better/registry/ModBlocks.java b/common/src/main/java/com/starfish_studios/building_but_better/registry/ModBlocks.java index 482a40b6..2f9023db 100644 --- a/common/src/main/java/com/starfish_studios/building_but_better/registry/ModBlocks.java +++ b/common/src/main/java/com/starfish_studios/building_but_better/registry/ModBlocks.java @@ -67,20 +67,20 @@ public static class Properties { // endregion // region BLOCKS - public static final Supplier STONE_BLOCK = registerBlockItem("stone_block", () -> new BlockBlock(BlockBlock.Types.STONE, BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).pushReaction(PushReaction.DESTROY))); - public static final Supplier WALL_STONE_BLOCK = registerBlockItem("wall_stone_block", () -> new WallBlockBlock(BlockBlock.Types.STONE, BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).pushReaction(PushReaction.DESTROY).dropsLike(STONE_BLOCK.get()))); - public static final Supplier BLACKSTONE_BLOCK = registerBlockItem("blackstone_block", () -> new BlockBlock(BlockBlock.Types.BLACKSTONE, BlockBehaviour.Properties.ofFullCopy(Blocks.BLACKSTONE).pushReaction(PushReaction.DESTROY))); - public static final Supplier WALL_BLACKSTONE_BLOCK = registerBlockItem("wall_blackstone_block", () -> new WallBlockBlock(BlockBlock.Types.BLACKSTONE, BlockBehaviour.Properties.ofFullCopy(Blocks.BLACKSTONE).pushReaction(PushReaction.DESTROY).dropsLike(BLACKSTONE_BLOCK.get()))); - public static final Supplier DEEPSLATE_BLOCK = registerBlockItem("deepslate_block", () -> new BlockBlock(BlockBlock.Types.DEEPSLATE, BlockBehaviour.Properties.ofFullCopy(Blocks.DEEPSLATE).pushReaction(PushReaction.DESTROY))); - public static final Supplier WALL_DEEPSLATE_BLOCK = registerBlockItem("wall_deepslate_block", () -> new WallBlockBlock(BlockBlock.Types.DEEPSLATE, BlockBehaviour.Properties.ofFullCopy(Blocks.DEEPSLATE).pushReaction(PushReaction.DESTROY).dropsLike(DEEPSLATE_BLOCK.get()))); - public static final Supplier NETHER_BRICK_BLOCK = registerBlockItem("nether_brick_block", () -> new BlockBlock(BlockBlock.Types.NETHER_BRICK, BlockBehaviour.Properties.ofFullCopy(Blocks.NETHER_BRICKS).pushReaction(PushReaction.DESTROY))); - public static final Supplier WALL_NETHER_BRICK_BLOCK = registerBlockItem("wall_nether_brick_block", () -> new WallBlockBlock(BlockBlock.Types.NETHER_BRICK, BlockBehaviour.Properties.ofFullCopy(Blocks.NETHER_BRICKS).pushReaction(PushReaction.DESTROY).dropsLike(NETHER_BRICK_BLOCK.get()))); - public static final Supplier SANDSTONE_BLOCK = registerBlockItem("sandstone_block", () -> new BlockBlock(BlockBlock.Types.SANDSTONE, BlockBehaviour.Properties.ofFullCopy(Blocks.SANDSTONE).pushReaction(PushReaction.DESTROY))); - public static final Supplier WALL_SANDSTONE_BLOCK = registerBlockItem("wall_sandstone_block", () -> new WallBlockBlock(BlockBlock.Types.SANDSTONE, BlockBehaviour.Properties.ofFullCopy(Blocks.SANDSTONE).pushReaction(PushReaction.DESTROY).dropsLike(SANDSTONE_BLOCK.get()))); - public static final Supplier RED_SANDSTONE_BLOCK = registerBlockItem("red_sandstone_block", () -> new BlockBlock(BlockBlock.Types.RED_SANDSTONE, BlockBehaviour.Properties.ofFullCopy(Blocks.RED_SANDSTONE).pushReaction(PushReaction.DESTROY))); - public static final Supplier WALL_RED_SANDSTONE_BLOCK = registerBlockItem("wall_red_sandstone_block", () -> new WallBlockBlock(BlockBlock.Types.RED_SANDSTONE, BlockBehaviour.Properties.ofFullCopy(Blocks.RED_SANDSTONE).pushReaction(PushReaction.DESTROY).dropsLike(RED_SANDSTONE_BLOCK.get()))); - public static final Supplier QUARTZ_BLOCK = registerBlockItem("quartz_block", () -> new BlockBlock(BlockBlock.Types.QUARTZ, BlockBehaviour.Properties.ofFullCopy(Blocks.QUARTZ_BLOCK).pushReaction(PushReaction.DESTROY))); - public static final Supplier WALL_QUARTZ_BLOCK = registerBlockItem("wall_quartz_block", () -> new WallBlockBlock(BlockBlock.Types.QUARTZ, BlockBehaviour.Properties.ofFullCopy(Blocks.QUARTZ_BLOCK).pushReaction(PushReaction.DESTROY).dropsLike(QUARTZ_BLOCK.get()))); + public static final Supplier STONE_BLOCK = registerBlockOnly("stone_block", () -> new BlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).pushReaction(PushReaction.DESTROY))); + public static final Supplier WALL_STONE_BLOCK = registerBlockOnly("wall_stone_block", () -> new WallBlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).pushReaction(PushReaction.DESTROY).dropsLike(STONE_BLOCK.get()))); + public static final Supplier BLACKSTONE_BLOCK = registerBlockOnly("blackstone_block", () -> new BlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.BLACKSTONE).pushReaction(PushReaction.DESTROY))); + public static final Supplier WALL_BLACKSTONE_BLOCK = registerBlockOnly("wall_blackstone_block", () -> new WallBlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.BLACKSTONE).pushReaction(PushReaction.DESTROY).dropsLike(BLACKSTONE_BLOCK.get()))); + public static final Supplier DEEPSLATE_BLOCK = registerBlockOnly("deepslate_block", () -> new BlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DEEPSLATE).pushReaction(PushReaction.DESTROY))); + public static final Supplier WALL_DEEPSLATE_BLOCK = registerBlockOnly("wall_deepslate_block", () -> new WallBlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DEEPSLATE).pushReaction(PushReaction.DESTROY).dropsLike(DEEPSLATE_BLOCK.get()))); + public static final Supplier NETHER_BRICK_BLOCK = registerBlockOnly("nether_brick_block", () -> new BlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.NETHER_BRICKS).pushReaction(PushReaction.DESTROY))); + public static final Supplier WALL_NETHER_BRICK_BLOCK = registerBlockOnly("wall_nether_brick_block", () -> new WallBlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.NETHER_BRICKS).pushReaction(PushReaction.DESTROY).dropsLike(NETHER_BRICK_BLOCK.get()))); + public static final Supplier SANDSTONE_BLOCK = registerBlockOnly("sandstone_block", () -> new BlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SANDSTONE).pushReaction(PushReaction.DESTROY))); + public static final Supplier WALL_SANDSTONE_BLOCK = registerBlockOnly("wall_sandstone_block", () -> new WallBlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SANDSTONE).pushReaction(PushReaction.DESTROY).dropsLike(SANDSTONE_BLOCK.get()))); + public static final Supplier RED_SANDSTONE_BLOCK = registerBlockOnly("red_sandstone_block", () -> new BlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.RED_SANDSTONE).pushReaction(PushReaction.DESTROY))); + public static final Supplier WALL_RED_SANDSTONE_BLOCK = registerBlockOnly("wall_red_sandstone_block", () -> new WallBlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.RED_SANDSTONE).pushReaction(PushReaction.DESTROY).dropsLike(RED_SANDSTONE_BLOCK.get()))); + public static final Supplier QUARTZ_BLOCK = registerBlockOnly("quartz_block", () -> new BlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.QUARTZ_BLOCK).pushReaction(PushReaction.DESTROY))); + public static final Supplier WALL_QUARTZ_BLOCK = registerBlockOnly("wall_quartz_block", () -> new WallBlockBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.QUARTZ_BLOCK).pushReaction(PushReaction.DESTROY).dropsLike(QUARTZ_BLOCK.get()))); // endregion // region COLUMNS diff --git a/common/src/main/java/com/starfish_studios/building_but_better/registry/ModItems.java b/common/src/main/java/com/starfish_studios/building_but_better/registry/ModItems.java index a7e91874..23185c55 100644 --- a/common/src/main/java/com/starfish_studios/building_but_better/registry/ModItems.java +++ b/common/src/main/java/com/starfish_studios/building_but_better/registry/ModItems.java @@ -3,13 +3,26 @@ import com.starfish_studios.building_but_better.item.HammerItem; import net.minecraft.core.Direction; import net.minecraft.core.component.DataComponents; +import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.StandingAndWallBlockItem; +import net.minecraft.world.level.block.Blocks; import java.util.function.Supplier; public class ModItems { - public static final Supplier CORNERSTONE = ModRegistry.registerItem("bbb", () -> new Item(new Item.Properties()));//(new FabricItemSettings().maxCount(1).rarity(Rarity.UNCOMMON).fireproof())); + public static final Supplier STONE_BLOCK = ModRegistry.registerItem("stone_block", () -> new StandingAndWallBlockItem(ModBlocks.STONE_BLOCK.get(), ModBlocks.WALL_STONE_BLOCK.get(), new Item.Properties(), Direction.DOWN)); + public static final Supplier BLACKSTONE_BLOCK = ModRegistry.registerItem("blackstone_block", () -> new StandingAndWallBlockItem(ModBlocks.BLACKSTONE_BLOCK.get(), ModBlocks.WALL_BLACKSTONE_BLOCK.get(), new Item.Properties(), Direction.DOWN)); + public static final Supplier DEEPSLATE_BLOCK = ModRegistry.registerItem("deepslate_block", () -> new StandingAndWallBlockItem(ModBlocks.DEEPSLATE_BLOCK.get(), ModBlocks.WALL_DEEPSLATE_BLOCK.get(), new Item.Properties(), Direction.DOWN)); + public static final Supplier NETHER_BRICK_BLOCK = ModRegistry.registerItem("nether_brick_block", () -> new StandingAndWallBlockItem(ModBlocks.NETHER_BRICK_BLOCK.get(), ModBlocks.WALL_NETHER_BRICK_BLOCK.get(), new Item.Properties(), Direction.DOWN)); + public static final Supplier SANDSTONE_BLOCK = ModRegistry.registerItem("sandstone_block", () -> new StandingAndWallBlockItem(ModBlocks.SANDSTONE_BLOCK.get(), ModBlocks.WALL_SANDSTONE_BLOCK.get(), new Item.Properties(), Direction.DOWN)); + public static final Supplier RED_SANDSTONE_BLOCK = ModRegistry.registerItem("red_sandstone_block", () -> new StandingAndWallBlockItem(ModBlocks.RED_SANDSTONE_BLOCK.get(), ModBlocks.WALL_RED_SANDSTONE_BLOCK.get(), new Item.Properties(), Direction.DOWN)); + public static final Supplier QUARTZ_BLOCK = ModRegistry.registerItem("quartz_block", () -> new StandingAndWallBlockItem(ModBlocks.QUARTZ_BLOCK.get(), ModBlocks.WALL_QUARTZ_BLOCK.get(), new Item.Properties(), Direction.DOWN)); + + + public static final Supplier CORNERSTONE = ModRegistry.registerItem("bbb", () -> new Item(new Item.Properties()), null); public static final Supplier HAMMER = ModRegistry.registerItem("hammer", () -> new HammerItem(new Item.Properties().stacksTo(1).durability(256))); public static final Supplier CHISEL = ModRegistry.registerItem("chisel", () -> new Item(new Item.Properties().stacksTo(1).durability(256))); diff --git a/common/src/main/resources/assets/bbb/blockstates/blackstone_block.json b/common/src/main/resources/assets/bbb/blockstates/blackstone_block.json index 9456b38d..3f2767c0 100644 --- a/common/src/main/resources/assets/bbb/blockstates/blackstone_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/blackstone_block.json @@ -1,7 +1,16 @@ { "variants": { - "": { - "model": "bbb:block/block/blackstone" + "rotation=0": { + "model": "bbb:block/block/blackstone_block_chunk_0" + }, + "rotation=1": { + "model": "bbb:block/block/blackstone_block_chunk_1" + }, + "rotation=2": { + "model": "bbb:block/block/blackstone_block_chunk_2" + }, + "rotation=3": { + "model": "bbb:block/block/blackstone_block_chunk_3" } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/deepslate_block.json b/common/src/main/resources/assets/bbb/blockstates/deepslate_block.json index 541d3a9d..271ccd48 100644 --- a/common/src/main/resources/assets/bbb/blockstates/deepslate_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/deepslate_block.json @@ -1,7 +1,16 @@ { "variants": { - "": { - "model": "bbb:block/block/deepslate" + "rotation=0": { + "model": "bbb:block/block/deepslate_block_chunk_0" + }, + "rotation=1": { + "model": "bbb:block/block/deepslate_block_chunk_1" + }, + "rotation=2": { + "model": "bbb:block/block/deepslate_block_chunk_2" + }, + "rotation=3": { + "model": "bbb:block/block/deepslate_block_chunk_3" } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/nether_brick_block.json b/common/src/main/resources/assets/bbb/blockstates/nether_brick_block.json index 7d63653c..c5963d84 100644 --- a/common/src/main/resources/assets/bbb/blockstates/nether_brick_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/nether_brick_block.json @@ -1,7 +1,16 @@ { "variants": { - "": { - "model": "bbb:block/block/nether_brick" + "rotation=0": { + "model": "bbb:block/block/nether_brick_block_chunk_0" + }, + "rotation=1": { + "model": "bbb:block/block/nether_brick_block_chunk_1" + }, + "rotation=2": { + "model": "bbb:block/block/nether_brick_block_chunk_2" + }, + "rotation=3": { + "model": "bbb:block/block/nether_brick_block_chunk_3" } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/quartz_block.json b/common/src/main/resources/assets/bbb/blockstates/quartz_block.json index f1c62464..bba05ee1 100644 --- a/common/src/main/resources/assets/bbb/blockstates/quartz_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/quartz_block.json @@ -1,7 +1,16 @@ { "variants": { - "": { - "model": "bbb:block/block/quartz" + "rotation=0": { + "model": "bbb:block/block/quartz_block_chunk_0" + }, + "rotation=1": { + "model": "bbb:block/block/quartz_block_chunk_1" + }, + "rotation=2": { + "model": "bbb:block/block/quartz_block_chunk_2" + }, + "rotation=3": { + "model": "bbb:block/block/quartz_block_chunk_3" } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/red_sandstone_block.json b/common/src/main/resources/assets/bbb/blockstates/red_sandstone_block.json index 245fe8db..54a3b27d 100644 --- a/common/src/main/resources/assets/bbb/blockstates/red_sandstone_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/red_sandstone_block.json @@ -1,7 +1,16 @@ { "variants": { - "": { - "model": "bbb:block/block/red_sandstone" + "rotation=0": { + "model": "bbb:block/block/red_sandstone_block_chunk_0" + }, + "rotation=1": { + "model": "bbb:block/block/red_sandstone_block_chunk_1" + }, + "rotation=2": { + "model": "bbb:block/block/red_sandstone_block_chunk_2" + }, + "rotation=3": { + "model": "bbb:block/block/red_sandstone_block_chunk_3" } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/sandstone_block.json b/common/src/main/resources/assets/bbb/blockstates/sandstone_block.json index dc827c29..25cba252 100644 --- a/common/src/main/resources/assets/bbb/blockstates/sandstone_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/sandstone_block.json @@ -1,7 +1,16 @@ { "variants": { - "": { - "model": "bbb:block/block/sandstone" + "rotation=0": { + "model": "bbb:block/block/sandstone_block_chunk_0" + }, + "rotation=1": { + "model": "bbb:block/block/sandstone_block_chunk_1" + }, + "rotation=2": { + "model": "bbb:block/block/sandstone_block_chunk_2" + }, + "rotation=3": { + "model": "bbb:block/block/sandstone_block_chunk_3" } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/stone_block.json b/common/src/main/resources/assets/bbb/blockstates/stone_block.json index fa9decfd..22aee8fe 100644 --- a/common/src/main/resources/assets/bbb/blockstates/stone_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/stone_block.json @@ -1,7 +1,16 @@ { "variants": { - "": { - "model": "bbb:block/block/stone" + "rotation=0": { + "model": "bbb:block/block/stone_block_chunk_0" + }, + "rotation=1": { + "model": "bbb:block/block/stone_block_chunk_1" + }, + "rotation=2": { + "model": "bbb:block/block/stone_block_chunk_2" + }, + "rotation=3": { + "model": "bbb:block/block/stone_block_chunk_3" } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/templates/oak_block.json b/common/src/main/resources/assets/bbb/blockstates/templates/oak_block.json deleted file mode 100644 index 69ae9490..00000000 --- a/common/src/main/resources/assets/bbb/blockstates/templates/oak_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bbb:block/block/oak" - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/blockstates/wall_blackstone_block.json b/common/src/main/resources/assets/bbb/blockstates/wall_blackstone_block.json index 9456b38d..95c5daa5 100644 --- a/common/src/main/resources/assets/bbb/blockstates/wall_blackstone_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/wall_blackstone_block.json @@ -1,7 +1,19 @@ { "variants": { - "": { - "model": "bbb:block/block/blackstone" + "facing=north": { + "model": "bbb:block/block/wall_blackstone_block_chunk" + }, + "facing=east": { + "model": "bbb:block/block/wall_blackstone_block_chunk", + "y": 90 + }, + "facing=south": { + "model": "bbb:block/block/wall_blackstone_block_chunk", + "y": 180 + }, + "facing=west": { + "model": "bbb:block/block/wall_blackstone_block_chunk", + "y": 270 } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/wall_deepslate_block.json b/common/src/main/resources/assets/bbb/blockstates/wall_deepslate_block.json index 541d3a9d..ef85a047 100644 --- a/common/src/main/resources/assets/bbb/blockstates/wall_deepslate_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/wall_deepslate_block.json @@ -1,7 +1,19 @@ { "variants": { - "": { - "model": "bbb:block/block/deepslate" + "facing=north": { + "model": "bbb:block/block/wall_deepslate_block_chunk" + }, + "facing=east": { + "model": "bbb:block/block/wall_deepslate_block_chunk", + "y": 90 + }, + "facing=south": { + "model": "bbb:block/block/wall_deepslate_block_chunk", + "y": 180 + }, + "facing=west": { + "model": "bbb:block/block/wall_deepslate_block_chunk", + "y": 270 } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/wall_nether_brick_block.json b/common/src/main/resources/assets/bbb/blockstates/wall_nether_brick_block.json index 7d63653c..af877478 100644 --- a/common/src/main/resources/assets/bbb/blockstates/wall_nether_brick_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/wall_nether_brick_block.json @@ -1,7 +1,19 @@ { "variants": { - "": { - "model": "bbb:block/block/nether_brick" + "facing=north": { + "model": "bbb:block/block/wall_nether_brick_block_chunk" + }, + "facing=east": { + "model": "bbb:block/block/wall_nether_brick_block_chunk", + "y": 90 + }, + "facing=south": { + "model": "bbb:block/block/wall_nether_brick_block_chunk", + "y": 180 + }, + "facing=west": { + "model": "bbb:block/block/wall_nether_brick_block_chunk", + "y": 270 } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/wall_oak_block.json b/common/src/main/resources/assets/bbb/blockstates/wall_oak_block.json deleted file mode 100644 index 69ae9490..00000000 --- a/common/src/main/resources/assets/bbb/blockstates/wall_oak_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bbb:block/block/oak" - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/blockstates/wall_quartz_block.json b/common/src/main/resources/assets/bbb/blockstates/wall_quartz_block.json index f1c62464..e94da5eb 100644 --- a/common/src/main/resources/assets/bbb/blockstates/wall_quartz_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/wall_quartz_block.json @@ -1,7 +1,19 @@ { "variants": { - "": { - "model": "bbb:block/block/quartz" + "facing=north": { + "model": "bbb:block/block/wall_quartz_block_chunk" + }, + "facing=east": { + "model": "bbb:block/block/wall_quartz_block_chunk", + "y": 90 + }, + "facing=south": { + "model": "bbb:block/block/wall_quartz_block_chunk", + "y": 180 + }, + "facing=west": { + "model": "bbb:block/block/wall_quartz_block_chunk", + "y": 270 } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/wall_red_sandstone_block.json b/common/src/main/resources/assets/bbb/blockstates/wall_red_sandstone_block.json index 245fe8db..0d429b0d 100644 --- a/common/src/main/resources/assets/bbb/blockstates/wall_red_sandstone_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/wall_red_sandstone_block.json @@ -1,7 +1,19 @@ { "variants": { - "": { - "model": "bbb:block/block/red_sandstone" + "facing=north": { + "model": "bbb:block/block/wall_red_sandstone_block_chunk" + }, + "facing=east": { + "model": "bbb:block/block/wall_red_sandstone_block_chunk", + "y": 90 + }, + "facing=south": { + "model": "bbb:block/block/wall_red_sandstone_block_chunk", + "y": 180 + }, + "facing=west": { + "model": "bbb:block/block/wall_red_sandstone_block_chunk", + "y": 270 } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/wall_sandstone_block.json b/common/src/main/resources/assets/bbb/blockstates/wall_sandstone_block.json index dc827c29..9f585ec8 100644 --- a/common/src/main/resources/assets/bbb/blockstates/wall_sandstone_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/wall_sandstone_block.json @@ -1,7 +1,19 @@ { "variants": { - "": { - "model": "bbb:block/block/sandstone" + "facing=north": { + "model": "bbb:block/block/wall_sandstone_block_chunk" + }, + "facing=east": { + "model": "bbb:block/block/wall_sandstone_block_chunk", + "y": 90 + }, + "facing=south": { + "model": "bbb:block/block/wall_sandstone_block_chunk", + "y": 180 + }, + "facing=west": { + "model": "bbb:block/block/wall_sandstone_block_chunk", + "y": 270 } } } diff --git a/common/src/main/resources/assets/bbb/blockstates/wall_stone_block.json b/common/src/main/resources/assets/bbb/blockstates/wall_stone_block.json index fa9decfd..ba993403 100644 --- a/common/src/main/resources/assets/bbb/blockstates/wall_stone_block.json +++ b/common/src/main/resources/assets/bbb/blockstates/wall_stone_block.json @@ -1,7 +1,19 @@ { "variants": { - "": { - "model": "bbb:block/block/stone" + "facing=north": { + "model": "bbb:block/block/wall_stone_block_chunk" + }, + "facing=east": { + "model": "bbb:block/block/wall_stone_block_chunk", + "y": 90 + }, + "facing=south": { + "model": "bbb:block/block/wall_stone_block_chunk", + "y": 180 + }, + "facing=west": { + "model": "bbb:block/block/wall_stone_block_chunk", + "y": 270 } } } diff --git a/common/src/main/resources/assets/bbb/models/block/block/blackstone.json b/common/src/main/resources/assets/bbb/models/block/block/blackstone.json deleted file mode 100644 index a53d9498..00000000 --- a/common/src/main/resources/assets/bbb/models/block/block/blackstone.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "texture_size": [ - 64, - 32 - ], - "textures": { - "particle": "block/blackstone", - "texture": "bbb:block/block/blackstone" - }, - "elements": [ - { - "from": [ - 4, - 0, - 4 - ], - "to": [ - 12, - 8, - 12 - ], - "faces": { - "north": { - "uv": [ - 2, - 4, - 4, - 8 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 0, - 4, - 2, - 8 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 6, - 4, - 8, - 8 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 4, - 6, - 8 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 4, - 4, - 2, - 0 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 6, - 0, - 4, - 4 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "gui": { - "rotation": [ - 30, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "head": { - "translation": [ - 0, - 7.25, - 0 - ], - "scale": [ - 1.9, - 1.9, - 1.9 - ] - }, - "fixed": { - "rotation": [ - 0, - 180, - 0 - ], - "translation": [ - 0, - 4, - 0 - ] - } - } -} diff --git a/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_0.json b/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_0.json new file mode 100644 index 00000000..f9ef5748 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_0.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_0", + "textures": { + "0": "bbb:block/block/blackstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_1.json b/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_1.json new file mode 100644 index 00000000..c24899e4 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_1.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_1", + "textures": { + "0": "bbb:block/block/blackstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_2.json b/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_2.json new file mode 100644 index 00000000..21942a46 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_2.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_2", + "textures": { + "0": "bbb:block/block/blackstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_3.json b/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_3.json new file mode 100644 index 00000000..602d4f08 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/blackstone_block_chunk_3.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_3", + "textures": { + "0": "bbb:block/block/blackstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/deepslate.json b/common/src/main/resources/assets/bbb/models/block/block/deepslate.json deleted file mode 100644 index 41c7066f..00000000 --- a/common/src/main/resources/assets/bbb/models/block/block/deepslate.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "texture_size": [ - 64, - 32 - ], - "textures": { - "particle": "block/deepslate", - "texture": "bbb:block/block/deepslate" - }, - "elements": [ - { - "from": [ - 4, - 0, - 4 - ], - "to": [ - 12, - 8, - 12 - ], - "faces": { - "north": { - "uv": [ - 2, - 4, - 4, - 8 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 0, - 4, - 2, - 8 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 6, - 4, - 8, - 8 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 4, - 6, - 8 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 4, - 4, - 2, - 0 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 6, - 0, - 4, - 4 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "gui": { - "rotation": [ - 30, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "head": { - "translation": [ - 0, - 7.25, - 0 - ], - "scale": [ - 1.9, - 1.9, - 1.9 - ] - }, - "fixed": { - "rotation": [ - 0, - 180, - 0 - ], - "translation": [ - 0, - 4, - 0 - ] - } - } -} diff --git a/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_0.json b/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_0.json new file mode 100644 index 00000000..6dff24cf --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_0.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_0", + "textures": { + "0": "bbb:block/block/deepslate" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_1.json b/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_1.json new file mode 100644 index 00000000..9fffdc57 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_1.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_1", + "textures": { + "0": "bbb:block/block/deepslate" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_2.json b/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_2.json new file mode 100644 index 00000000..21a99346 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_2.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_2", + "textures": { + "0": "bbb:block/block/deepslate" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_3.json b/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_3.json new file mode 100644 index 00000000..018ef709 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/deepslate_block_chunk_3.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_3", + "textures": { + "0": "bbb:block/block/deepslate" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/nether_brick.json b/common/src/main/resources/assets/bbb/models/block/block/nether_brick.json deleted file mode 100644 index 7027f37b..00000000 --- a/common/src/main/resources/assets/bbb/models/block/block/nether_brick.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "texture_size": [ - 64, - 32 - ], - "textures": { - "particle": "block/nether_bricks", - "texture": "bbb:block/block/nether_brick" - }, - "elements": [ - { - "from": [ - 4, - 0, - 4 - ], - "to": [ - 12, - 8, - 12 - ], - "faces": { - "north": { - "uv": [ - 2, - 4, - 4, - 8 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 0, - 4, - 2, - 8 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 6, - 4, - 8, - 8 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 4, - 6, - 8 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 4, - 4, - 2, - 0 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 6, - 0, - 4, - 4 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "gui": { - "rotation": [ - 30, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "head": { - "translation": [ - 0, - 7.25, - 0 - ], - "scale": [ - 1.9, - 1.9, - 1.9 - ] - }, - "fixed": { - "rotation": [ - 0, - 180, - 0 - ], - "translation": [ - 0, - 4, - 0 - ] - } - } -} diff --git a/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_0.json b/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_0.json new file mode 100644 index 00000000..12e65e2a --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_0.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_0", + "textures": { + "0": "bbb:block/block/nether_brick" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_1.json b/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_1.json new file mode 100644 index 00000000..d1af527f --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_1.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_1", + "textures": { + "0": "bbb:block/block/nether_brick" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_2.json b/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_2.json new file mode 100644 index 00000000..c74ff0b8 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_2.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_2", + "textures": { + "0": "bbb:block/block/nether_brick" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_3.json b/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_3.json new file mode 100644 index 00000000..f9e7ec70 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/nether_brick_block_chunk_3.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_3", + "textures": { + "0": "bbb:block/block/nether_brick" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/oak.json b/common/src/main/resources/assets/bbb/models/block/block/oak.json deleted file mode 100644 index 4e8081c6..00000000 --- a/common/src/main/resources/assets/bbb/models/block/block/oak.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "texture_size": [64, 32], - "textures": { - "particle": "block/oak", - "texture": "bbb:block/block/oak" - }, - "elements": [ - { - "from": [4, 0, 4], - "to": [12, 8, 12], - "faces": { - "north": {"uv": [2, 4, 4, 8], "texture": "#texture"}, - "east": {"uv": [0, 4, 2, 8], "texture": "#texture"}, - "south": {"uv": [6, 4, 8, 8], "texture": "#texture"}, - "west": {"uv": [4, 4, 6, 8], "texture": "#texture"}, - "up": {"uv": [4, 4, 2, 0], "texture": "#texture"}, - "down": {"uv": [6, 0, 4, 4], "texture": "#texture"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [45, 45, 0], - "translation": [0, 3, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [45, 45, 0], - "translation": [0, 3, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "translation": [0, 3.25, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 45, 0], - "translation": [0, 3.25, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [30, 45, 0], - "translation": [0, 3, 0] - }, - "head": { - "translation": [0, 7.25, 0], - "scale": [1.9, 1.9, 1.9] - }, - "fixed": { - "rotation": [0, 180, 0], - "translation": [0, 4, 0] - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/quartz.json b/common/src/main/resources/assets/bbb/models/block/block/quartz.json deleted file mode 100644 index e3622ec7..00000000 --- a/common/src/main/resources/assets/bbb/models/block/block/quartz.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "texture_size": [ - 64, - 32 - ], - "textures": { - "particle": "block/quartz_block_top", - "texture": "bbb:block/block/quartz" - }, - "elements": [ - { - "from": [ - 4, - 0, - 4 - ], - "to": [ - 12, - 8, - 12 - ], - "faces": { - "north": { - "uv": [ - 2, - 4, - 4, - 8 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 0, - 4, - 2, - 8 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 6, - 4, - 8, - 8 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 4, - 6, - 8 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 4, - 4, - 2, - 0 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 6, - 0, - 4, - 4 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "gui": { - "rotation": [ - 30, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "head": { - "translation": [ - 0, - 7.25, - 0 - ], - "scale": [ - 1.9, - 1.9, - 1.9 - ] - }, - "fixed": { - "rotation": [ - 0, - 180, - 0 - ], - "translation": [ - 0, - 4, - 0 - ] - } - } -} diff --git a/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_0.json b/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_0.json new file mode 100644 index 00000000..c4ba0dfa --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_0.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_0", + "textures": { + "0": "bbb:block/block/quartz" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_1.json b/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_1.json new file mode 100644 index 00000000..baf49967 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_1.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_1", + "textures": { + "0": "bbb:block/block/quartz" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_2.json b/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_2.json new file mode 100644 index 00000000..be69d39c --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_2.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_2", + "textures": { + "0": "bbb:block/block/quartz" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_3.json b/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_3.json new file mode 100644 index 00000000..b2f3a532 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/quartz_block_chunk_3.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_3", + "textures": { + "0": "bbb:block/block/quartz" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/red_sandstone.json b/common/src/main/resources/assets/bbb/models/block/block/red_sandstone.json deleted file mode 100644 index feb04b81..00000000 --- a/common/src/main/resources/assets/bbb/models/block/block/red_sandstone.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "texture_size": [ - 64, - 32 - ], - "textures": { - "particle": "block/red_sandstone", - "texture": "bbb:block/block/red_sandstone" - }, - "elements": [ - { - "from": [ - 4, - 0, - 4 - ], - "to": [ - 12, - 8, - 12 - ], - "faces": { - "north": { - "uv": [ - 2, - 4, - 4, - 8 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 0, - 4, - 2, - 8 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 6, - 4, - 8, - 8 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 4, - 6, - 8 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 4, - 4, - 2, - 0 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 6, - 0, - 4, - 4 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "gui": { - "rotation": [ - 30, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "head": { - "translation": [ - 0, - 7.25, - 0 - ], - "scale": [ - 1.9, - 1.9, - 1.9 - ] - }, - "fixed": { - "rotation": [ - 0, - 180, - 0 - ], - "translation": [ - 0, - 4, - 0 - ] - } - } -} diff --git a/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_0.json b/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_0.json new file mode 100644 index 00000000..306b8866 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_0.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_0", + "textures": { + "0": "bbb:block/block/red_sandstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_1.json b/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_1.json new file mode 100644 index 00000000..1d9aef39 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_1.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_1", + "textures": { + "0": "bbb:block/block/red_sandstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_2.json b/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_2.json new file mode 100644 index 00000000..69fad7b7 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_2.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_2", + "textures": { + "0": "bbb:block/block/red_sandstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_3.json b/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_3.json new file mode 100644 index 00000000..34a76644 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/red_sandstone_block_chunk_3.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_3", + "textures": { + "0": "bbb:block/block/red_sandstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/sandstone.json b/common/src/main/resources/assets/bbb/models/block/block/sandstone.json deleted file mode 100644 index ca4983e4..00000000 --- a/common/src/main/resources/assets/bbb/models/block/block/sandstone.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "texture_size": [ - 64, - 32 - ], - "textures": { - "particle": "block/sandstone", - "texture": "bbb:block/block/sandstone" - }, - "elements": [ - { - "from": [ - 4, - 0, - 4 - ], - "to": [ - 12, - 8, - 12 - ], - "faces": { - "north": { - "uv": [ - 2, - 4, - 4, - 8 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 0, - 4, - 2, - 8 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 6, - 4, - 8, - 8 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 4, - 6, - 8 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 4, - 4, - 2, - 0 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 6, - 0, - 4, - 4 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "gui": { - "rotation": [ - 30, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "head": { - "translation": [ - 0, - 7.25, - 0 - ], - "scale": [ - 1.9, - 1.9, - 1.9 - ] - }, - "fixed": { - "rotation": [ - 0, - 180, - 0 - ], - "translation": [ - 0, - 4, - 0 - ] - } - } -} diff --git a/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_0.json b/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_0.json new file mode 100644 index 00000000..2a070f74 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_0.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_0", + "textures": { + "0": "bbb:block/block/sandstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_1.json b/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_1.json new file mode 100644 index 00000000..108ca834 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_1.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_1", + "textures": { + "0": "bbb:block/block/sandstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_2.json b/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_2.json new file mode 100644 index 00000000..780dc825 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_2.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_2", + "textures": { + "0": "bbb:block/block/sandstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_3.json b/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_3.json new file mode 100644 index 00000000..07d240b6 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/sandstone_block_chunk_3.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_3", + "textures": { + "0": "bbb:block/block/sandstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/stone.json b/common/src/main/resources/assets/bbb/models/block/block/stone.json deleted file mode 100644 index 88c95379..00000000 --- a/common/src/main/resources/assets/bbb/models/block/block/stone.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "texture_size": [ - 64, - 32 - ], - "textures": { - "particle": "block/stone", - "texture": "bbb:block/block/stone" - }, - "elements": [ - { - "from": [ - 4, - 0, - 4 - ], - "to": [ - 12, - 8, - 12 - ], - "faces": { - "north": { - "uv": [ - 2, - 4, - 4, - 8 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 0, - 4, - 2, - 8 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 6, - 4, - 8, - 8 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 4, - 6, - 8 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 4, - 4, - 2, - 0 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 6, - 0, - 4, - 4 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 45, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 45, - 0 - ], - "translation": [ - 0, - 3.25, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "gui": { - "rotation": [ - 30, - 45, - 0 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "head": { - "translation": [ - 0, - 7.25, - 0 - ], - "scale": [ - 1.9, - 1.9, - 1.9 - ] - }, - "fixed": { - "rotation": [ - 0, - 180, - 0 - ], - "translation": [ - 0, - 4, - 0 - ] - } - } -} diff --git a/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_0.json b/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_0.json new file mode 100644 index 00000000..74c7b2b1 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_0.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_0", + "textures": { + "0": "bbb:block/block/stone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_1.json b/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_1.json new file mode 100644 index 00000000..4322bbee --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_1.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_1", + "textures": { + "0": "bbb:block/block/stone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_2.json b/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_2.json new file mode 100644 index 00000000..3c02b3f3 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_2.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_2", + "textures": { + "0": "bbb:block/block/stone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_3.json b/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_3.json new file mode 100644 index 00000000..e8f9188b --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/stone_block_chunk_3.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_block_chunk_3", + "textures": { + "0": "bbb:block/block/stone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_0.json b/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_0.json new file mode 100644 index 00000000..bd292374 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_0.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#0" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#0", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_1.json b/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_1.json new file mode 100644 index 00000000..2e9277d8 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_1.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#0" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 8, 12], + "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#0", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_2.json b/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_2.json new file mode 100644 index 00000000..f5e856f9 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_2.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#0" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 8, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#0", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_3.json b/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_3.json new file mode 100644 index 00000000..1e13de07 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/template_block_chunk_3.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#0" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 8, 12], + "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#0", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/template_wall_block_chunk.json b/common/src/main/resources/assets/bbb/models/block/block/template_wall_block_chunk.json new file mode 100644 index 00000000..c6bf0d8e --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/template_wall_block_chunk.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "0": "bbb:block/block/blackstone", + "particle": "#0" + }, + "elements": [ + { + "from": [4, 4, 8], + "to": [12, 12, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/wall_blackstone_block_chunk.json b/common/src/main/resources/assets/bbb/models/block/block/wall_blackstone_block_chunk.json new file mode 100644 index 00000000..02e9193f --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/wall_blackstone_block_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_wall_block_chunk", + "textures": { + "0": "bbb:block/block/blackstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/wall_deepslate_block_chunk.json b/common/src/main/resources/assets/bbb/models/block/block/wall_deepslate_block_chunk.json new file mode 100644 index 00000000..e37a9823 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/wall_deepslate_block_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_wall_block_chunk", + "textures": { + "0": "bbb:block/block/deepslate" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/wall_nether_brick_block_chunk.json b/common/src/main/resources/assets/bbb/models/block/block/wall_nether_brick_block_chunk.json new file mode 100644 index 00000000..27c00570 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/wall_nether_brick_block_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_wall_block_chunk", + "textures": { + "0": "bbb:block/block/nether_brick" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/wall_quartz_block_chunk.json b/common/src/main/resources/assets/bbb/models/block/block/wall_quartz_block_chunk.json new file mode 100644 index 00000000..6c5a9830 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/wall_quartz_block_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_wall_block_chunk", + "textures": { + "0": "bbb:block/block/quartz" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/wall_red_sandstone_block_chunk.json b/common/src/main/resources/assets/bbb/models/block/block/wall_red_sandstone_block_chunk.json new file mode 100644 index 00000000..fc02dc14 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/wall_red_sandstone_block_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_wall_block_chunk", + "textures": { + "0": "bbb:block/block/red_sandstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/wall_sandstone_block_chunk.json b/common/src/main/resources/assets/bbb/models/block/block/wall_sandstone_block_chunk.json new file mode 100644 index 00000000..aeba75d7 --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/wall_sandstone_block_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_wall_block_chunk", + "textures": { + "0": "bbb:block/block/sandstone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/block/block/wall_stone_block_chunk.json b/common/src/main/resources/assets/bbb/models/block/block/wall_stone_block_chunk.json new file mode 100644 index 00000000..d39e673b --- /dev/null +++ b/common/src/main/resources/assets/bbb/models/block/block/wall_stone_block_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "bbb:block/block/template_wall_block_chunk", + "textures": { + "0": "bbb:block/block/stone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bbb/models/item/blackstone_block.json b/common/src/main/resources/assets/bbb/models/item/blackstone_block.json index 8c313b5a..abf1728f 100644 --- a/common/src/main/resources/assets/bbb/models/item/blackstone_block.json +++ b/common/src/main/resources/assets/bbb/models/item/blackstone_block.json @@ -1,3 +1,25 @@ { - "parent": "bbb:block/block/blackstone" + "parent": "bbb:block/block/blackstone_block_chunk_0", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 1, 1, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 4, 0], + "scale":[ 1, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + } } diff --git a/common/src/main/resources/assets/bbb/models/item/deepslate_block.json b/common/src/main/resources/assets/bbb/models/item/deepslate_block.json index 131f2dd4..d3338372 100644 --- a/common/src/main/resources/assets/bbb/models/item/deepslate_block.json +++ b/common/src/main/resources/assets/bbb/models/item/deepslate_block.json @@ -1,3 +1,25 @@ { - "parent": "bbb:block/block/deepslate" + "parent": "bbb:block/block/deepslate_block_chunk_0", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 1, 1, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 4, 0], + "scale":[ 1, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + } } diff --git a/common/src/main/resources/assets/bbb/models/item/nether_brick_block.json b/common/src/main/resources/assets/bbb/models/item/nether_brick_block.json index d6e6143c..6f930db3 100644 --- a/common/src/main/resources/assets/bbb/models/item/nether_brick_block.json +++ b/common/src/main/resources/assets/bbb/models/item/nether_brick_block.json @@ -1,3 +1,25 @@ { - "parent": "bbb:block/block/nether_brick" + "parent": "bbb:block/block/nether_brick_block_chunk_0", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 1, 1, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 4, 0], + "scale":[ 1, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + } } diff --git a/common/src/main/resources/assets/bbb/models/item/oak_block.json b/common/src/main/resources/assets/bbb/models/item/oak_block.json deleted file mode 100644 index 4a2a12d7..00000000 --- a/common/src/main/resources/assets/bbb/models/item/oak_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bbb:block/block/oak" -} diff --git a/common/src/main/resources/assets/bbb/models/item/quartz_block.json b/common/src/main/resources/assets/bbb/models/item/quartz_block.json index 114797fb..9f814a04 100644 --- a/common/src/main/resources/assets/bbb/models/item/quartz_block.json +++ b/common/src/main/resources/assets/bbb/models/item/quartz_block.json @@ -1,3 +1,25 @@ { - "parent": "bbb:block/block/quartz" + "parent": "bbb:block/block/quartz_block_chunk_0", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 1, 1, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 4, 0], + "scale":[ 1, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + } } diff --git a/common/src/main/resources/assets/bbb/models/item/red_sandstone_block.json b/common/src/main/resources/assets/bbb/models/item/red_sandstone_block.json index 92129a06..6519adad 100644 --- a/common/src/main/resources/assets/bbb/models/item/red_sandstone_block.json +++ b/common/src/main/resources/assets/bbb/models/item/red_sandstone_block.json @@ -1,3 +1,25 @@ { - "parent": "bbb:block/block/red_sandstone" + "parent": "bbb:block/block/red_sandstone_block_chunk_0", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 1, 1, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 4, 0], + "scale":[ 1, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + } } diff --git a/common/src/main/resources/assets/bbb/models/item/sandstone_block.json b/common/src/main/resources/assets/bbb/models/item/sandstone_block.json index 8a4ea6bf..0397b358 100644 --- a/common/src/main/resources/assets/bbb/models/item/sandstone_block.json +++ b/common/src/main/resources/assets/bbb/models/item/sandstone_block.json @@ -1,3 +1,25 @@ { - "parent": "bbb:block/block/sandstone" + "parent": "bbb:block/block/sandstone_block_chunk_0", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 1, 1, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 4, 0], + "scale":[ 1, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + } } diff --git a/common/src/main/resources/assets/bbb/models/item/stone_block.json b/common/src/main/resources/assets/bbb/models/item/stone_block.json index cde967e3..579ad4a2 100644 --- a/common/src/main/resources/assets/bbb/models/item/stone_block.json +++ b/common/src/main/resources/assets/bbb/models/item/stone_block.json @@ -1,3 +1,25 @@ { - "parent": "bbb:block/block/stone" + "parent": "bbb:block/block/stone_block_chunk_0", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 1, 1, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 4, 0], + "scale":[ 1, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + } } diff --git a/common/src/main/resources/assets/bbb/textures/block/block/blackstone.png b/common/src/main/resources/assets/bbb/textures/block/block/blackstone.png index bd2c1cdf..194a7813 100644 Binary files a/common/src/main/resources/assets/bbb/textures/block/block/blackstone.png and b/common/src/main/resources/assets/bbb/textures/block/block/blackstone.png differ diff --git a/common/src/main/resources/assets/bbb/textures/block/block/deepslate.png b/common/src/main/resources/assets/bbb/textures/block/block/deepslate.png index c613af4c..934c0767 100644 Binary files a/common/src/main/resources/assets/bbb/textures/block/block/deepslate.png and b/common/src/main/resources/assets/bbb/textures/block/block/deepslate.png differ diff --git a/common/src/main/resources/assets/bbb/textures/block/block/nether_brick.png b/common/src/main/resources/assets/bbb/textures/block/block/nether_brick.png index 707dd09f..e7183296 100644 Binary files a/common/src/main/resources/assets/bbb/textures/block/block/nether_brick.png and b/common/src/main/resources/assets/bbb/textures/block/block/nether_brick.png differ diff --git a/common/src/main/resources/assets/bbb/textures/block/block/quartz.png b/common/src/main/resources/assets/bbb/textures/block/block/quartz.png index 5771c61b..6282133c 100644 Binary files a/common/src/main/resources/assets/bbb/textures/block/block/quartz.png and b/common/src/main/resources/assets/bbb/textures/block/block/quartz.png differ diff --git a/common/src/main/resources/assets/bbb/textures/block/block/red_sandstone.png b/common/src/main/resources/assets/bbb/textures/block/block/red_sandstone.png index 69f5e0a8..b6ae75ae 100644 Binary files a/common/src/main/resources/assets/bbb/textures/block/block/red_sandstone.png and b/common/src/main/resources/assets/bbb/textures/block/block/red_sandstone.png differ diff --git a/common/src/main/resources/assets/bbb/textures/block/block/sandstone.png b/common/src/main/resources/assets/bbb/textures/block/block/sandstone.png index c556f512..bc69763d 100644 Binary files a/common/src/main/resources/assets/bbb/textures/block/block/sandstone.png and b/common/src/main/resources/assets/bbb/textures/block/block/sandstone.png differ diff --git a/common/src/main/resources/assets/bbb/textures/block/block/stone.png b/common/src/main/resources/assets/bbb/textures/block/block/stone.png index ad1ec3c7..16eb5c7f 100644 Binary files a/common/src/main/resources/assets/bbb/textures/block/block/stone.png and b/common/src/main/resources/assets/bbb/textures/block/block/stone.png differ