From 069cb964b6b7207b1af3c29661f26ee1784253d5 Mon Sep 17 00:00:00 2001 From: Hubry Date: Mon, 13 Jul 2020 16:07:28 +0200 Subject: [PATCH] Fix packet serialization of block tag ingredients Fixes pure daisy JEI display on servers --- .../botania/common/crafting/StateIngredientBlocks.java | 5 +++++ .../vazkii/botania/common/crafting/StateIngredientTag.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java index 5eb34bd8e..a989147d7 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java @@ -52,6 +52,7 @@ public class StateIngredientBlocks implements StateIngredient { @Override public void write(PacketBuffer buffer) { buffer.writeVarInt(0); + Collection blocks = getBlocks(); buffer.writeVarInt(blocks.size()); for (Block block : blocks) { buffer.writeRegistryIdUnsafe(ForgeRegistries.BLOCKS, block); @@ -62,4 +63,8 @@ public class StateIngredientBlocks implements StateIngredient { public List getDisplayed() { return blocks.stream().map(Block::getDefaultState).collect(Collectors.toList()); } + + protected Collection getBlocks() { + return blocks; + } } diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java index 154ea83fc..ebbb0f64d 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java @@ -13,11 +13,11 @@ import com.google.gson.JsonObject; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.network.PacketBuffer; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ITag; import net.minecraft.util.ResourceLocation; +import java.util.Collection; import java.util.List; import java.util.stream.Collectors; @@ -47,8 +47,8 @@ public class StateIngredientTag extends StateIngredientBlocks { } @Override - public void write(PacketBuffer buffer) { - super.write(buffer); // We're sending super's contents instead as tags are sent *after* recipes. + protected Collection getBlocks() { + return tag.getAllElements(); } @Override