Sleeping bag, stumps and baskets

Author: Patbox

changelog-next.txt

@@ -1,12 +1,19 @@
-- Added Long Flower Pot:
-  - New Flower Pot type that can hold 3 plants (same as regular Flower Pot). The plants can be of different types.
-  - It's rotated depending on player's facing direction.
-  - Crafted with Flower Pot and 2 Bricks.
-- Added Wind Chime:
-  - Decorative block, that moves in the wind.
-  - Can be dyed with up to 5 different dyes at the same time.
-  - Crafted with Chain, a Plank and 5 Iron Nuggets.
-- Canvas can now be placed on floors and ceilings.
-- Improved Tool Rack's hitbox, making it way smaller.
-- Tweaked some block particles.
-- Fixed Statues being visually in ground on first tick after placement.
+- Added Basket:
+  - Storage block that can hold up to 5 stacks of items.
+  - Keeps items inside when broken (like Shulker Boxes).
+  - When placed under Rope or Chains, it will visually move up to connect to it.
+  - Crafted with 2 Ropes, 5 Sticks and a Plank.
+- Added Sleeping Bags:
+  - A 2x1 block that allows you to skip the night (like Beds).
+  - Unlike a bed, it doesn't change player's spawn point.
+  - Crafted with 3 wool blocks.
+  - Has 16 colored variants.
+- Added Stumps:
+  - A small log-like block you can sit on.
+  - Crafted from 2 logs placed vertically.
+  - Comes in regular and stripped variants.
+- Renamed all Shelves to Plain Shelf, to make it distinct from 1.21.9 Vanilla Shelf block.
+- You can now place Hanging Signs on Ropes.
+- Tweaked placement of Sign Posts to pain in direction depending on side of targeted face that was clicked.
+- Fixed some statues using wrong block in recipe.
+- Fixed missing texture references logs on client.

gradle.properties

@@ -13,7 +13,7 @@ loom_version=1.10-SNAPSHOT
 fabric_version=0.128.2+1.21.7
 
 # Mod Properties
-	mod_version = 0.8.2
+	mod_version = 0.8.3
 	maven_group = eu.pb4
 	archives_base_name = polydecorations
 

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

