Make the net.minecraft.client.options and net.minecraft.client.gui.sc…

…reen.options packages singular (FabricMC#1921) * Make the net.minecraft.client.options package singular * Make the net.minecraft.client.gui.screen.options package singular
DreenDex · Dec 22, 2020 · 1498df0 · 1498df0
1 parent 5a954f6
commit 1498df0
Show file tree

Hide file tree

Showing 32 changed files with 30 additions and 30 deletions.
diff --git a/...ptions/AccessibilityOptionsScreen.mapping → ...option/AccessibilityOptionsScreen.mapping b/...ptions/AccessibilityOptionsScreen.mapping → ...option/AccessibilityOptionsScreen.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/options/AccessibilityOptionsScreen
+CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen
 	FIELD field_18730 OPTIONS [Lnet/minecraft/class_316;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent

diff --git a/.../screen/options/ChatOptionsScreen.mapping → ...i/screen/option/ChatOptionsScreen.mapping b/.../screen/options/ChatOptionsScreen.mapping → ...i/screen/option/ChatOptionsScreen.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/options/ChatOptionsScreen
+CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/option/ChatOptionsScreen
 	FIELD field_2352 OPTIONS [Lnet/minecraft/class_316;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent

diff --git a/...screen/options/ControlsListWidget.mapping → .../screen/option/ControlsListWidget.mapping b/...screen/options/ControlsListWidget.mapping → .../screen/option/ControlsListWidget.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/options/ControlsListWidget
+CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/option/ControlsListWidget
 	FIELD field_2733 maxKeyNameLength I
 	FIELD field_2735 parent Lnet/minecraft/class_458;
 	METHOD <init> (Lnet/minecraft/class_458;Lnet/minecraft/class_310;)V

diff --git a/...een/options/ControlsOptionsScreen.mapping → ...reen/option/ControlsOptionsScreen.mapping b/...een/options/ControlsOptionsScreen.mapping → ...reen/option/ControlsOptionsScreen.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_458 net/minecraft/client/gui/screen/options/ControlsOptionsScreen
+CLASS net/minecraft/class_458 net/minecraft/client/gui/screen/option/ControlsOptionsScreen
 	FIELD field_2723 time J
 	FIELD field_2725 resetButton Lnet/minecraft/class_4185;
 	FIELD field_2727 focusedBinding Lnet/minecraft/class_304;

diff --git a/.../screen/options/GameOptionsScreen.mapping → ...i/screen/option/GameOptionsScreen.mapping b/.../screen/options/GameOptionsScreen.mapping → ...i/screen/option/GameOptionsScreen.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/options/GameOptionsScreen
+CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOptionsScreen
 	FIELD field_21335 parent Lnet/minecraft/class_437;
 	FIELD field_21336 gameOptions Lnet/minecraft/class_315;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_2561;)V

diff --git a/...een/options/LanguageOptionsScreen.mapping → ...reen/option/LanguageOptionsScreen.mapping b/...een/options/LanguageOptionsScreen.mapping → ...reen/option/LanguageOptionsScreen.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/options/LanguageOptionsScreen
+CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/option/LanguageOptionsScreen
 	FIELD field_2486 languageSelectionList Lnet/minecraft/class_426$class_4195;
 	FIELD field_2488 languageManager Lnet/minecraft/class_1076;
 	FIELD field_26543 LANGUAGE_WARNING_TEXT Lnet/minecraft/class_2561;

diff --git a/...screen/options/MouseOptionsScreen.mapping → .../screen/option/MouseOptionsScreen.mapping b/...screen/options/MouseOptionsScreen.mapping → .../screen/option/MouseOptionsScreen.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/options/MouseOptionsScreen
+CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/option/MouseOptionsScreen
 	FIELD field_19246 buttonList Lnet/minecraft/class_353;
 	FIELD field_19247 OPTIONS [Lnet/minecraft/class_316;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V

diff --git a/...een/options/NarratorOptionsScreen.mapping → ...reen/option/NarratorOptionsScreen.mapping b/...een/options/NarratorOptionsScreen.mapping → ...reen/option/NarratorOptionsScreen.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_5500 net/minecraft/client/gui/screen/options/NarratorOptionsScreen
+CLASS net/minecraft/class_5500 net/minecraft/client/gui/screen/option/NarratorOptionsScreen
 	FIELD field_26679 options [Lnet/minecraft/class_316;
 	FIELD field_26680 narratorButton Lnet/minecraft/class_339;
 	FIELD field_26681 buttonList Lnet/minecraft/class_353;

diff --git a/.../gui/screen/options/OptionsScreen.mapping → ...t/gui/screen/option/OptionsScreen.mapping b/.../gui/screen/options/OptionsScreen.mapping → ...t/gui/screen/option/OptionsScreen.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/options/OptionsScreen
+CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScreen
 	FIELD field_2500 difficultyButton Lnet/minecraft/class_5676;
 	FIELD field_2501 parent Lnet/minecraft/class_437;
 	FIELD field_2502 settings Lnet/minecraft/class_315;

diff --git a/.../screen/options/SkinOptionsScreen.mapping → ...i/screen/option/SkinOptionsScreen.mapping b/.../screen/options/SkinOptionsScreen.mapping → ...i/screen/option/SkinOptionsScreen.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_440 net/minecraft/client/gui/screen/options/SkinOptionsScreen
+CLASS net/minecraft/class_440 net/minecraft/client/gui/screen/option/SkinOptionsScreen
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 gameOptions

diff --git a/...screen/options/SoundOptionsScreen.mapping → .../screen/option/SoundOptionsScreen.mapping b/...screen/options/SoundOptionsScreen.mapping → .../screen/option/SoundOptionsScreen.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/options/SoundOptionsScreen
+CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/option/SoundOptionsScreen
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 options

diff --git a/...t/minecraft/client/options/AoMode.mapping → ...et/minecraft/client/option/AoMode.mapping b/...t/minecraft/client/options/AoMode.mapping → ...et/minecraft/client/option/AoMode.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4060 net/minecraft/client/options/AoMode
+CLASS net/minecraft/class_4060 net/minecraft/client/option/AoMode
 	FIELD field_18147 VALUES [Lnet/minecraft/class_4060;
 	FIELD field_18148 id I
 	FIELD field_18149 translationKey Ljava/lang/String;

diff --git a/...ft/client/options/AttackIndicator.mapping → ...aft/client/option/AttackIndicator.mapping b/...ft/client/options/AttackIndicator.mapping → ...aft/client/option/AttackIndicator.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4061 net/minecraft/client/options/AttackIndicator
+CLASS net/minecraft/class_4061 net/minecraft/client/option/AttackIndicator
 	FIELD field_18154 VALUES [Lnet/minecraft/class_4061;
 	FIELD field_18155 id I
 	FIELD field_18156 translationKey Ljava/lang/String;

diff --git a/...aft/client/options/ChatVisibility.mapping → ...raft/client/option/ChatVisibility.mapping b/...aft/client/options/ChatVisibility.mapping → ...raft/client/option/ChatVisibility.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_1659 net/minecraft/client/options/ChatVisibility
+CLASS net/minecraft/class_1659 net/minecraft/client/option/ChatVisibility
 	FIELD field_7534 VALUES [Lnet/minecraft/class_1659;
 	FIELD field_7535 id I
 	FIELD field_7540 translationKey Ljava/lang/String;

diff --git a/...ft/client/options/CloudRenderMode.mapping → ...aft/client/option/CloudRenderMode.mapping b/...ft/client/options/CloudRenderMode.mapping → ...aft/client/option/CloudRenderMode.mapping
@@ -1,3 +1,3 @@
-CLASS net/minecraft/class_4063 net/minecraft/client/options/CloudRenderMode
+CLASS net/minecraft/class_4063 net/minecraft/client/option/CloudRenderMode
 	FIELD field_18167 translationKey Ljava/lang/String;
 	METHOD method_18498 getTranslationKey ()Ljava/lang/String;
diff --git a/...raft/client/options/CyclingOption.mapping → ...craft/client/option/CyclingOption.mapping b/...raft/client/options/CyclingOption.mapping → ...craft/client/option/CyclingOption.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4064 net/minecraft/client/options/CyclingOption
+CLASS net/minecraft/class_4064 net/minecraft/client/option/CyclingOption
 	FIELD field_18169 setter Lnet/minecraft/class_4064$class_5675;
 	FIELD field_27953 getter Ljava/util/function/Function;
 	METHOD <init> (Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;Ljava/util/function/Supplier;)V

diff --git a/...craft/client/options/DoubleOption.mapping → ...ecraft/client/option/DoubleOption.mapping b/...craft/client/options/DoubleOption.mapping → ...ecraft/client/option/DoubleOption.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4067 net/minecraft/client/options/DoubleOption
+CLASS net/minecraft/class_4067 net/minecraft/client/option/DoubleOption
 	FIELD field_18204 step F
 	FIELD field_18205 min D
 	FIELD field_18206 max D

diff --git a/mappings/net/minecraft/client/option/FullScreenOption.mapping b/mappings/net/minecraft/client/option/FullScreenOption.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_4454 net/minecraft/client/option/FullScreenOption
diff --git a/...ecraft/client/options/GameOptions.mapping → ...necraft/client/option/GameOptions.mapping b/...ecraft/client/options/GameOptions.mapping → ...necraft/client/option/GameOptions.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions
+CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_1814 cloudRenderMode Lnet/minecraft/class_4063;
 	FIELD field_1815 hideServerAddress Z
 	FIELD field_1816 keySmoothCamera Lnet/minecraft/class_304;

diff --git a/...craft/client/options/GraphicsMode.mapping → ...ecraft/client/option/GraphicsMode.mapping b/...craft/client/options/GraphicsMode.mapping → ...ecraft/client/option/GraphicsMode.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_5365 net/minecraft/client/options/GraphicsMode
+CLASS net/minecraft/class_5365 net/minecraft/client/option/GraphicsMode
 	FIELD field_25430 VALUES [Lnet/minecraft/class_5365;
 	FIELD field_25431 id I
 	FIELD field_25432 translationKey Ljava/lang/String;

diff --git a/...raft/client/options/HotbarStorage.mapping → ...craft/client/option/HotbarStorage.mapping b/...raft/client/options/HotbarStorage.mapping → ...craft/client/option/HotbarStorage.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_302 net/minecraft/client/options/HotbarStorage
+CLASS net/minecraft/class_302 net/minecraft/client/option/HotbarStorage
 	FIELD field_1644 entries [Lnet/minecraft/class_748;
 	FIELD field_1645 loaded Z
 	FIELD field_1646 file Ljava/io/File;

diff --git a/...client/options/HotbarStorageEntry.mapping → .../client/option/HotbarStorageEntry.mapping b/...client/options/HotbarStorageEntry.mapping → .../client/option/HotbarStorageEntry.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_748 net/minecraft/client/options/HotbarStorageEntry
+CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry
 	FIELD field_3948 delegate Lnet/minecraft/class_2371;
 	METHOD method_3152 fromListTag (Lnet/minecraft/class_2499;)V
 	METHOD method_3153 toListTag ()Lnet/minecraft/class_2499;
diff --git a/...necraft/client/options/KeyBinding.mapping → ...inecraft/client/option/KeyBinding.mapping b/...necraft/client/options/KeyBinding.mapping → ...inecraft/client/option/KeyBinding.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_304 net/minecraft/client/options/KeyBinding
+CLASS net/minecraft/class_304 net/minecraft/client/option/KeyBinding
 	FIELD field_1652 keyCategories Ljava/util/Set;
 	FIELD field_1653 pressed Z
 	FIELD field_1654 defaultKey Lnet/minecraft/class_3675$class_306;

diff --git a/mappings/net/minecraft/client/option/LogarithmicOption.mapping b/mappings/net/minecraft/client/option/LogarithmicOption.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_4287 net/minecraft/client/option/LogarithmicOption
diff --git a/...craft/client/options/NarratorMode.mapping → ...ecraft/client/option/NarratorMode.mapping b/...craft/client/options/NarratorMode.mapping → ...ecraft/client/option/NarratorMode.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4065 net/minecraft/client/options/NarratorMode
+CLASS net/minecraft/class_4065 net/minecraft/client/option/NarratorMode
 	FIELD field_18180 VALUES [Lnet/minecraft/class_4065;
 	FIELD field_18181 id I
 	FIELD field_24212 name Lnet/minecraft/class_2561;

diff --git a/...t/minecraft/client/options/Option.mapping → ...et/minecraft/client/option/Option.mapping b/...t/minecraft/client/options/Option.mapping → ...et/minecraft/client/option/Option.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_316 net/minecraft/client/options/Option
+CLASS net/minecraft/class_316 net/minecraft/client/option/Option
 	FIELD field_18184 ENTITY_SHADOWS Lnet/minecraft/class_4064;
 	FIELD field_18185 FORCE_UNICODE_FONT Lnet/minecraft/class_4064;
 	FIELD field_18186 REALMS_NOTIFICATIONS Lnet/minecraft/class_4064;

diff --git a/...raft/client/options/ParticlesMode.mapping → ...craft/client/option/ParticlesMode.mapping b/...raft/client/options/ParticlesMode.mapping → ...craft/client/option/ParticlesMode.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4066 net/minecraft/client/options/ParticlesMode
+CLASS net/minecraft/class_4066 net/minecraft/client/option/ParticlesMode
 	FIELD field_18200 VALUES [Lnet/minecraft/class_4066;
 	FIELD field_18201 id I
 	FIELD field_18202 translationKey Ljava/lang/String;

diff --git a/...ecraft/client/options/Perspective.mapping → ...necraft/client/option/Perspective.mapping b/...ecraft/client/options/Perspective.mapping → ...necraft/client/option/Perspective.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_5498 net/minecraft/client/options/Perspective
+CLASS net/minecraft/class_5498 net/minecraft/client/option/Perspective
 	FIELD field_26667 VALUES [Lnet/minecraft/class_5498;
 	FIELD field_26668 firstPerson Z
 	FIELD field_26669 frontView Z

diff --git a/...necraft/client/options/ServerList.mapping → ...inecraft/client/option/ServerList.mapping b/...necraft/client/options/ServerList.mapping → ...inecraft/client/option/ServerList.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_641 net/minecraft/client/options/ServerList
+CLASS net/minecraft/class_641 net/minecraft/client/option/ServerList
 	FIELD field_3749 servers Ljava/util/List;
 	FIELD field_3750 client Lnet/minecraft/class_310;
 	FIELD field_3751 LOGGER Lorg/apache/logging/log4j/Logger;

diff --git a/...t/client/options/StickyKeyBinding.mapping → ...ft/client/option/StickyKeyBinding.mapping b/...t/client/options/StickyKeyBinding.mapping → ...ft/client/option/StickyKeyBinding.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4666 net/minecraft/client/options/StickyKeyBinding
+CLASS net/minecraft/class_4666 net/minecraft/client/option/StickyKeyBinding
 	FIELD field_21334 toggleGetter Ljava/util/function/BooleanSupplier;
 	METHOD <init> (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/BooleanSupplier;)V
 		ARG 1 id

diff --git a/mappings/net/minecraft/client/options/FullScreenOption.mapping b/mappings/net/minecraft/client/options/FullScreenOption.mapping
diff --git a/mappings/net/minecraft/client/options/LogarithmicOption.mapping b/mappings/net/minecraft/client/options/LogarithmicOption.mapping
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/class_4454 net/minecraft/client/option/FullScreenOption
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/class_4287 net/minecraft/client/option/LogarithmicOption