Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Use Fabric events instead of mixins * Better event line * Better type + event firing handling * Fix creative inventory firing event for normal one * Rewrite screen name handling * Initialize `TYPE_MAP` first * Use a mixin to support `context.switched` * `switched` -> `previous_screen_type` * creative screen is opened from inventory screen * Shadow `currentScreen` * Remove TODO * Add `previous_screen_type` to meta * Add `from` switch * Clearer comment * Use access wideners for `DetailsScreen` * Clarify screen name generation with comment * Fix typo * Move screen name mapping to a separate class * Move special case handling to the mixin
- Loading branch information
Showing
7 changed files
with
224 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
141 changes: 141 additions & 0 deletions
141
src/main/java/com/denizenscript/clientizen/util/ScreenNameMapping.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| package com.denizenscript.clientizen.util; | ||
|
|
||
| import net.minecraft.client.gui.screen.*; | ||
| import net.minecraft.client.gui.screen.advancement.AdvancementsScreen; | ||
| import net.minecraft.client.gui.screen.ingame.*; | ||
| import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; | ||
| import net.minecraft.client.gui.screen.multiplayer.MultiplayerWarningScreen; | ||
| import net.minecraft.client.gui.screen.multiplayer.SocialInteractionsScreen; | ||
| import net.minecraft.client.gui.screen.option.*; | ||
| import net.minecraft.client.gui.screen.pack.ExperimentalWarningScreen; | ||
| import net.minecraft.client.gui.screen.pack.PackScreen; | ||
| import net.minecraft.client.gui.screen.report.AbuseReportReasonScreen; | ||
| import net.minecraft.client.gui.screen.report.ChatReportScreen; | ||
| import net.minecraft.client.gui.screen.report.ChatSelectionScreen; | ||
| import net.minecraft.client.gui.screen.world.*; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public class ScreenNameMapping { | ||
|
|
||
| private static final Map<Class<? extends Screen>, String> TYPE_MAP = new HashMap<>(); | ||
|
|
||
| static { | ||
| // Advancement screens | ||
| registerScreenName(AdvancementsScreen.class, "advancements"); | ||
| // In-game screens | ||
| registerScreenName(AnvilScreen.class, "anvil"); | ||
| registerScreenName(BeaconScreen.class, "beacon"); | ||
| registerScreenName(BlastFurnaceScreen.class, "blast_furnace"); | ||
| registerScreenName(BookEditScreen.class, "book_edit"); | ||
| registerScreenName(BookScreen.class, "book"); | ||
| registerScreenName(BrewingStandScreen.class, "brewing_stand"); | ||
| registerScreenName(CartographyTableScreen.class, "cartography_table"); | ||
| registerScreenName(CommandBlockScreen.class, "command_block"); | ||
| registerScreenName(CraftingScreen.class, "crafting"); | ||
| registerScreenName(CreativeInventoryScreen.class, "creative"); | ||
| registerScreenName(EnchantmentScreen.class, "enchantment"); | ||
| registerScreenName(FurnaceScreen.class, "furnace"); | ||
| registerScreenName(Generic3x3ContainerScreen.class, "generic_3x3_container"); | ||
| registerScreenName(GenericContainerScreen.class, "generic_container"); | ||
| registerScreenName(GrindstoneScreen.class, "grindstone"); | ||
| registerScreenName(HangingSignEditScreen.class, "hanging_sign_edit"); | ||
| registerScreenName(HopperScreen.class, "hopper"); | ||
| registerScreenName(HopperScreen.class, "horse"); | ||
| registerScreenName(InventoryScreen.class, "inventory"); | ||
| registerScreenName(JigsawBlockScreen.class, "jigsaw"); | ||
| registerScreenName(LecternScreen.class, "lectern"); | ||
| registerScreenName(LoomScreen.class, "loom"); | ||
| registerScreenName(MerchantScreen.class, "merchant"); | ||
| registerScreenName(MinecartCommandBlockScreen.class, "command_block_minecart"); | ||
| registerScreenName(ShulkerBoxScreen.class, "shulker_box"); | ||
| registerScreenName(SignEditScreen.class, "sign_edit"); | ||
| registerScreenName(SmithingScreen.class, "smithing"); | ||
| registerScreenName(SmokerScreen.class, "smoker"); | ||
| registerScreenName(StonecutterScreen.class, "stonecutter"); | ||
| registerScreenName(StructureBlockScreen.class, "structure_block"); | ||
| // Multiplayer screens | ||
| registerScreenName(MultiplayerScreen.class, "multiplayer"); | ||
| registerScreenName(MultiplayerWarningScreen.class, "multiplayer_warning"); | ||
| registerScreenName(SocialInteractionsScreen.class, "social_interactions"); | ||
| // Option screens | ||
| registerScreenName(AccessibilityOptionsScreen.class, "accessibility_options"); | ||
| registerScreenName(ChatOptionsScreen.class, "chat_options"); | ||
| registerScreenName(ControlsOptionsScreen.class, "controls_options"); | ||
| registerScreenName(CreditsAndAttributionScreen.class, "credits_and_attribution"); | ||
| registerScreenName(GameOptionsScreen.class, "game_options"); | ||
| registerScreenName(KeybindsScreen.class, "keybinds"); | ||
| registerScreenName(LanguageOptionsScreen.class, "language_options"); | ||
| registerScreenName(MouseOptionsScreen.class, "mouse_options"); | ||
| registerScreenName(OnlineOptionsScreen.class, "online_options"); | ||
| registerScreenName(OptionsScreen.class, "options"); | ||
| registerScreenName(SkinOptionsScreen.class, "skin_options"); | ||
| registerScreenName(SoundOptionsScreen.class, "sound_options"); | ||
| registerScreenName(TelemetryInfoScreen.class, "telemetry_info"); | ||
| registerScreenName(VideoOptionsScreen.class, "video_options"); | ||
| // Packs screens | ||
| registerScreenName(ExperimentalWarningScreen.class, "experimental_warning"); | ||
| registerScreenName(ExperimentalWarningScreen.DetailsScreen.class, "experimental_warning_details"); | ||
| registerScreenName(PackScreen.class, "pack"); | ||
| // Report screens | ||
| registerScreenName(AbuseReportReasonScreen.class, "abuse_report_reason"); | ||
| registerScreenName(ChatReportScreen.class, "chat_report"); | ||
| registerScreenName(ChatSelectionScreen.class, "chat_selection"); | ||
| // World screens | ||
| registerScreenName(CreateWorldScreen.class, "create_world"); | ||
| registerScreenName(EditGameRulesScreen.class, "edit_game_rules"); | ||
| registerScreenName(ExperimentsScreen.class, "experiments"); | ||
| registerScreenName(OptimizeWorldScreen.class, "optimize_world"); | ||
| registerScreenName(SelectWorldScreen.class, "select_world"); | ||
| registerScreenName(SymlinkWarningScreen.class, "symlink_warning"); | ||
| // Other screens | ||
| registerScreenName(AccessibilityOnboardingScreen.class, "accessibility_onboarding"); | ||
| registerScreenName(AddServerScreen.class, "add_server"); | ||
| registerScreenName(BackupPromptScreen.class, "backup_prompt"); | ||
| registerScreenName(ChatScreen.class, "chat"); | ||
| registerScreenName(ConfirmLinkScreen.class, "confirm_link"); | ||
| registerScreenName(ConfirmScreen.class, "confirm"); | ||
| registerScreenName(ConnectScreen.class, "connect"); | ||
| registerScreenName(CreditsScreen.class, "credits"); | ||
| registerScreenName(CustomizeBuffetLevelScreen.class, "customize_buffet_level"); | ||
| registerScreenName(CustomizeFlatLevelScreen.class, "customize_flat_level"); | ||
| registerScreenName(DatapackFailureScreen.class, "datapack_failure"); | ||
| registerScreenName(DeathScreen.class, "death"); | ||
| registerScreenName(DemoScreen.class, "demo"); | ||
| registerScreenName(DialogScreen.class, "dialog"); | ||
| registerScreenName(DirectConnectScreen.class, "direct_connect"); | ||
| registerScreenName(DisconnectedScreen.class, "disconnected"); | ||
| registerScreenName(DownloadingTerrainScreen.class, "downloading_terrain"); | ||
| registerScreenName(FatalErrorScreen.class, "fatal_error"); | ||
| registerScreenName(GameMenuScreen.class, "game_menu"); | ||
| registerScreenName(GameModeSelectionScreen.class, "game_mode_selection"); | ||
| registerScreenName(LevelLoadingScreen.class, "level_loading"); | ||
| registerScreenName(MessageScreen.class, "message"); | ||
| registerScreenName(NoticeScreen.class, "notice_screen"); | ||
| registerScreenName(OpenToLanScreen.class, "open_to_lan"); | ||
| registerScreenName(OutOfMemoryScreen.class, "out_of_memory"); | ||
| registerScreenName(PresetsScreen.class, "presets"); | ||
| registerScreenName(ProgressScreen.class, "progress"); | ||
| registerScreenName(Realms32BitWarningScreen.class, "realms_32_bit_warning"); | ||
| registerScreenName(SleepingChatScreen.class, "sleeping_chat"); | ||
| registerScreenName(StatsScreen.class, "stats"); | ||
| registerScreenName(TaskScreen.class, "task"); | ||
| registerScreenName(TitleScreen.class, "title"); | ||
| } | ||
|
|
||
| public static void registerScreenName(Class<? extends Screen> screenType, String name) { | ||
| TYPE_MAP.put(screenType, name); | ||
| } | ||
|
|
||
| public static String getScreenName(Class<? extends Screen> screenType) { | ||
| return TYPE_MAP.computeIfAbsent(screenType, clazz -> { | ||
| // Try dynamically generating the name - currently only for modded screens, as vanilla screens have remapped class names | ||
| String className = clazz.getSimpleName(); | ||
| if (className.endsWith("Screen")) { | ||
| className = className.substring(0, className.length() - "Screen".length()); | ||
| } | ||
| return Utilities.camelCaseToSnake(className); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessWidener v2 named | ||
|
|
||
| accessible class net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen$DetailsScreen |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters