fix option code order for f3 + X stuffs

numbers first
Fallen-Breath · Jul 20, 2024 · 8a12b80 · 8a12b80
1 parent 0bd621e
commit 8a12b80
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 39 deletions.
diff --git a/src/main/java/me/fallenbreath/tweakermore/config/TweakerMoreConfigs.java b/src/main/java/me/fallenbreath/tweakermore/config/TweakerMoreConfigs.java
@@ -482,6 +482,15 @@ public class TweakerMoreConfigs
 	@Config(type = Config.Type.DISABLE, category = Config.Category.MC_TWEAKS)
 	public static final TweakerMoreConfigBooleanHotkeyed DISABLE_VIGNETTE_DARKNESS = newConfigBooleanHotkeyed("disableVignetteDarkness");
 
+	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
+	public static final TweakerMoreConfigDouble F3_B_ENTITY_FACING_VECTOR_LENGTH = newConfigDouble("f3BEntityFacingVectorLength", 2.0, 0, 16);
+
+	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
+	public static final TweakerMoreConfigBoolean F3_I_USE_RELATED_COORDINATE = newConfigBoolean("f3IUseRelatedCoordinate", false);
+
+	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
+	public static final TweakerMoreConfigBoolean F3_I_USE_RELATED_COORDINATE_SHIFT_1 = newConfigBoolean("f3IUseRelatedCoordinateShift1", true);
+
 	@Config(type = Config.Type.TWEAK, category = Config.Category.MC_TWEAKS)
 	public static final TweakerMoreConfigBooleanHotkeyed FAKE_NIGHT_VISION = newConfigBooleanHotkeyed("fakeNightVision");
 
@@ -494,15 +503,6 @@ public class TweakerMoreConfigs
 	@Config(type = Config.Type.TWEAK, restriction = @Restriction(require = @Condition(ModIds.replay_mod)), category = Config.Category.MC_TWEAKS)
 	public static final TweakerMoreConfigBooleanHotkeyed FLAWLESS_FRAMES = newConfigBooleanHotkeyed("flawlessFrames");
 
-	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
-	public static final TweakerMoreConfigDouble F3_B_ENTITY_FACING_VECTOR_LENGTH = newConfigDouble("f3BEntityFacingVectorLength", 2.0, 0, 16);
-
-	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
-	public static final TweakerMoreConfigBoolean F3_I_USE_RELATED_COORDINATE = newConfigBoolean("f3IUseRelatedCoordinate", false);
-
-	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
-	public static final TweakerMoreConfigBoolean F3_I_USE_RELATED_COORDINATE_SHIFT_1 = newConfigBoolean("f3IUseRelatedCoordinateShift1", true);
-
 	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
 	public static final TweakerMoreConfigDouble FLY_DRAG = newConfigDouble("flyDrag", 0.09, 0, 1);
 

diff --git a/src/main/resources/assets/tweakermore/lang/en_us.yml b/src/main/resources/assets/tweakermore/lang/en_us.yml
@@ -550,6 +550,21 @@ tweakermore:
         i.e. the darkness effect on the screen corner that accumulates slowly
         when the light level at player's eyes is not the maximum light level
       pretty_name: Disable Vignette Darkness
+    f3BEntityFacingVectorLength:
+      .: f3BEntityFacingVectorLength
+      comment: |-
+        Adjust the length of the rendered entity facing vector line when F3 + B is on
+        See also: option @option#disableF3BEntityFacingVector@
+    f3IUseRelatedCoordinate:
+      .: f3IUseRelatedCoordinate
+      comment: |-
+        Use related coordinate "~ ~ ~" in the command copied by F3 + I
+        Affects both /setblock command for blocks and /summon command for entities
+        See option @option#f3IUseRelatedCoordinateShift1@ to shift the related coordinate up by 1 block, i.e. use "~ ~1 ~"
+    f3IUseRelatedCoordinateShift1:
+      .: f3IUseRelatedCoordinateShift1
+      comment: |-
+        Use coordinate "~ ~1 ~" instead of "~ ~ ~" in option @option#f3IUseRelatedCoordinate@
     fakeNightVision:
       .: fakeNightVision
       comment: Always use night vision for game rendering, regardless of whether the player actually has night vision
