Added tag_stack ingredient type

Author: Commoble

gradle.properties

@@ -1,6 +1,6 @@
 
 modid = jumbofurnace
-mod_version = 2.0.0.1
+mod_version = 2.0.1.0
 mc_version = 1.16.3
 forge_version = 34.1.0
 mappings_version = 20200916-1.16.2

src/main/java/commoble/jumbofurnace/JumboFurnace.java

@@ -20,6 +20,7 @@
 import commoble.jumbofurnace.recipes.JumboFurnaceRecipe;
 import commoble.jumbofurnace.recipes.JumboFurnaceRecipeSerializer;
 import commoble.jumbofurnace.recipes.RecipeSorter;
+import commoble.jumbofurnace.recipes.TagStackIngredient;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -40,6 +41,7 @@
 import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.SoundEvents;
 import net.minecraft.util.math.BlockPos;
@@ -51,7 +53,9 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.Tags;
+import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.event.AddReloadListenerEvent;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock;
 import net.minecraftforge.event.world.BlockEvent.EntityMultiPlaceEvent;
 import net.minecraftforge.event.world.BlockEvent.EntityPlaceEvent;
@@ -130,6 +134,8 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<ITextC
 		containers.register(Names.JUMBO_FURNACE, () -> new ContainerType<>(JumboFurnaceContainer::getClientContainer));
 
 		recipeSerializers.register(Names.JUMBO_SMELTING, () -> new JumboFurnaceRecipeSerializer(JUMBO_SMELTING_RECIPE_TYPE));
+		
+		modBus.addGenericListener(IRecipeSerializer.class, this::onRegisterRecipeStuff);
 	}
 
 	private <T extends IForgeRegistryEntry<T>> DeferredRegister<T> makeDeferredRegister(IEventBus modBus, IForgeRegistry<T> registry)
@@ -248,6 +254,12 @@ private void onRightClickBlockLow(RightClickBlock event)
 		}
 	}
 
+	private void onRegisterRecipeStuff(RegistryEvent.Register<IRecipeSerializer<?>> event)
+	{
+		// forge registers ingredient serializers here for some reason, might as well do it here too
+		CraftingHelper.register(new ResourceLocation("jumbofurnace:tag_stack"), TagStackIngredient.SERIALIZER);
+	}
+	
 	private static void addItemsToList(List<ItemStack> stacks, IItemHandler handler)
 	{
 		int slots = handler.getSlots();

src/main/java/commoble/jumbofurnace/recipes/TagStackIngredient.java

@@ -0,0 +1,121 @@
+package commoble.jumbofurnace.recipes;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Nonnull;
+
+import com.google.gson.JsonObject;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.Ingredient;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.tags.ITag;
+import net.minecraft.tags.TagCollectionManager;
+import net.minecraft.util.JSONUtils;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.common.crafting.IIngredientSerializer;
+
+public class TagStackIngredient extends Ingredient
+{
+	private final ITag<Item> tag;	public ITag<Item> getTag() { return this.tag;}
+	private final int count;	public final int getCount() { return this.count; }
+	
+	public TagStackIngredient(ITag<Item> tag, int count)
+	{
+		super(makeItemStacks(tag, count));
+		this.tag = tag;
+		this.count = count;
+	}
+
+    @Override
+    public boolean isSimple()
+    {
+        return false;
+    }
+    
+    @Override
+    public IIngredientSerializer<? extends Ingredient> getSerializer()
+    {
+        return SERIALIZER;
+    }
+    
+    public static Stream<TagStackList> makeItemStacks(ITag<Item> tag, int count)
+    {
+    	return tag == null
+    		? Stream.of() // invalid tag, no stacks to match to
+    		: Stream.of(new TagStackList(tag, count));
+    }
+    
+    public static final IIngredientSerializer<TagStackIngredient> SERIALIZER = new IIngredientSerializer<TagStackIngredient>()
+	{
+
+		@Override
+		public void write(PacketBuffer buffer, TagStackIngredient ingredient)
+		{
+			buffer.writeString(TagCollectionManager.getManager().getItemTags().getValidatedIdFromTag(ingredient.tag).toString());
+			buffer.writeInt(ingredient.count);
+		}
+
+		@Override
+		public TagStackIngredient parse(PacketBuffer buffer)
+		{
+			String tagName = buffer.readString();
+			int count = buffer.readInt();
+			ITag<Item> tag = TagCollectionManager.getManager().getItemTags().get(new ResourceLocation(tagName)); // can return null if tag is invalid
+			return new TagStackIngredient(tag, count);
+		}
+
+		@Override
+		public TagStackIngredient parse(JsonObject json)
+		{
+			ResourceLocation tagID = new ResourceLocation(JSONUtils.getString(json, "tag")); // throws JsonSyntaxException if no tag field
+			int count = JSONUtils.getInt(json, "count", 1);
+			ITag<Item> tag = TagCollectionManager.getManager().getItemTags().get(tagID); // can return null if tag is invalid
+			return new TagStackIngredient(tag, count);
+		}
+	
+	};
+	
+	public static class TagStackList implements Ingredient.IItemList
+	{
+		private final @Nonnull ITag<Item> tag;
+		private final int count;
+		private final Collection<ItemStack> stacks;
+		
+		public TagStackList(@Nonnull ITag<Item> tag, int count)
+		{
+			this.tag = tag;
+			this.count = count;
+			
+			this.stacks = tag.getAllElements()
+				.stream()
+				.map(item -> new ItemStack(item, count))
+				.collect(Collectors.toList());
+		}
+
+		@Override
+		public Collection<ItemStack> getStacks()
+		{
+			return this.stacks;
+		}
+
+		@Override
+		public JsonObject serialize()
+		{
+			JsonObject json = new JsonObject();
+			
+			json.addProperty("tag", TagCollectionManager.getManager().getItemTags().getValidatedIdFromTag(this.tag).toString());
+			
+			if (this.count > 1)
+			{
+				json.addProperty("count", this.count);
+			}
+			
+			return json;
+		}
+		
+	}
+}