@@ -32,6 +32,7 @@ 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<?> WIND_CHIME = register("wind_chime", WindChimeBlockEntity::new, DecorationsBlocks.WIND_CHIME);
 
     public static final BlockEntityType<?> DISPLAY_CASE = register("display_case",

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

@@ -15,6 +15,8 @@ public class DecorationsBlockTags {
     public static final TagKey<Block> TABLES = of("tables");
     public static final TagKey<Block> BRAZIERS = of("braziers");
     public static final TagKey<Block> SIGN_POSTS = of("sign_posts");
+    public static final TagKey<Block> STUMPS = of("stumps");
+    public static final TagKey<Block> SLEEPING_BAGS = of("stumps");
     public static final TagKey<Block> ALLOWED_INTERACTIONS_BLOCKS = TagKey.of(RegistryKeys.BLOCK, Identifier.of("goml", "allowed_interactions"));
 
     private static TagKey<Block> of(String path) {

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

@@ -7,12 +7,15 @@
 import eu.pb4.polydecorations.block.extension.WallAttachedLanternBlock;
 import eu.pb4.polydecorations.block.other.GhostLightBlock;
 import eu.pb4.polydecorations.block.other.RopeBlock;
+import eu.pb4.polydecorations.util.DecorationsUtil;
 import eu.pb4.polydecorations.util.WoodUtil;
 import eu.pb4.polymer.core.api.block.PolymerBlock;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
+import net.fabricmc.fabric.api.registry.StrippableBlockRegistry;
 import net.minecraft.block.*;
 import net.minecraft.block.enums.NoteBlockInstrument;
+import net.minecraft.block.piston.PistonBehavior;
 import net.minecraft.loot.LootTable;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.Registries;
@@ -55,6 +58,12 @@ public class DecorationsBlocks {
     public static final WindChimeBlock WIND_CHIME = register("wind_chime", AbstractBlock.Settings.copy(Blocks.GLASS).nonOpaque(), WindChimeBlock::new);
     public static final TrashCanBlock TRASHCAN = register("trashcan", settings -> new TrashCanBlock(settings
             .mapColor(MapColor.IRON_GRAY).strength(3.5F).sounds(BlockSoundGroup.LANTERN).nonOpaque()));
+
+    public static final BasketBlock BASKET = register("basket", settings -> new BasketBlock(settings
+            .mapColor(MapColor.OAK_TAN).strength(0.5F)
+            .burnable()
+            .sounds(BlockSoundGroup.SCAFFOLDING).nonOpaque()));
+
     public static final LargeFlowerPotBlock LARGE_FLOWER_POT = register("large_flower_pot", settings -> new LargeFlowerPotBlock(settings
             .mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.25F).nonOpaque()));
 
@@ -117,6 +126,40 @@ public class DecorationsBlocks {
         return null;
     });
 
+    public static final Map<WoodType, StumpBlock> STUMP = registerWood("stump", (x, id, settings) -> {
+        var log = Identifier.of(WoodUtil.getLogName(x));
+
+        if (Registries.BLOCK.containsId(log)) {
+            var logBlock = Registries.BLOCK.get(log);
+
+            return new StumpBlock(
+                    AbstractBlock.Settings.copy(logBlock).mapColor(logBlock.getDefaultMapColor()).registryKey(RegistryKey.of(RegistryKeys.BLOCK, id)).nonOpaque()
+                            .solidBlock(Blocks::never),
+                    logBlock
+            );
+        }
+
+        return null;
+    });
+
+    public static final Map<WoodType, StumpBlock> STRIPPED_STUMP = registerWood("stripped_", "stump", (x, id, settings) -> {
+        var log = Identifier.of("stripped_" + WoodUtil.getLogName(x));
+
+        if (Registries.BLOCK.containsId(log)) {
+            var logBlock = Registries.BLOCK.get(log);
+
+            var b = new StumpBlock(
+                    AbstractBlock.Settings.copy(logBlock).mapColor(logBlock.getDefaultMapColor()).registryKey(RegistryKey.of(RegistryKeys.BLOCK, id)).nonOpaque()
+                            .solidBlock(Blocks::never),
+                    logBlock
+            );
+            //StrippableBlockRegistry.register(STUMP.get(x), b);
+            return b;
+        }
+
+        return null;
+    });
+
     public static final Map<WoodType, AttachedSignPostBlock> WOOD_SIGN_POST = registerWood("sign_post", (x, id, settings) -> {
         var planks = Identifier.of(x.name() + "_fence");
         var block = Registries.BLOCK.get(planks);
@@ -127,6 +170,16 @@ public class DecorationsBlocks {
         return null;
     });
 
+    public static final Map<DyeColor, SleepingBagBlock> SLEEPING_BAG = registerDye("sleeping_bag", (x, id, settings) -> {
+        var bed = Identifier.of(x.asString() + "_bed");
+        var block = Registries.BLOCK.get(bed);
+        if (block instanceof BedBlock) {
+            return new SleepingBagBlock(x, AbstractBlock.Settings.copy(block).pistonBehavior(PistonBehavior.BLOCK).registryKey(RegistryKey.of(RegistryKeys.BLOCK, id)));
+        }
+
+        return null;
+    });
+
     public static final Map<Block, AttachedSignPostBlock> WALL_SIGN_POST = Util.make(() -> {
       var map = new HashMap<Block, AttachedSignPostBlock>();
       var l = new ArrayList<Block>();
@@ -156,10 +209,13 @@ public class DecorationsBlocks {
     });
 
     private static <T extends Block & PolymerBlock> Map<WoodType, T> registerWood(String id, TriFunction<WoodType, Identifier, AbstractBlock.Settings, T> object) {
+        return registerWood("", id, object);
+    }
+    private static <T extends Block & PolymerBlock> Map<WoodType, T> registerWood(String prefix, String id, TriFunction<WoodType, Identifier, AbstractBlock.Settings, T> object) {
         var map = new HashMap<WoodType, T>();
 
         WoodUtil.VANILLA.forEach(x -> {
-            var y = register(x.name() + "_" + id, (s) -> object.apply(x, id(x.name() + "_" + id), s));
+            var y = register(prefix + x.name() + "_" + id, (s) -> object.apply(x,  id(prefix + x.name() + "_" + id), s));
             if (y != null) {
                 map.put(x, y);
             }
@@ -168,13 +224,13 @@ private static <T extends Block & PolymerBlock> Map<WoodType, T> registerWood(St
         return map;
     }
 
-    private static <T extends Block & PolymerBlock> Map<DyeColor, T> registerDye(String id, Function<DyeColor, T> object) {
+    private static <T extends Block & PolymerBlock> Map<DyeColor, T> registerDye(String id, TriFunction<DyeColor, Identifier, AbstractBlock.Settings, T> object) {
         var map = new HashMap<DyeColor, T>();
 
         for (var x : DyeColor.values()) {
-            var y = object.apply(x);
+            var y = register( x.asString() + "_" + id, (s) -> object.apply(x, id(x.asString() + "_" + id), s));
             if (y != null) {
-                map.put(x, register(x.name().toLowerCase(Locale.ROOT) + "_" + id, (s) -> y));
+                map.put(x, y);
             }
         }
 

src/main/java/eu/pb4/polydecorations/block/extension/SignPostBlockEntity.java

@@ -214,8 +214,8 @@ public static Sign of() {
             return new Sign(new SignText(), Items.AIR, 0, false, false);
         }
 
-        public static Sign of(Item item, float yaw) {
-            return new Sign(new SignText(), item, yaw, false, false);
+        public static Sign of(Item item, float yaw, boolean flip) {
+            return new Sign(new SignText(), item, yaw, false, flip);
         }
 
         public Sign withText(SignText text) {

src/main/java/eu/pb4/polydecorations/block/furniture/SleepingBagBlock.java

@@ -0,0 +1,64 @@
+package eu.pb4.polydecorations.block.furniture;
+
+import eu.pb4.factorytools.api.block.FactoryBlock;
+import eu.pb4.factorytools.api.virtualentity.BlockModel;
+import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil;
+import eu.pb4.polydecorations.mixin.LivingEntityAccessor;
+import eu.pb4.polydecorations.util.DecorationsUtil;
+import eu.pb4.polymer.blocks.api.PolymerTexturedBlock;
+import eu.pb4.polymer.core.api.utils.PolymerUtils;
+import eu.pb4.polymer.virtualentity.api.ElementHolder;
+import eu.pb4.polymer.virtualentity.api.elements.ItemDisplayElement;
+import net.minecraft.block.BedBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.enums.BedPart;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.data.DataTracker;
+import net.minecraft.item.ItemDisplayContext;
+import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.DyeColor;
+import net.minecraft.util.TypeFilter;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import org.jetbrains.annotations.Nullable;
+import org.joml.Vector3f;
+import xyz.nucleoid.packettweaker.PacketContext;
+
+import java.util.List;
+import java.util.Optional;
+
+public class SleepingBagBlock extends BedBlock implements FactoryBlock, PolymerTexturedBlock {
+    public SleepingBagBlock(DyeColor color, Settings settings) {
+        super(color, settings);
+    }
+
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return null;
+    }
+
+    @Override
+    public BlockState getPolymerBlockState(BlockState blockState, PacketContext packetContext) {
+        return DecorationsUtil.TRAPDOOR_STATES_REGULAR.get(Direction.UP);
+    }
+
+    @Override
+    public @Nullable ElementHolder createElementHolder(ServerWorld world, BlockPos pos, BlockState initialBlockState) {
+        return initialBlockState.get(PART) == BedPart.FOOT ? new Model(initialBlockState, pos) : null;
+    }
+
+    public static final class Model extends BlockModel {
+        private final ItemDisplayElement main;
+
+        public Model(BlockState state, BlockPos pos) {
+            this.main = ItemDisplayElementUtil.createSimple(state.getBlock().asItem());
+            this.main.setDisplaySize(2, 2);
+            this.main.setItemDisplayContext(ItemDisplayContext.NONE);
+            //this.main.setTranslation(new Vector3f(0, 0, 0.5f));
+            this.main.setYaw(state.get(FACING).getPositiveHorizontalDegrees());
+            this.addElement(this.main);
+        }
+    }
+}

src/main/java/eu/pb4/polydecorations/block/furniture/StumpBlock.java

@@ -0,0 +1,98 @@
+package eu.pb4.polydecorations.block.furniture;
+
+import com.mojang.serialization.MapCodec;
+import eu.pb4.factorytools.api.block.BarrierBasedWaterloggable;
+import eu.pb4.factorytools.api.block.FactoryBlock;
+import eu.pb4.factorytools.api.virtualentity.BlockModel;
+import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil;
+import eu.pb4.polydecorations.entity.SeatEntity;
+import eu.pb4.polymer.virtualentity.api.ElementHolder;
+import eu.pb4.polymer.virtualentity.api.elements.ItemDisplayElement;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.BlockWithEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.Fluids;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.state.StateManager;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.random.Random;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldView;
+import net.minecraft.world.tick.ScheduledTickView;
+import org.jetbrains.annotations.Nullable;
+import org.joml.Vector3f;
+import xyz.nucleoid.packettweaker.PacketContext;
+
+public class StumpBlock extends Block implements FactoryBlock, BarrierBasedWaterloggable {
+    private final Block base;
+
+    public StumpBlock(Settings settings, Block log) {
+        super(settings);
+        this.setDefaultState(this.getDefaultState().with(WATERLOGGED, false));
+        this.base = log;
+    }
+
+    @Override
+    public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext player) {
+        return this.base.getDefaultState();
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(WATERLOGGED);
+    }
+
+    public FluidState getFluidState(BlockState state) {
+        return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state);
+    }
+
+    @Nullable
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext ctx) {
+        return waterLog(ctx, this.getDefaultState());
+    }
+
+    @Override
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
+        if (!player.isSneaking() && SeatEntity.create(world, pos, 3 / 16f, null, player)) {
+            return ActionResult.SUCCESS_SERVER;
+        }
+
+        return super.onUse(state, world, pos, player, hit);
+    }
+
+
+    @Override
+    protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) {
+        tickWater(state, world, tickView, pos);
+        return state;
+    }
+
+    @Override
+    protected MapCodec<? extends BlockWithEntity> getCodec() {
+        return null;
+    }
+
+    @Override
+    public @Nullable ElementHolder createElementHolder(ServerWorld world, BlockPos pos, BlockState initialBlockState) {
+        return new Model(initialBlockState, pos);
+    }
+
+    public static final class Model extends BlockModel {
+        private final ItemDisplayElement main;
+
+        public Model(BlockState state, BlockPos pos) {
+            this.main = ItemDisplayElementUtil.createSimple(state.getBlock().asItem());
+            this.main.setDisplaySize(1, 1);
+            this.main.setScale(new Vector3f(2));
+            this.main.setYaw(Random.create(pos.hashCode()).nextInt(4) * 90);
+            this.addElement(this.main);
+        }
+    }
+}