@@ -571,21 +586,6 @@ tweakermore:
         using the logic from replay mod which is used in its rendering tasks
         WARNING: Expect client lag spike with enabled
       pretty_name: Flawless Frames
-    f3BEntityFacingVectorLength:
-      .: f3BEntityFacingVectorLength
-      comment: |-
-        Adjust the length of the rendered entity facing vector line when F3 + B is on
-        See also: option @option#disableF3BEntityFacingVector@
-    f3IUseRelatedCoordinate:
-      .: f3IUseRelatedCoordinate
-      comment: |-
-        Use related coordinate "~ ~ ~" in the command copied by F3 + I
-        Affects both /setblock command for blocks and /summon command for entities
-        See option @option#f3IUseRelatedCoordinateShift1@ to shift the related coordinate up by 1 block, i.e. use "~ ~1 ~"
-    f3IUseRelatedCoordinateShift1:
-      .: f3IUseRelatedCoordinateShift1
-      comment: |-
-        Use coordinate "~ ~1 ~" instead of "~ ~ ~" in option @option#f3IUseRelatedCoordinate@
     flyDrag:
       .: flyDrag
       comment: |-

diff --git a/src/main/resources/assets/tweakermore/lang/zh_cn.yml b/src/main/resources/assets/tweakermore/lang/zh_cn.yml
@@ -550,6 +550,21 @@ tweakermore:
         即那个当玩家眼睛处的亮度小于最大亮度时，
         画面四角会逐渐变暗的效果
       pretty_name: 禁用暗角渲染
+    f3BEntityFacingVectorLength:
+      .: F3+B实体朝向线段长度
+      comment: |-
+        在启用F3+B实体碰撞箱显示后，调整代表实体朝向的线段的长度
+        另见：选项 @option#disableF3BEntityFacingVector@
+    f3IUseRelatedCoordinate:
+      .: F3+I使用相对坐标
+      comment: |-
+        在F3+I复制指令时，使用相对坐标 ~ ~ ~
+        影响复制的方块/setblock指令和实体/summon指令
+        另见选项@option#f3IUseRelatedCoordinateShift1@来把相对坐标上移一格，即使用 ~ ~1 ~
+    f3IUseRelatedCoordinateShift1:
+      .: F3+I使用相对坐标-上移1m
+      comment: |-
+        在选项@option#f3IUseRelatedCoordinate@中，使用坐标 ~ ~1 ~ 代替 ~ ~ ~
     fakeNightVision:
       .: 伪夜视
       comment: 总是运用夜视效果下的游戏渲染，无论玩家是否确实拥有夜视效果
@@ -571,21 +586,6 @@ tweakermore:
         借用了Replay模组渲染各种任务时所使用的逻辑
         警告：这可能会让客户端频繁地卡顿
       pretty_name: 无瑕世界渲染
-    f3BEntityFacingVectorLength:
-      .: F3+B实体朝向线段长度
-      comment: |-
-        在启用F3+B实体碰撞箱显示后，调整代表实体朝向的线段的长度
-        另见：选项 @option#disableF3BEntityFacingVector@
-    f3IUseRelatedCoordinate:
-      .: F3+I使用相对坐标
-      comment: |-
-        在F3+I复制指令时，使用相对坐标 ~ ~ ~
-        影响复制的方块/setblock指令和实体/summon指令
-        另见选项@option#f3IUseRelatedCoordinateShift1@来把相对坐标上移一格，即使用 ~ ~1 ~
-    f3IUseRelatedCoordinateShift1:
-      .: F3+I使用相对坐标-上移1m
-      comment: |-
-        在选项@option#f3IUseRelatedCoordinate@中，使用坐标 ~ ~1 ~ 代替 ~ ~ ~
     flyDrag:
       .: 玩家飞行阻力
       comment: |-