🐺📖

Author: AmarokIce

src/main/java/top/ctnstudio/futurefood/common/block/QedEntityBlock.java

@@ -8,7 +8,6 @@
 import net.minecraft.util.StringRepresentable;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
@@ -23,6 +22,7 @@
 import net.minecraft.world.level.block.state.StateDefinition.Builder;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
@@ -45,7 +45,6 @@
 
 import static top.ctnstudio.futurefood.util.BlockEntyUtil.getBlockEntityFromLevel;
 
-// TODO 破坏不掉落库存物品
 public class QedEntityBlock extends DirectionEntityBlock<QedBlockEntity> implements IEntityStorageBlock, SimpleWaterloggedBlock {
   private static final MapCodec<QedEntityBlock> CODEC = simpleCodec(QedEntityBlock::new);
   public static final EnumProperty<Activate> ACTIVATE = EnumProperty.create("activate", Activate.class);
@@ -161,11 +160,22 @@ protected VoxelShape getVisualShape(BlockState state, BlockGetter getter,
   }
 
   @Override
-  protected void spawnAfterBreak(BlockState state, ServerLevel level, BlockPos pos, ItemStack stack,
-                                 boolean dropExperience) {
-    final var tile = getBlockEntity(level, pos);
-    EntityItemUtil.summonLootItems(level, pos, tile.getEnergyItemStack().copy());
+  public boolean onDestroyedByPlayer(BlockState state, Level world, BlockPos pos, Player player,
+                                     boolean willHarvest, FluidState fluid) {
+    if (world.isClientSide()) {
+      return true;
+    }
+
+    final ServerLevel serverWorld = (ServerLevel) world;
+    final var tile = getBlockEntity(serverWorld, pos);
+    if (!(tile instanceof QedBlockEntity)) {
+      return true;
+    }
+
+    EntityItemUtil.summonLootItems(serverWorld, pos, tile.getEnergyItemStack().copy());
     tile.clearContent();
+
+    return true;
   }
 
   @Override

src/main/java/top/ctnstudio/futurefood/common/block/tile/QedBlockEntity.java

@@ -23,7 +23,6 @@
 import static top.ctnstudio.futurefood.util.ModUtil.getOppositeDirection;
 
 // TODO 添加配置功能
-// TODO 每次重启世界链接丢失
 public class QedBlockEntity extends EnergyStorageBlockEntity<EnergyMenu> {
   public static final int DEFAULT_MAX_REMAINING_TIME = 5;
   protected final UnlimitedLinkStorage linkStorage; // 无限链接存储
@@ -55,7 +54,7 @@ public QedBlockEntity(BlockEntityType<? extends QedBlockEntity> type, BlockPos p
   @Override
   protected void loadAdditional(CompoundTag nbt, Provider provider) {
     super.loadAdditional(nbt, provider);
-    linkStorage.deserializeNBT(provider, nbt);
+    linkStorage.deserializeNBT(provider, nbt.getCompound("linkStorage"));
     remainingTime = nbt.getInt("remainingTime");
     if (!nbt.contains("maxRemainingTime")) {
       maxRemainingTime = DEFAULT_MAX_REMAINING_TIME;
@@ -69,7 +68,7 @@ protected void loadAdditional(CompoundTag nbt, Provider provider) {
   @Override
   protected void saveAdditional(CompoundTag nbt, Provider provider) {
     super.saveAdditional(nbt, provider);
-    linkStorage.serializeNBT(provider);
+    nbt.put("linkStorage", linkStorage.serializeNBT(provider));
     nbt.putInt("remainingTime", remainingTime);
     nbt.putInt("maxRemainingTime", maxRemainingTime);
   }
@@ -149,16 +148,6 @@ public int getMaxRemainingTime() {
     return maxRemainingTime;
   }
 
-  @Override
-  public void onChunkUnloaded() {
-    final var pos = this.getBlockPos();
-  }
-
-  @Override
-  public void onLoad() {
-    final var pos = this.getBlockPos();
-  }
-
   public IUnlimitedLinkStorage getUnlimitedStorage() {
     return linkStorage;
   }