From 45e2aa837a848c5024bbf9deaf174ca003922358 Mon Sep 17 00:00:00 2001 From: firenoo <49818773+firenoo@users.noreply.github.com> Date: Sun, 11 Jun 2023 09:03:14 -0700 Subject: [PATCH] Change editorconfig + Fix blocking mode config channel (#339) * editorconfig: Disable * imports * Fix conflicting GuiSync channel 5 5 used for crafting mode and adv blocking mode in interface gui * spotlessApply (#340) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .editorconfig | 2 +- .../container/implementations/ContainerInterface.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 983d1a5d99c..d06178236b8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -70,7 +70,7 @@ ij_java_case_statement_on_separate_line = true ij_java_catch_on_new_line = false ij_java_class_annotation_wrap = split_into_lines ij_java_class_brace_style = end_of_line -ij_java_class_count_to_use_import_on_demand = 5 +ij_java_class_count_to_use_import_on_demand = 2147483647 ij_java_class_names_in_javadoc = 1 ij_java_do_not_indent_top_level_class_members = false ij_java_do_not_wrap_after_single_annotation = false diff --git a/src/main/java/appeng/container/implementations/ContainerInterface.java b/src/main/java/appeng/container/implementations/ContainerInterface.java index 11d7869488d..974228ec49f 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterface.java +++ b/src/main/java/appeng/container/implementations/ContainerInterface.java @@ -16,7 +16,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import appeng.api.config.*; +import appeng.api.config.AdvancedBlockingMode; +import appeng.api.config.InsertionMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; import appeng.api.util.IConfigManager; import appeng.container.guisync.GuiSync; import appeng.container.slot.*; @@ -34,7 +39,7 @@ public class ContainerInterface extends ContainerUpgradeable implements IOptiona @GuiSync(4) public YesNo iTermMode = YesNo.YES; - @GuiSync(5) + @GuiSync(10) public AdvancedBlockingMode advancedBlockingMode = AdvancedBlockingMode.DEFAULT; @GuiSync(8)