From 447450d541245114c5638e757367f684d90f3866 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Thu, 2 Mar 2023 19:08:53 +0800 Subject: [PATCH] fix item conduit settings not sent to server (#103) --- .editorconfig | 4 ---- .../crazypants/enderio/conduit/gui/item/ItemSettings.java | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index 13ec2b0f..4ffbd908 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,9 +18,5 @@ end_of_line = crlf [*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}] indent_size = 2 -[*.java] -indent_size = 2 -ij_java_space_before_if_parentheses = false - [*.lang] trim_trailing_whitespace = false diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index 5d6ee61a..8befbc20 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -25,6 +25,7 @@ import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.conduit.packet.PacketExtractMode; +import crazypants.enderio.conduit.packet.PacketItemConduitFilter; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; @@ -212,9 +213,12 @@ public class ItemSettings extends BaseSettingsPanel { } else if (guiButton.id == ID_EXTRACT_CHANNEL) { DyeColor col = DyeColor.fromIndex(extractChannelB.getColorIndex()); itemConduit.setInputColor(gui.getDir(), col); + } else { + if (insertFilterGui != null) insertFilterGui.actionPerformed(guiButton); + if (extractFilterGui != null) extractFilterGui.actionPerformed(guiButton); + return; } - if (insertFilterGui != null) insertFilterGui.actionPerformed(guiButton); - if (extractFilterGui != null) extractFilterGui.actionPerformed(guiButton); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir())); } @Override