diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dec899fa..0118a8dd5 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Fixed - Fixed JEI transfer in the Pattern Grid wrongly choosing "Processing" mode. +- Fixed JEI transfer not working in single player. ## [1.13.0-beta.1] - 2024-02-12 diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java index ee18e2dcb..f089d8fff 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java @@ -46,7 +46,6 @@ public abstract class NetworkNodeBlock extends BaseBlock implements EntityBlock } @Override - @SuppressWarnings("deprecation") public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving) { if (state.getBlock() != newState.getBlock()) { BlockEntity blockEntity = level.getBlockEntity(pos); diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java index 2fd061fad..2260b41d8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java @@ -156,7 +156,12 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler> inputs; + private final ItemStack[][] recipe; - public GridTransferMessage() { - } - - public GridTransferMessage(List> inputs) { - this.inputs = inputs; + public GridTransferMessage(final ItemStack[][] recipe) { + this.recipe = recipe; } public static GridTransferMessage decode(FriendlyByteBuf buf) { - GridTransferMessage msg = new GridTransferMessage(); int slots = buf.readInt(); - msg.recipe = new ItemStack[slots][]; + final ItemStack[][] recipe = new ItemStack[slots][]; for (int i = 0; i < slots; i++) { int numberOfIngredients = buf.readInt(); - msg.recipe[i] = new ItemStack[numberOfIngredients]; - + recipe[i] = new ItemStack[numberOfIngredients]; for (int j = 0; j < numberOfIngredients; j++) { - msg.recipe[i][j] = StackUtils.readItemStack(buf); + recipe[i][j] = StackUtils.readItemStack(buf); } } - - return msg; + return new GridTransferMessage(recipe); } public static void handle(GridTransferMessage message, PlayPayloadContext ctx) { @@ -56,10 +49,9 @@ public class GridTransferMessage implements CustomPacketPayload { @Override public void write(FriendlyByteBuf buf) { - buf.writeInt(inputs.size()); - for (List stacks : inputs) { - buf.writeInt(stacks.size()); - + buf.writeInt(recipe.length); + for (ItemStack[] stacks : recipe) { + buf.writeInt(stacks.length); for (ItemStack possibleStack : stacks) { StackUtils.writeItemStack(buf, possibleStack); }