From 8208e932640794e695eb389a57e422096e0fc2b7 Mon Sep 17 00:00:00 2001 From: skyinr <2587135207@qq.com> Date: Wed, 9 Aug 2023 18:11:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E5=91=BD=E5=90=8D=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oardBlock.java => ChoppingBoardBlock.java} | 22 +++++++++---------- .../sinofeast/block/SFBlockItems.java | 4 ++-- .../sinocraft/sinofeast/block/SFBlocks.java | 2 +- ...ity.java => ChoppingBoardBlockEntity.java} | 18 +++++++-------- .../block/entity/SFBlockEntities.java | 6 ++--- 5 files changed, 26 insertions(+), 26 deletions(-) rename SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/{CoppingBoardBlock.java => ChoppingBoardBlock.java} (80%) rename SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/{CoppingBoardBlockEntity.java => ChoppingBoardBlockEntity.java} (73%) diff --git a/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/CoppingBoardBlock.java b/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/ChoppingBoardBlock.java similarity index 80% rename from SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/CoppingBoardBlock.java rename to SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/ChoppingBoardBlock.java index acf4e8cd..cd467e2a 100644 --- a/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/CoppingBoardBlock.java +++ b/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/ChoppingBoardBlock.java @@ -1,7 +1,7 @@ package games.moegirl.sinocraft.sinofeast.block; import games.moegirl.sinocraft.sinocore.block.AbstractEntityBlock; -import games.moegirl.sinocraft.sinofeast.block.entity.CoppingBoardBlockEntity; +import games.moegirl.sinocraft.sinofeast.block.entity.ChoppingBoardBlockEntity; import games.moegirl.sinocraft.sinofeast.block.entity.SFBlockEntities; import games.moegirl.sinocraft.sinofeast.item.SFItems; import games.moegirl.sinocraft.sinofeast.utility.IFood; @@ -22,11 +22,11 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.items.IItemHandler; -public class CoppingBoardBlock extends AbstractEntityBlock { +public class ChoppingBoardBlock extends AbstractEntityBlock { public static final VoxelShape SHAPE = Block.box(2, 0, 2, 14, 2, 14); - public CoppingBoardBlock() { - super(Properties.of(), SFBlockEntities.COPPING_BOARD_BLOCK_ENTITY); + public ChoppingBoardBlock() { + super(Properties.of(), SFBlockEntities.CHOPPING_BOARD_BLOCK_ENTITY); } @Override @@ -40,26 +40,26 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player if (hand == InteractionHand.MAIN_HAND) { ItemStack itemInHand = player.getItemInHand(hand); - if (state.getBlock() instanceof CoppingBoardBlock coppingBoardBlock) { - CoppingBoardBlockEntity blockEntity = coppingBoardBlock.getBlockEntity(level, pos); + if (state.getBlock() instanceof ChoppingBoardBlock choppingBoardBlock) { + ChoppingBoardBlockEntity blockEntity = choppingBoardBlock.getBlockEntity(level, pos); IItemHandler iItemHandler = blockEntity.getCapability(ForgeCapabilities.ITEM_HANDLER).orElseThrow(RuntimeException::new); - ItemStack inFood = iItemHandler.getStackInSlot(CoppingBoardBlockEntity.INPUT); + ItemStack inFood = iItemHandler.getStackInSlot(ChoppingBoardBlockEntity.INPUT); if (itemInHand.is(SFItems.KITCHEN_KNIFE.get())) { ItemStack copy = inFood.copy(); inFood.setCount(inFood.getCount() - 1); copy.setCount(1); copy.addTagElement("shred", ByteTag.valueOf(true)); - iItemHandler.insertItem(CoppingBoardBlockEntity.OUTPUT, copy, false); + iItemHandler.insertItem(ChoppingBoardBlockEntity.OUTPUT, copy, false); } else if (itemInHand.isEmpty()) { if (player.isShiftKeyDown()) { - ItemStack outItem = iItemHandler.extractItem(CoppingBoardBlockEntity.OUTPUT, 64, false); + ItemStack outItem = iItemHandler.extractItem(ChoppingBoardBlockEntity.OUTPUT, 64, false); if (!outItem.isEmpty()) { level.addFreshEntity(new ItemEntity(level, pos.getX(), pos.getY() + 0.5, pos.getZ(), outItem)); } } else { - ItemStack inItem = iItemHandler.extractItem(CoppingBoardBlockEntity.INPUT, 64, false); + ItemStack inItem = iItemHandler.extractItem(ChoppingBoardBlockEntity.INPUT, 64, false); if (!inItem.isEmpty()) { level.addFreshEntity(new ItemEntity(level, pos.getX(), pos.getY() + 0.5, pos.getZ(), inItem)); } @@ -67,7 +67,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player } else if (itemInHand.getItem() instanceof IFood){ - player.setItemInHand(hand, iItemHandler.insertItem(CoppingBoardBlockEntity.INPUT, itemInHand, false)); + player.setItemInHand(hand, iItemHandler.insertItem(ChoppingBoardBlockEntity.INPUT, itemInHand, false)); } } } diff --git a/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/SFBlockItems.java b/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/SFBlockItems.java index 93e9b381..13b5d56e 100644 --- a/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/SFBlockItems.java +++ b/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/SFBlockItems.java @@ -21,9 +21,9 @@ public static void register(IEventBus bus) { .addItem(TEA_TREE); TabsRegistry.items(SinoSeriesTabs.FUNCTIONAL_BLOCKS) - .addItem(COPPING_BOARD); + .addItem(CHOPPING_BOARD); } public static final RegistryObject TEA_TREE = BLOCK_ITEMS.register("tea_tree", () -> new ItemNameBlockItem(SFBlocks.TEA_TREE_BLOCK.get(), new Item.Properties())); - public static final RegistryObject COPPING_BOARD = BLOCK_ITEMS.register("copping_board", () -> new ItemNameBlockItem(SFBlocks.COPPING_BOARD_BLOCK.get(), new Item.Properties())); + public static final RegistryObject CHOPPING_BOARD = BLOCK_ITEMS.register("chopping_board", () -> new ItemNameBlockItem(SFBlocks.CHOPPING_BOARD_BLOCK.get(), new Item.Properties())); } diff --git a/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/SFBlocks.java b/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/SFBlocks.java index 394a3430..9fa1d1f0 100644 --- a/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/SFBlocks.java +++ b/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/SFBlocks.java @@ -16,5 +16,5 @@ public static void register(IEventBus bus) { public static final RegistryObject TEA_TREE_BLOCK = BLOCKS.register("tea_tree", TeaTreeBlock::new); - public static final RegistryObject COPPING_BOARD_BLOCK = BLOCKS.register("copping_board", CoppingBoardBlock::new); + public static final RegistryObject CHOPPING_BOARD_BLOCK = BLOCKS.register("chopping_board", ChoppingBoardBlock::new); } diff --git a/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/CoppingBoardBlockEntity.java b/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/ChoppingBoardBlockEntity.java similarity index 73% rename from SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/CoppingBoardBlockEntity.java rename to SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/ChoppingBoardBlockEntity.java index f369bcf9..8e2d5906 100644 --- a/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/CoppingBoardBlockEntity.java +++ b/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/ChoppingBoardBlockEntity.java @@ -14,21 +14,22 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class CoppingBoardBlockEntity extends BlockEntity { +public class ChoppingBoardBlockEntity extends BlockEntity { public static final int INPUT = 0; public static final int OUTPUT = 1; private LazyOptional foodHandler; - public static final String FOOD = "food"; - public CoppingBoardBlockEntity(BlockPos arg2, BlockState arg3) { - super(SFBlockEntities.COPPING_BOARD_BLOCK_ENTITY.get(), arg2, arg3); + public static final String INPUT_FOOD = "input_food"; + public static final String OUTPUT_FOOD = "output_food"; + public ChoppingBoardBlockEntity(BlockPos arg2, BlockState arg3) { + super(SFBlockEntities.CHOPPING_BOARD_BLOCK_ENTITY.get(), arg2, arg3); } @Override public void handleUpdateTag(CompoundTag tag) { super.handleUpdateTag(tag); var food = getCapability(ForgeCapabilities.ITEM_HANDLER).orElseThrow(RuntimeException::new); - deserializeCaps(tag); - food.insertItem(0, ItemStack.of(tag.getCompound(FOOD)),false); + food.insertItem(INPUT, ItemStack.of(tag.getCompound(INPUT_FOOD)),false); + food.insertItem(OUTPUT,ItemStack.of(tag.getCompound(OUTPUT_FOOD)),false); } @NotNull @@ -36,9 +37,8 @@ public void handleUpdateTag(CompoundTag tag) { public CompoundTag getUpdateTag() { CompoundTag tag = super.getUpdateTag(); var food = getCapability(ForgeCapabilities.ITEM_HANDLER).orElseThrow(RuntimeException::new); - invalidateCaps(); - tag.put(FOOD, food.getStackInSlot(0).serializeNBT()); - + tag.put(INPUT_FOOD, food.getStackInSlot(INPUT).serializeNBT()); + tag.put(OUTPUT_FOOD,food.getStackInSlot(OUTPUT).serializeNBT()); return tag; } diff --git a/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/SFBlockEntities.java b/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/SFBlockEntities.java index 05c37c20..b5df7ddf 100644 --- a/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/SFBlockEntities.java +++ b/SinoFeast/src/main/java/games/moegirl/sinocraft/sinofeast/block/entity/SFBlockEntities.java @@ -16,11 +16,11 @@ public static void register(IEventBus bus) { public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, SinoFeast.MODID); - public static final Supplier> COPPING_BOARD_BLOCK_ENTITY = BLOCK_ENTITIES.register("copping_board", () -> + public static final Supplier> CHOPPING_BOARD_BLOCK_ENTITY = BLOCK_ENTITIES.register("chopping_board", () -> BlockEntityType .Builder - .of(CoppingBoardBlockEntity::new, - SFBlocks.COPPING_BOARD_BLOCK.get()).build(null)); + .of(ChoppingBoardBlockEntity::new, + SFBlocks.CHOPPING_BOARD_BLOCK.get()).build(null)); }