Expand clickthrough options

Author: NotRyken

README.md

@@ -26,13 +26,13 @@ All features can be turned on or off at will using the config screen.
 
 #### Enhanced Editor
 
-- Automatic line wrapping
-- Manual line breaks with an optional indicator
-- Continuous cursor travel using arrow keys
-- Stepped travel using home and end keys
-- Multi-line automatic shifting
-- Multi-line selection
-- Multi-line copy and paste
+- Automatic line wrapping.
+- Manual line breaks with an optional indicator.
+- Continuous cursor travel using arrow keys.
+- Stepped travel using home and end keys.
+- Multi-line automatic shifting.
+- Multi-line selection.
+- Multi-line copy and paste.
 
 #### Quick-Action Buttons
 
@@ -60,10 +60,10 @@ All features can be turned on or off at will using the config screen.
 #### Click-Through
 
 - [ClickThrough Plus](https://modrinth.com/project/fJi8nm80) is recommended for use with SignTweaks.
-- If ClickThrough Plus is not installed, SignTweaks will use a basic click-through implementation to
-  allow clicking through signs to most block entities (including chests, furnaces etc.)
+- In case it is not available, SignTweaks includes a basic implementation that allows clicking
+  through wall signs, banners, item frames and paintings to most block entities.
 
-#### Auto Fill
+#### Auto-Fill
 
 - Automatically add text to signs when placing.
 
@@ -73,6 +73,7 @@ The following mods are explicitly incompatible with SignTweaks, due to modifying
 
 - [Chat Calc](https://modrinth.com/project/o2oFdqXS) (`chatcalc`) by Emirlol.
 - [Improved Sign Editing](https://modrinth.com/project/EWQifKYI) (`improvedsignediting`) by Serilum.
+- [Sign Copy](https://modrinth.com/project/cK4nxndh) (`signcopy`) by TerminalMC.
 - [Sign Edit Lite](https://modrinth.com/project/QvdBkyYv) (`signeditlite`) by pintergabor.
 - [Sign Tools](https://modrinth.com/project/31HqGqE1) (`signtools`) by DmitryLovin.
 

changelog.md

@@ -2,14 +2,8 @@
 
 ## 2.2.0
 
-- Disabled the enhanced editor toggle button by default.
-- Disabled the line break indicator by default.
-- Added a 'Revert' GUI button.
-- Added an option to disable saving when exiting using the 'Escape' key.
-- Added an option to conditionally prevent opening the sign editor.
-- Added an option to block movement key input until key release when opening the sign editor.
-- Added an option to automatically add text to placed signs.
-- Added an option to click through signs to most block entities.
+- Rebranded to "Sign Tweaks".
+- See description/readme for updated feature-set.
 
 ## 1.2.0
 

common/src/main/java/dev/terminalmc/signtweaks/config/Config.java

@@ -66,6 +66,8 @@ public static Options options() {
 
     public static class Options {
 
+        // General
+
         public static final boolean useEnhancedEditorDefault = true;
         public boolean useEnhancedEditor = useEnhancedEditorDefault;
 
@@ -90,11 +92,21 @@ public static class Options {
         public static final EditCondition editConditionDefault = EditCondition.ALWAYS;
         public EditCondition editCondition = editConditionDefault;
 
-        public static final boolean editWhenPlacingOnBlockEntityDefault = true;
-        public boolean blockEntitySneakEditOverride = editWhenPlacingOnBlockEntityDefault;
+        public static final boolean blockEntitySneakEditOverrideDefault = true;
+        public boolean blockEntitySneakEditOverride = blockEntitySneakEditOverrideDefault;
+
+        // ClickThrough
+
+        public static final boolean clickThroughSignsDefault = true;
+        public boolean clickThroughSigns = clickThroughSignsDefault;
+
+        public static final boolean clickThroughBannersDefault = false;
+        public boolean clickThroughBanners = clickThroughBannersDefault;
+
+        public static final boolean clickThroughHangingEntitiesDefault = false;
+        public boolean clickThroughHangingEntities = clickThroughHangingEntitiesDefault;
 
-        public static final boolean clickThroughDefault = true;
-        public boolean clickThrough = clickThroughDefault;
+        // AutoFill
 
         public static final boolean useAutoFillDefault = false;
         public boolean useAutoFill = useAutoFillDefault;

common/src/main/java/dev/terminalmc/signtweaks/gui/screen/ClothScreenProvider.java

@@ -141,26 +141,47 @@ static Screen getConfigScreen(Screen parent) {
                 .build());
 
         general.addEntry(eb.startBooleanToggle(
-                        localized("option", "general.editWhenPlacingOnBlockEntity"),
+                        localized("option", "general.blockEntitySneakEditOverride"),
                         options.blockEntitySneakEditOverride
                 )
                 .setTooltip(localized(
                         "option",
-                        "general.editWhenPlacingOnBlockEntity.tooltip",
+                        "general.blockEntitySneakEditOverride.tooltip",
                         localized("option", "general.editCondition"),
                         localized("option", "general.editCondition." + EditCondition.NOT_SNEAKING)
                 ))
-                .setDefaultValue(Options.editWhenPlacingOnBlockEntityDefault)
+                .setDefaultValue(Options.blockEntitySneakEditOverrideDefault)
                 .setSaveConsumer(val -> options.blockEntitySneakEditOverride = val)
                 .build());
 
-        general.addEntry(eb.startBooleanToggle(
-                        localized("option", "general.clickThrough"),
-                        options.clickThrough
+        ConfigCategory clickThrough =
+                builder.getOrCreateCategory(localized("option", "clickThrough"));
+
+        clickThrough.addEntry(eb.startBooleanToggle(
+                        localized("option", "clickThrough.clickThroughSigns"),
+                        options.clickThroughSigns
+                )
+                .setTooltip(localized("option", "clickThrough.clickThroughSigns.tooltip"))
+                .setDefaultValue(Options.clickThroughSignsDefault)
+                .setSaveConsumer(val -> options.clickThroughSigns = val)
+                .build());
+
+        clickThrough.addEntry(eb.startBooleanToggle(
+                        localized("option", "clickThrough.clickThroughBanners"),
+                        options.clickThroughBanners
+                )
+                .setTooltip(localized("option", "clickThrough.clickThroughBanners.tooltip"))
+                .setDefaultValue(Options.clickThroughBannersDefault)
+                .setSaveConsumer(val -> options.clickThroughBanners = val)
+                .build());
+
+        clickThrough.addEntry(eb.startBooleanToggle(
+                        localized("option", "clickThrough.clickThroughHangingEntities"),
+                        options.clickThroughHangingEntities
                 )
-                .setTooltip(localized("option", "general.clickThrough.tooltip"))
-                .setDefaultValue(Options.clickThroughDefault)
-                .setSaveConsumer(val -> options.clickThrough = val)
+                .setTooltip(localized("option", "clickThrough.clickThroughHangingEntities.tooltip"))
+                .setDefaultValue(Options.clickThroughHangingEntitiesDefault)
+                .setSaveConsumer(val -> options.clickThroughHangingEntities = val)
                 .build());
 
         ConfigCategory autoFill = builder.getOrCreateCategory(localized("option", "autoFill"));