finalise 3.1.3

AV306 · May 26, 2023 · d97d40e · d97d40e
1 parent 7807b98
commit d97d40e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/me/av306/xenon/Xenon.java b/src/main/java/me/av306/xenon/Xenon.java
@@ -4,6 +4,7 @@
 import me.av306.xenon.commands.*;
 import me.av306.xenon.config.FeatureConfigGroup;
 import me.av306.xenon.config.GeneralConfigGroup;
+import me.av306.xenon.config.feature.FullKeyboardGroup;
 import me.av306.xenon.feature.*;
 import me.av306.xenon.features.*;
 import me.av306.xenon.features.chat.*;
@@ -121,7 +122,7 @@ private void initFeatures()
         //new DamageIndicatorFeature();
         new FeatureList();
         new FullBrightFeature();
-        new FullKeyboardFeature();
+        if ( FullKeyboardGroup.enable ) new FullKeyboardFeature();
         new MultiQuickChatFeature();
         new ProximityRadarFeature();
         new QuickChatFeature();

diff --git a/src/main/java/me/av306/xenon/config/FeatureConfigGroup.java b/src/main/java/me/av306/xenon/config/FeatureConfigGroup.java
@@ -21,6 +21,9 @@ public class FeatureConfigGroup implements XenonConfigGroup
 	@Transitive
 	private final FeatureListGroup featureListGroup = new FeatureListGroup();
 
+	@Transitive
+	private final FullKeyboardGroup fullKeyboardGroup = new FullKeyboardGroup();
+
 	@Transitive
 	private final TakePanoramaGroup takePanoramaGroup = new TakePanoramaGroup();
 

diff --git a/src/main/java/me/av306/xenon/config/feature/FullKeyboardGroup.java b/src/main/java/me/av306/xenon/config/feature/FullKeyboardGroup.java
@@ -7,11 +7,14 @@
 @ConfigEntries( includeAll = true )
 public class FullKeyboardGroup implements XenonConfigGroup
 {
+    @ConfigEntry.Boolean
+    public static boolean enable = false;
+
     @ConfigEntry.Boolean
     public static boolean acceleration = true;
 
     @ConfigEntry.BoundedDouble( min = 0d, max = 100d )
-    @ConfigEntry.Slider
+    //@ConfigEntry.Slider
     @ConfigEntry.DoubleSliderInterval( value = 0.5d )
     public static double sensitivity = 30d;
 }
diff --git a/src/main/java/me/av306/xenon/features/ConfigMenu.java b/src/main/java/me/av306/xenon/features/ConfigMenu.java
@@ -14,7 +14,7 @@ public class ConfigMenu extends IFeature
 {
     public ConfigMenu()
     {
-        super( "ConfigMenu", GLFW.GLFW_KEY_RIGHT_SHIFT );
+        super( "ConfigMenu", "config", "cm" );
 
         //KeyEvent.AFTER_VIGNETTE.register( this::onKey );
     }

diff --git a/src/main/resources/assets/xenon/lang/en_us.json b/src/main/resources/assets/xenon/lang/en_us.json
@@ -5,10 +5,6 @@
   "config.xenon.featureconfiggroup.commandprocessorgroup.reEnableOnWorldEnter": "Re-enable on joining world",
   "config.xenon.featureconfiggroup.commandprocessorgroup.prefix": "Prefix",
   "config.xenon.featureconfiggroup.commandprocessorgroup.warn": "Warn if disabled (Recommended)",
-  "config.xenon.featureconfiggroup.creativeflightgroup": "CreativeFlight Settings",
-  "config.xenon.featureconfiggroup.creativeflightgroup.enableNoFall": "Enable NoFallDamage (Recommended)",
-  "config.xenon.featureconfiggroup.fastbreakgroup": "FastBreak Settings",
-  "config.xenon.featureconfiggroup.fastbreakgroup.onlyRemoveCooldown": "Only remove block-break cooldown",
   "config.xenon.featureconfiggroup.featurelistgroup": "FeatureList Settings",
   "config.xenon.featureconfiggroup.featurelistgroup.reEnableOnWorldEnter": "Re-enable on joining world",
   "config.xenon.featureconfiggroup.featurelistgroup.position": "Position",
@@ -20,6 +16,10 @@
   "config.xenon.featureconfiggroup.featurelistgroup.position.topRight": "Top Right",
   "config.xenon.featureconfiggroup.featurelistgroup.shadow": "Shadow",
   "config.xenon.featureconfiggroup.featurelistgroup.showVersion": "Show Version",
+  "config.xenon.featureconfiggroup.fullkeyboardgroup": "FullKeyboard Settings",
+  "config.xenon.featureconfiggroup.fullkeyboardgroup.enable": "Register feature (requires restart)",
+  "config.xenon.featureconfiggroup.fullkeyboardgroup.acceleration": "Mouse acceleration",
+  "config.xenon.featureconfiggroup.fullkeyboardgroup.sensitivity": "Look sensitivity",
   "config.xenon.featureconfiggroup.generalconfiggroup": "General Settings",
   "config.xenon.featureconfiggroup.generalconfiggroup.debugCrosshairSize": "Debug Crosshair Size",
   "config.xenon.featureconfiggroup.generalconfiggroup.enableIllegalFeatures": "Enable Illegal Features",