Merge pull request #2121 from stellanera98/1.20-filter-amount

Fixed filters not saving item quantities properly

Author: wrincewind

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

@@ -249,6 +249,8 @@
   "curios.identifier.living_armour_socket": "Living Armour Socket",
   "death.attack.ritual": "%1$s died in a Well of Suffering",
   "death.attack.sacrifice": "%1$s sacrificed a bit too much LP",
+  "death.attack.spike": "%1$s was impaled on spikes",
+  "death.attack.spike.player": "%1$s was impaled on spikes while fighting %2$s",
   "effect.bloodmagic.bounce": "Bounce",
   "effect.bloodmagic.flight": "Flight",
   "effect.bloodmagic.gravity": "Gravity",
@@ -275,6 +277,10 @@
   "gui.bloodmagic.cancel": "Cancel",
   "gui.bloodmagic.default": "Default",
   "gui.bloodmagic.empty": "Empty",
+  "gui.bloodmagic.filter.enchant": "Enchantment Filter",
+  "gui.bloodmagic.filter.mod": "Mod Filter",
+  "gui.bloodmagic.filter.standard": "Standard Filter",
+  "gui.bloodmagic.filter.tag": "Tag Filter",
   "gui.bloodmagic.save": "Save",
   "gui.bloodmagic.toggle": "Toggle",
   "guide.bloodmagic.landing_text": "Welcome to $(6)Blood Magic$()! $(br2)$(l:bloodmagic:utility/nyi)A lot of stuff$() isn't yet implemented, so please excuse our dust. $(br2)Click $(l:bloodmagic:utility/getting_started)HERE$() to get started. If you find any bugs, please report them on our $(l:https://github.com/WayofTime/BloodMagic/issues)Github$().",

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

@@ -3,6 +3,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.ItemRouterFilter;
 import wayoftime.bloodmagic.network.BloodMagicPacketHandler;
 import wayoftime.bloodmagic.network.FilterButtonPacket;
 
@@ -20,17 +21,6 @@ public FilterButtonTogglePress(String key, ContainerFilter container)
 	@Override
 	public void onPress(Button button)
 	{
-		if (button.active)
-		{
-			int currentGhostSlot = container.lastGhostSlotClicked;
-			if (container.filterStack.getItem() instanceof IItemFilterProvider)
-			{
-				int currentButtonState = ((IItemFilterProvider) 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);
-			}
-		}
+        // handled in container now
 	}
 }

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

@@ -13,7 +13,7 @@ public abstract class ScreenBase<T extends AbstractContainerMenu> extends Abstra
 {
 	private static final ResourceLocation background = new ResourceLocation(BloodMagic.MODID, "textures/gui/soulforge.png");
 
-	protected final T container;
+	public final T container;
 
 	public ScreenBase(T container, Inventory playerInventory, Component title)
 	{