Add Cardboard Box

Author: Patbox

changelog-next.txt

@@ -1,4 +1,3 @@
-- Added Copper Campfire and Copper Brazier.
-- Copper Lanterns can now be placed on walls.
-- Changed hitbox of Long Flower Pot, Basket and Benches to be half block high.
-- Fixed Plain Shelf loosing items when placing additional one in block.
+- Added Cardboard Box:
+  - Similar block to existing Basket (Shulker Box like with only 5 slots).
+  - Crafted with 4 Planks, 4 Papers and 1 Slime Ball.

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-minecraft_version=1.21.11-rc3
-yarn_mappings=1.21.11-rc3+build.1
-loader_version=0.18.1
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.1
+loader_version=0.18.2
 loom_version=1.10-SNAPSHOT
 
 # Fabric API
-fabric_version=0.139.4+1.21.11
+fabric_version=0.139.5+1.21.11
 
 # Mod Properties
-	mod_version = 0.10.0
+	mod_version = 0.10.1
 	maven_group = eu.pb4
 	archives_base_name = polydecorations
 

src/main/java/eu/pb4/polydecorations/block/DecorationsBlockEntities.java

@@ -17,6 +17,8 @@
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import java.util.ArrayList;
 
+import static eu.pb4.polydecorations.ModInit.id;
+
 public class DecorationsBlockEntities {
     public static final BlockEntityType<?> SHELF = register("shelf", ShelfBlockEntity::new, DecorationsBlocks.SHELF.values().toArray(new PlainShelfBlock[0]));
     public static final BlockEntityType<?> SIGN_POST = register("sign_post", SignPostBlockEntity::new,
@@ -31,7 +33,8 @@ public class DecorationsBlockEntities {
             DecorationsBlocks.WOODEN_MAILBOX.values().toArray(new Block[0]));
     public static final BlockEntityType<?> GLOBE = register("globe", GenericSingleItemBlockEntity::globe, DecorationsBlocks.GLOBE);
     public static final BlockEntityType<?> TRASHCAN = register("trashcan", TrashCanBlockEntity::new, DecorationsBlocks.TRASHCAN);
-    public static final BlockEntityType<?> BASKET = register("basket", BasketBlockEntity::new, DecorationsBlocks.BASKET);
+    public static final BlockEntityType<?> GENERIC_PICKABLE_STORAGE = register("generic_pickable_storage", PickableItemContainerBlockEntity::new,
+            DecorationsBlocks.BASKET, DecorationsBlocks.CARDBOARD_BOX);
     public static final BlockEntityType<?> WIND_CHIME = register("wind_chime", WindChimeBlockEntity::new, DecorationsBlocks.WIND_CHIME);
 
     public static final BlockEntityType<?> DISPLAY_CASE = register("display_case",
@@ -62,5 +65,6 @@ public static <T extends BlockEntity> BlockEntityType<T> register(String path, F
     }
 
     public static void register() {
+        BuiltInRegistries.BLOCK_ENTITY_TYPE.addAlias(id("basket"), id("generic_pickable_storage"));
     }
 }

src/main/java/eu/pb4/polydecorations/block/DecorationsBlocks.java

@@ -8,6 +8,7 @@
 import eu.pb4.polydecorations.block.item.*;
 import eu.pb4.polydecorations.block.other.GhostLightBlock;
 import eu.pb4.polydecorations.block.other.RopeBlock;
+import eu.pb4.polydecorations.util.DecorationSoundEvents;
 import eu.pb4.polydecorations.util.WoodUtil;
 import eu.pb4.polymer.core.api.block.PolymerBlock;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
@@ -87,11 +88,16 @@ public class DecorationsBlocks {
     public static final TrashCanBlock TRASHCAN = register("trashcan", settings -> new TrashCanBlock(settings
             .mapColor(MapColor.METAL).strength(3.5F).sound(SoundType.LANTERN).noOcclusion()));
 
-    public static final BasketBlock BASKET = register("basket", settings -> new BasketBlock(settings
+    public static final PickableItemContainerBlock BASKET = register("basket", settings -> new BasketBlock(settings
             .mapColor(MapColor.WOOD).strength(0.5F)
             .ignitedByLava()
             .sound(SoundType.SCAFFOLDING).noOcclusion()));
 
+    public static final PickableItemContainerBlock CARDBOARD_BOX = register("cardboard_box", settings -> new PickableItemContainerBlock(settings
+            .mapColor(MapColor.WOOD).strength(0.4F)
+            .ignitedByLava()
+            .sound(SoundType.SCAFFOLDING).noOcclusion(), DecorationSoundEvents.BASKET_OPEN, DecorationSoundEvents.BASKET_CLOSE));
+
     public static final LargeFlowerPotBlock LARGE_FLOWER_POT = register("large_flower_pot", settings -> new LargeFlowerPotBlock(settings
             .mapColor(MapColor.COLOR_ORANGE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.25F).noOcclusion()));
 

src/main/java/eu/pb4/polydecorations/block/item/BasketBlock.java

@@ -1,12 +1,12 @@
 package eu.pb4.polydecorations.block.item;
 
 import com.mojang.serialization.MapCodec;
-import eu.pb4.factorytools.api.block.BarrierBasedWaterloggable;
 import eu.pb4.factorytools.api.block.FactoryBlock;
 import eu.pb4.factorytools.api.block.QuickWaterloggable;
 import eu.pb4.factorytools.api.virtualentity.BlockModel;
 import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil;
 import eu.pb4.polydecorations.block.DecorationsBlocks;
+import eu.pb4.polydecorations.util.DecorationSoundEvents;
 import eu.pb4.polydecorations.util.DecorationsUtil;
 import eu.pb4.polymer.blocks.api.PolymerTexturedBlock;
 import eu.pb4.polymer.virtualentity.api.ElementHolder;
@@ -18,6 +18,7 @@
 import net.minecraft.resources.Identifier;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.Containers;
 import net.minecraft.world.InteractionResult;
@@ -28,11 +29,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.ScheduledTickAccess;
-import net.minecraft.world.level.block.BaseEntityBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.ChainBlock;
-import net.minecraft.world.level.block.ShulkerBoxBlock;
+import net.minecraft.world.level.block.*;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
@@ -53,21 +50,19 @@
 
 import static eu.pb4.polydecorations.util.DecorationsUtil.id;
 
-public class BasketBlock extends BaseEntityBlock implements FactoryBlock, QuickWaterloggable, PolymerTexturedBlock {
-    public static final Identifier CONTENTS_DYNAMIC_DROP_ID = ShulkerBoxBlock.CONTENTS;
-
-    public static final EnumProperty<Direction> FACING = BlockStateProperties.HORIZONTAL_FACING;
-    public static final BooleanProperty OPEN = BlockStateProperties.OPEN;
+public class BasketBlock extends PickableItemContainerBlock {
     public static final BooleanProperty HANGING = BlockStateProperties.HANGING;
 
+
     public BasketBlock(Properties settings) {
-        super(settings);
-        this.registerDefaultState(this.defaultBlockState().setValue(WATERLOGGED, false).setValue(OPEN, false).setValue(HANGING, false));
+        super(settings, DecorationSoundEvents.BASKET_OPEN, DecorationSoundEvents.BASKET_CLOSE);
+        this.registerDefaultState(this.defaultBlockState().setValue(HANGING, false));
     }
 
     @Override
     protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-        builder.add(WATERLOGGED, FACING, OPEN, HANGING);
+        super.createBlockStateDefinition(builder);
+        builder.add(HANGING);
     }
 
     @Nullable
@@ -76,56 +71,6 @@ public BlockState getStateForPlacement(BlockPlaceContext ctx) {
         return waterLog(ctx, this.defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getOpposite()).setValue(HANGING, canHangingOn(ctx.getLevel(), ctx.getClickedPos().above())));
     }
 
-    @Override
-    public InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-        if (!player.isShiftKeyDown() && world.getBlockEntity(pos) instanceof BasketBlockEntity be) {
-            be.openGui((ServerPlayer) player);
-            return InteractionResult.SUCCESS_SERVER;
-        }
-
-        return InteractionResult.PASS;
-    }
-
-    @Override
-    protected void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
-        if (world.getBlockEntity(pos) instanceof BasketBlockEntity be) {
-            be.tick();
-        }
-    }
-
-
-    @Override
-    public BlockState playerWillDestroy(Level world, BlockPos pos, BlockState state, Player player) {
-        if (world.getBlockEntity(pos) instanceof BasketBlockEntity be) {
-            if (!world.isClientSide() && player.preventsBlockDrops() && !be.isEmpty()) {
-                var itemStack = this.asItem().getDefaultInstance();
-                itemStack.applyComponents(be.collectComponents());
-                ItemEntity itemEntity = new ItemEntity(world, (double) pos.getX() + 0.5, (double) pos.getY() + 0.5, (double) pos.getZ() + 0.5, itemStack);
-                itemEntity.setDefaultPickUpDelay();
-                world.addFreshEntity(itemEntity);
-            } else {
-                //be.generateLoot(player);
-            }
-        }
-
-        return super.playerWillDestroy(world, pos, state, player);
-    }
-
-    @Override
-    protected List<ItemStack> getDrops(BlockState state, LootParams.Builder builder) {
-        BlockEntity blockEntity = builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY);
-        if (blockEntity instanceof ShulkerBoxBlockEntity be) {
-            builder = builder.withDynamicDrop(CONTENTS_DYNAMIC_DROP_ID, (lootConsumer) -> {
-                for (int i = 0; i < be.getContainerSize(); ++i) {
-                    lootConsumer.accept(be.getItem(i));
-                }
-
-            });
-        }
-
-        return super.getDrops(state, builder);
-    }
-
     @Override
     public BlockState getPolymerBlockState(BlockState blockState, PacketContext packetContext) {
         return blockState.getValue(WATERLOGGED) ? DecorationsUtil.CAMPFIRE_WATERLOGGED_STATE : DecorationsUtil.CAMPFIRE_STATE;
@@ -148,45 +93,21 @@ protected BlockState updateShape(BlockState state, LevelReader world, ScheduledT
 
     private boolean canHangingOn(LevelReader world, BlockPos up) {
         var state = world.getBlockState(up);
-
         return state.is(DecorationsBlocks.ROPE) || state.getBlock() instanceof ChainBlock && state.getValue(ChainBlock.AXIS) == Direction.Axis.Y;
     }
 
-    public FluidState getFluidState(BlockState state) {
-        return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
-    }
-
-    @Override
-    protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel world, BlockPos pos, boolean moved) {
-        Containers.updateNeighboursAfterDestroy(state, world, pos);
-        super.affectNeighborsAfterRemoval(state, world, pos, moved);
-    }
-
-    @Override
-    protected MapCodec<? extends BaseEntityBlock> codec() {
-        return null;
-    }
-
     @Override
     public @Nullable ElementHolder createElementHolder(ServerLevel world, BlockPos pos, BlockState initialBlockState) {
         return new Model(world, initialBlockState);
     }
 
-    @Nullable
-    @Override
-    public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
-        return new BasketBlockEntity(pos, state);
-    }
-
-    public static final class Model extends BlockModel {
-        public static final ItemStack BASKET_OPEN = ItemDisplayElementUtil.getModel(id("block/basket_open"));
-        public static final ItemStack BASKET_CLOSE = ItemDisplayElementUtil.getModel(id("block/basket_closed"));
+    public final class Model extends BlockModel {
         private final ItemDisplayElement main;
 
         public Model(ServerLevel world, BlockState state) {
             var direction = state.getValue(FACING).toYRot();
 
-            this.main = ItemDisplayElementUtil.createSimple(state.getValue(OPEN) ? BASKET_OPEN : BASKET_CLOSE);
+            this.main = ItemDisplayElementUtil.createSimple(state.getValue(OPEN) ? modelOpen : modelClosed);
             this.main.setScale(new Vector3f(2));
             this.main.setTranslation(new Vector3f(0, state.getValue(HANGING) ? 3 / 16f - 0.005f : 0.005f, 0));
             this.main.setYaw(direction);
@@ -200,7 +121,7 @@ public void notifyUpdate(HolderAttachment.UpdateType updateType) {
                 var direction = state.getValue(FACING).toYRot();
                 this.main.setYaw(direction);
                 this.main.setTranslation(new Vector3f(0, state.getValue(HANGING) ? 3 / 16f - 0.005f : 0.005f, 0));
-                this.main.setItem(state.getValue(OPEN) ? BASKET_OPEN : BASKET_CLOSE);
+                this.main.setItem(state.getValue(OPEN) ?  modelOpen : modelClosed);
                 this.tick();
             }
         }