Enable transfernodes to transfer fluids

src/generated/resources/assets/bloodmagic/lang/en_us.json

@@ -234,6 +234,9 @@
   "item.bloodmagic.experiencebook": "Tome of Peritia",
   "item.bloodmagic.explosivepowder": "Explosive Powder",
   "item.bloodmagic.firescribetool": "Inscription Tool: Fire",
+  "item.bloodmagic.fluidrouterfilterexact": "Standard Fluid Filter",
+  "item.bloodmagic.fluidrouterfiltermod": "Mod Fluid Filter",
+  "item.bloodmagic.collectionfilter": "Collection Filter",
   "item.bloodmagic.fortune_anointment": "Fortuna Extract",
   "item.bloodmagic.fortune_anointment_2": "Fortuna Extract II",
   "item.bloodmagic.fortune_anointment_3": "Fortuna Extract III",
@@ -651,6 +654,7 @@
   "tooltip.bloodmagic.basicnodeupgrade": "Increases a Master Routing Node's speed.",
   "tooltip.bloodmagic.blockeddoor": "The lock breaks and fizzles out of existence!",
   "tooltip.bloodmagic.blood_provider.slate.desc": "A simple ampoule containing 500LP.",
+  "tooltip.bloodmagic.collectionfilter.desc": "Allows to filter different types",
   "tooltip.bloodmagic.compositefilter.desc": "Filters based off of contained filters.",
   "tooltip.bloodmagic.config.disabled": "Currently disabled in the Config.",
   "tooltip.bloodmagic.contained_filters": "Contained Filters:",
@@ -694,7 +698,8 @@
   "tooltip.bloodmagic.filter.enchant_combination": "%s: %s",
   "tooltip.bloodmagic.filter.from_mod": "From: %s",
   "tooltip.bloodmagic.filter.whitelist": "Allow:",
-  "tooltip.bloodmagic.ghost.amount": "Ghost item amount: %d.",
+  "tooltip.bloodmagic.fluidfilter.desc": "Will make sure the fluids match.",
+  "tooltip.bloodmagic.ghost.amount": "Ghost amount: %d.",
   "tooltip.bloodmagic.ghost.everything": "Everything",
   "tooltip.bloodmagic.hellforgedparts": "These parts are currently beyond your crafting capabilities...",
   "tooltip.bloodmagic.holdShiftForInfo": "Press shift for extra info.",

src/generated/resources/assets/bloodmagic/models/item/fluidrouterfilterexact.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "bloodmagic:item/fluidrouterfilterexact"
+  }
+}

src/generated/resources/data/bloodmagic/recipes/alchemytable/collection_filter.json

@@ -0,0 +1,23 @@
+{
+  "type": "bloodmagic:alchemytable",
+  "input": [
+    {
+      "item": "bloodmagic:componentframeparts"
+    },
+    {
+      "item": "bloodmagic:infusedslate"
+    },
+    {
+      "tag": "forge:dusts/redstone"
+    },
+    {
+      "tag": "forge:gems/lapis"
+    }
+  ],
+  "output": {
+    "item": "bloodmagic:collectionfilter"
+  },
+  "syphon": 500,
+  "ticks": 100,
+  "upgradeLevel": 3
+}

src/generated/resources/data/bloodmagic/recipes/alchemytable/fluid_mod_filter.json

@@ -0,0 +1,23 @@
+{
+  "type": "bloodmagic:alchemytable",
+  "input": [
+    {
+      "item": "bloodmagic:componentframeparts"
+    },
+    {
+      "item": "minecraft:bucket"
+    },
+    {
+      "tag": "forge:dusts/redstone"
+    },
+    {
+      "tag": "forge:dyes/yellow"
+    }
+  ],
+  "output": {
+    "item": "bloodmagic:fluidrouterfiltermod"
+  },
+  "syphon": 500,
+  "ticks": 100,
+  "upgradeLevel": 3
+}

src/generated/resources/data/bloodmagic/recipes/alchemytable/fluid_router_filter.json

@@ -0,0 +1,23 @@
+{
+  "type": "bloodmagic:alchemytable",
+  "input": [
+    {
+      "item": "bloodmagic:componentframeparts"
+    },
+    {
+      "item": "minecraft:bucket"
+    },
+    {
+      "tag": "forge:dusts/redstone"
+    },
+    {
+      "tag": "forge:dyes/red"
+    }
+  ],
+  "output": {
+    "item": "bloodmagic:fluidrouterfilterexact"
+  },
+  "syphon": 500,
+  "ticks": 100,
+  "upgradeLevel": 3
+}

src/main/java/wayoftime/bloodmagic/client/button/FilterButtonTogglePress.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.client.gui.components.Button;
 import wayoftime.bloodmagic.common.container.item.ContainerFilter;
-import wayoftime.bloodmagic.common.item.routing.IItemFilterProvider;
+import wayoftime.bloodmagic.common.item.routing.IRoutingFilterProvider;
 import wayoftime.bloodmagic.network.BloodMagicPacketHandler;
 import wayoftime.bloodmagic.network.FilterButtonPacket;
 
@@ -23,13 +23,13 @@ public void onPress(Button button)
 		if (button.active)
 		{
 			int currentGhostSlot = container.lastGhostSlotClicked;
-			if (container.filterStack.getItem() instanceof IItemFilterProvider)
+			if (container.filterStack.getItem() instanceof IRoutingFilterProvider)
 			{
-				int currentButtonState = ((IItemFilterProvider) container.filterStack.getItem()).getCurrentButtonState(container.filterStack, buttonKey, currentGhostSlot);
+				int currentButtonState = ((IRoutingFilterProvider) container.filterStack.getItem()).getCurrentButtonState(container.filterStack, buttonKey, currentGhostSlot);
 
 				BloodMagicPacketHandler.INSTANCE.sendToServer(new FilterButtonPacket(container.player.getInventory().selected, currentGhostSlot, buttonKey, currentButtonState));
 
-				((IItemFilterProvider) container.filterStack.getItem()).receiveButtonPress(container.filterStack, buttonKey, currentGhostSlot, currentButtonState);
+				((IRoutingFilterProvider) container.filterStack.getItem()).receiveButtonPress(container.filterStack, buttonKey, currentGhostSlot, currentButtonState);
 			}
 		}
 	}

src/main/java/wayoftime/bloodmagic/client/screens/ScreenFilter.java

@@ -6,6 +6,7 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 
+import com.google.common.collect.Lists;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 
@@ -23,19 +24,27 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.common.container.item.ContainerFilter;
-import wayoftime.bloodmagic.common.item.routing.IItemFilterProvider;
+import wayoftime.bloodmagic.common.item.routing.IRoutingFilterProvider;
+import wayoftime.bloodmagic.common.item.routing.ItemCollectionFilter;
+import wayoftime.bloodmagic.common.item.routing.ItemFluidRouterFilter;
+import wayoftime.bloodmagic.common.item.routing.ItemItemRouterFilter;
 import wayoftime.bloodmagic.network.RouterFilterPacket;
 import wayoftime.bloodmagic.util.GhostItemHelper;
 
 public class ScreenFilter extends ScreenBase<ContainerFilter>
 {
-	private static final ResourceLocation background = BloodMagic.rl("textures/gui/routingfilter.png");
+	private static ResourceLocation background = BloodMagic.rl("textures/gui/routingfilter.png");
 	public Container filterInventory;
 	private Player player;
 	private int left, top;
 
+	// 0 mixed, 1 item, 2 fluid
+	private int filterType = 0;
+
 	private EditBox textBox;
 
 	private int numberOfAddedButtons = 0;
@@ -71,10 +80,18 @@ public void init()
 		buttonKeyList.clear();
 
 		ItemStack filterStack = this.container.filterStack;
+		this.filterType = filterStack.getItem() instanceof ItemFluidRouterFilter ? 2 : filterStack.getItem() instanceof ItemItemRouterFilter ? 1 : 0;
 
-		if (filterStack.getItem() instanceof IItemFilterProvider)
+		if (filterStack.getItem() instanceof ItemCollectionFilter)
 		{
-			IItemFilterProvider provider = (IItemFilterProvider) filterStack.getItem();
+			this.textBox.setVisible(false);
+			this.background = BloodMagic.rl("textures/gui/routingfilter_notext.png");
+			return;
+		}
+
+		if (filterStack.getItem() instanceof IRoutingFilterProvider)
+		{
+			IRoutingFilterProvider provider = (IRoutingFilterProvider) filterStack.getItem();
 			List<Pair<String, Button.OnPress>> buttonActionList = provider.getButtonAction(this.container);
 
 			for (Pair<String, Button.OnPress> pair : buttonActionList)
@@ -206,9 +223,9 @@ private void setValueOfGhostItemInSlot(int ghostItemSlot, int amount)
 		{
 			GhostItemHelper.setItemGhostAmount(ghostStack, amount);
 			GhostItemHelper.setItemGhostAmount(container.inventoryFilter.getItem(ghostItemSlot), amount);
-			if (container.filterStack.getItem() instanceof IItemFilterProvider)
+			if (container.filterStack.getItem() instanceof IRoutingFilterProvider)
 			{
-				((IItemFilterProvider) container.filterStack.getItem()).setGhostItemAmount(container.filterStack, ghostItemSlot, amount);
+				((IRoutingFilterProvider) container.filterStack.getItem()).setGhostItemAmount(container.filterStack, ghostItemSlot, amount);
 
 			}
 		}
@@ -274,13 +291,13 @@ protected void renderLabels(PoseStack stack, int mouseX, int mouseY)
 		this.font.draw(stack, new TranslatableComponent("container.inventory"), 8, 93, 4210752);
 		this.font.draw(stack, container.filterStack.getHoverName(), 8, 4, 4210752);
 
-		if (container.filterStack.getItem() instanceof IItemFilterProvider)
+		if (container.filterStack.getItem() instanceof IRoutingFilterProvider)
 		{
 			for (int i = 0; i < numberOfAddedButtons; i++)
 			{
-				int currentButtonState = ((IItemFilterProvider) container.filterStack.getItem()).getCurrentButtonState(container.filterStack, buttonKeyList.get(i), container.lastGhostSlotClicked);
+				int currentButtonState = ((IRoutingFilterProvider) container.filterStack.getItem()).getCurrentButtonState(container.filterStack, buttonKeyList.get(i), container.lastGhostSlotClicked);
 				Pair<Integer, Integer> buttonLocation = getButtonLocation(i);
-				Pair<Integer, Integer> textureLocation = ((IItemFilterProvider) container.filterStack.getItem()).getTexturePositionForState(container.filterStack, buttonKeyList.get(i), currentButtonState);
+				Pair<Integer, Integer> textureLocation = ((IRoutingFilterProvider) container.filterStack.getItem()).getTexturePositionForState(container.filterStack, buttonKeyList.get(i), currentButtonState);
 
 				int w = 20;
 				int h = 20;
@@ -333,6 +350,30 @@ protected void renderBg(PoseStack stack, float partialTicks, int mouseX, int mou
 
 	}
 
+	@Override
+	public List<Component> getTooltipFromItem(ItemStack itemStack)
+	{
+		List<Component> list = super.getTooltipFromItem(itemStack);
+		if (filterType == 1)
+		{
+			return list;
+		}
+
+		Optional<FluidStack> opt = FluidUtil.getFluidContained(itemStack);
+		if (opt.isPresent())
+		{
+			List<Component> newlist = Lists.newArrayList();
+			newlist.add(opt.get().getDisplayName());
+			if (list.size() > 1)
+			{
+				newlist.add(list.get(1));
+			}
+			list = newlist;
+		}
+
+		return list;
+	}
+
 	@Override
 	public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks)
 	{
@@ -343,7 +384,7 @@ public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialT
 
 		List<Component> tooltip = new ArrayList<>();
 
-		if (container.filterStack.getItem() instanceof IItemFilterProvider)
+		if (container.filterStack.getItem() instanceof IRoutingFilterProvider)
 		{
 			for (int i = 0; i < numberOfAddedButtons; i++)
 			{
@@ -356,7 +397,7 @@ public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialT
 
 				if (mouseX >= x && mouseX < x + w && mouseY >= y && mouseY < y + h)
 				{
-					List<Component> components = ((IItemFilterProvider) container.filterStack.getItem()).getTextForHoverItem(container.filterStack, buttonKeyList.get(i), container.lastGhostSlotClicked);
+					List<Component> components = ((IRoutingFilterProvider) container.filterStack.getItem()).getTextForHoverItem(container.filterStack, buttonKeyList.get(i), container.lastGhostSlotClicked);
 					if (components != null && !components.isEmpty())
 						tooltip.addAll(components);
 				}
@@ -368,4 +409,8 @@ public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialT
 //			GuiUtils.drawHoveringText(matrixStack, tooltip, mouseX, mouseY, width, height, -1, font);
 	}
 
+	public int getFilterType()
+	{
+		return this.filterType;
+	}
 }