From 5c3acefeeb3b294265309dbf19a093a38256dc0f Mon Sep 17 00:00:00 2001 From: ByMartrixX Date: Sat, 7 Aug 2021 11:51:52 -0400 Subject: [PATCH] Use upper snake case with static final fields (#2624) * Use upper snake case with static final fields * Fix fields that I missed --- mappings/net/minecraft/block/AzaleaBlock.mapping | 2 +- mappings/net/minecraft/client/gl/GlDebug.mapping | 2 +- .../client/gui/screen/ConfirmChatLinkScreen.mapping | 4 ++-- mappings/net/minecraft/client/option/KeyBinding.mapping | 8 ++++---- .../client/realms/dto/RealmsServerPlayerList.mapping | 2 +- .../gui/screen/RealmsDownloadLatestWorldScreen.mapping | 2 +- .../gui/screen/RealmsLongConfirmationScreen.mapping | 4 ++-- .../gui/screen/RealmsLongRunningMcoTaskScreen.mapping | 2 +- .../client/realms/gui/screen/RealmsMainScreen.mapping | 2 +- .../gui/screen/RealmsSelectFileToUploadScreen.mapping | 4 ++-- .../gui/screen/RealmsSubscriptionInfoScreen.mapping | 8 ++++---- .../client/realms/util/RealmsTextureManager.mapping | 6 +++--- .../net/minecraft/client/realms/util/RealmsUtil.mapping | 4 ++-- .../minecraft/client/realms/util/UploadTokenCache.mapping | 2 +- .../client/render/block/BlockModelRenderer.mapping | 2 +- .../client/render/entity/EntityRenderers.mapping | 4 ++-- .../entity/feature/VillagerResourceMetadata.mapping | 2 +- .../render/entity/model/SilverfishEntityModel.mapping | 4 ++-- mappings/net/minecraft/client/sound/SoundSystem.mapping | 2 +- .../net/minecraft/command/EntitySelectorOptions.mapping | 2 +- .../net/minecraft/command/argument/ArgumentTypes.mapping | 4 ++-- .../command/argument/EntityAnchorArgumentType.mapping | 2 +- .../command/argument/ItemSlotArgumentType.mapping | 2 +- .../net/minecraft/datafixer/fix/ChunkStatusFix2.mapping | 2 +- .../fix/ChunkStructuresTemplateRenameFix.mapping | 2 +- mappings/net/minecraft/datafixer/fix/RecipeFix.mapping | 2 +- .../net/minecraft/datafixer/fix/RecipeRenamingFix.mapping | 2 +- .../net/minecraft/enchantment/DamageEnchantment.mapping | 8 ++++---- .../net/minecraft/resource/DefaultResourcePack.mapping | 2 +- mappings/net/minecraft/test/TestFunctions.mapping | 2 +- mappings/net/minecraft/test/TestServer.mapping | 4 ++-- .../minecraft/world/level/storage/AlphaChunkIo.mapping | 2 +- 32 files changed, 51 insertions(+), 51 deletions(-) diff --git a/mappings/net/minecraft/block/AzaleaBlock.mapping b/mappings/net/minecraft/block/AzaleaBlock.mapping index 76722dcf76..5b7471dedd 100644 --- a/mappings/net/minecraft/block/AzaleaBlock.mapping +++ b/mappings/net/minecraft/block/AzaleaBlock.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_5800 net/minecraft/block/AzaleaBlock FIELD field_30996 SHAPE Lnet/minecraft/class_265; - FIELD field_33563 generator Lnet/minecraft/class_6349; + FIELD field_33563 GENERATOR Lnet/minecraft/class_6349; diff --git a/mappings/net/minecraft/client/gl/GlDebug.mapping b/mappings/net/minecraft/client/gl/GlDebug.mapping index c0f62c046b..22283e61da 100644 --- a/mappings/net/minecraft/client/gl/GlDebug.mapping +++ b/mappings/net/minecraft/client/gl/GlDebug.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1008 net/minecraft/client/gl/GlDebug FIELD field_33669 DEBUG_MESSAGE_QUEUE_SIZE I - FIELD field_33670 debugMessages Ljava/util/Queue; + FIELD field_33670 DEBUG_MESSAGES Ljava/util/Queue; FIELD field_33671 lastDebugMessage Lnet/minecraft/class_1008$class_6359; FIELD field_33672 debugMessageEnabled Z FIELD field_4915 KHR_VERBOSITY_LEVELS Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping index ef1cee329e..989df1a5b0 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_407 net/minecraft/client/gui/screen/ConfirmChatLinkScreen FIELD field_2370 drawWarning Z FIELD field_2371 link Ljava/lang/String; - FIELD field_2372 warning Lnet/minecraft/class_2561; - FIELD field_2373 copy Lnet/minecraft/class_2561; + FIELD field_2372 WARNING Lnet/minecraft/class_2561; + FIELD field_2373 COPY Lnet/minecraft/class_2561; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljava/lang/String;Z)V ARG 1 callback ARG 2 link diff --git a/mappings/net/minecraft/client/option/KeyBinding.mapping b/mappings/net/minecraft/client/option/KeyBinding.mapping index 0355569cfb..dd9174c8cc 100644 --- a/mappings/net/minecraft/client/option/KeyBinding.mapping +++ b/mappings/net/minecraft/client/option/KeyBinding.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_304 net/minecraft/client/option/KeyBinding - FIELD field_1652 keyCategories Ljava/util/Set; + FIELD field_1652 KEY_CATEGORIES Ljava/util/Set; FIELD field_1653 pressed Z FIELD field_1654 defaultKey Lnet/minecraft/class_3675$class_306; FIELD field_1655 boundKey Lnet/minecraft/class_3675$class_306; - FIELD field_1656 categoryOrderMap Ljava/util/Map; - FIELD field_1657 keysById Ljava/util/Map; - FIELD field_1658 keyToBindings Ljava/util/Map; + FIELD field_1656 CATEGORY_ORDER_MAP Ljava/util/Map; + FIELD field_1657 KEYS_BY_ID Ljava/util/Map; + FIELD field_1658 KEY_TO_BINDINGS Ljava/util/Map; FIELD field_1659 category Ljava/lang/String; FIELD field_1660 translationKey Ljava/lang/String; FIELD field_1661 timesPressed I diff --git a/mappings/net/minecraft/client/realms/dto/RealmsServerPlayerList.mapping b/mappings/net/minecraft/client/realms/dto/RealmsServerPlayerList.mapping index 9d3f2fc250..dae732a3ca 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsServerPlayerList.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsServerPlayerList.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_4881 net/minecraft/client/realms/dto/RealmsServerPlaye FIELD field_22626 serverId J FIELD field_22627 players Ljava/util/List; FIELD field_22628 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_22629 jsonParser Lcom/google/gson/JsonParser; + FIELD field_22629 JSON_PARSER Lcom/google/gson/JsonParser; METHOD method_25073 parsePlayers (Lcom/google/gson/JsonArray;)Ljava/util/List; ARG 0 jsonArray METHOD method_25074 parse (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4881; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping index 4c14e0a6e2..8b322165fd 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_4392 net/minecraft/client/realms/gui/screen/RealmsDown FIELD field_19863 DOTS [Ljava/lang/String; FIELD field_19864 dotIndex I FIELD field_19867 checked Z - FIELD field_19868 downloadLock Ljava/util/concurrent/locks/ReentrantLock; + FIELD field_19868 DOWNLOAD_LOCK Ljava/util/concurrent/locks/ReentrantLock; FIELD field_20494 downloadError Lnet/minecraft/class_2561; FIELD field_22693 onBack Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_22694 cancelButton Lnet/minecraft/class_4185; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping index 99716eaa08..cab38c87eb 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping @@ -17,8 +17,8 @@ CLASS net/minecraft/class_4396 net/minecraft/client/realms/gui/screen/RealmsLong METHOD method_25165 (Lnet/minecraft/class_4185;)V ARG 1 button CLASS class_4397 Type - FIELD field_19903 Warning Lnet/minecraft/class_4396$class_4397; - FIELD field_19904 Info Lnet/minecraft/class_4396$class_4397; + FIELD field_19903 WARNING Lnet/minecraft/class_4396$class_4397; + FIELD field_19904 INFO Lnet/minecraft/class_4396$class_4397; FIELD field_19905 colorCode I FIELD field_19906 text Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;ILjava/lang/String;I)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping index 3bf16dcdfd..4aad134dc8 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4398 net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen - FIELD field_19908 symbols [Ljava/lang/String; + FIELD field_19908 SYMBOLS [Ljava/lang/String; FIELD field_19909 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_19912 parent Lnet/minecraft/class_437; FIELD field_19914 title Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index fddf00a7fd..e2f33eb2a4 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_19476 overrideConfigure Z FIELD field_19477 rateLimiter Lcom/google/common/util/concurrent/RateLimiter; FIELD field_19478 dontSetConnectedToRealms Z - FIELD field_19480 realmsDataFetcher Lnet/minecraft/class_4360; + FIELD field_19480 REALMS_DATA_FETCHER Lnet/minecraft/class_4360; FIELD field_19481 lastScrollYPosition I FIELD field_19482 lastScreen Lnet/minecraft/class_437; FIELD field_19483 realmSelectionList Lnet/minecraft/class_4325$class_4329; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping index a8134b138e..42ccfc1d42 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping @@ -8,8 +8,8 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_20055 levelList Ljava/util/List; FIELD field_20056 selectedWorld I FIELD field_20057 worldSelectionList Lnet/minecraft/class_4416$class_4418; - FIELD field_20058 worldLang Lnet/minecraft/class_2561; - FIELD field_20059 conversionLang Lnet/minecraft/class_2561; + FIELD field_20058 WORLD_LANG Lnet/minecraft/class_2561; + FIELD field_20059 CONVERSION_LANG Lnet/minecraft/class_2561; FIELD field_22717 onBack Ljava/lang/Runnable; FIELD field_26507 HARDCORE_TEXT Lnet/minecraft/class_2561; FIELD field_26508 CHEATS_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping index de338d24e1..cb4fd87a78 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping @@ -3,10 +3,10 @@ CLASS net/minecraft/class_4425 net/minecraft/client/realms/gui/screen/RealmsSubs FIELD field_20147 parent Lnet/minecraft/class_437; FIELD field_20148 serverData Lnet/minecraft/class_4877; FIELD field_20149 mainScreen Lnet/minecraft/class_437; - FIELD field_20153 subscriptionTitle Lnet/minecraft/class_2561; - FIELD field_20154 subscriptionStartLabelText Lnet/minecraft/class_2561; - FIELD field_20155 timeLeftLabelText Lnet/minecraft/class_2561; - FIELD field_20156 daysLeftLabelText Lnet/minecraft/class_2561; + FIELD field_20153 SUBSCRIPTION_TITLE Lnet/minecraft/class_2561; + FIELD field_20154 SUBSCRIPTION_START_LABEL_TEXT Lnet/minecraft/class_2561; + FIELD field_20155 TIME_LEFT_LABEL_TEXT Lnet/minecraft/class_2561; + FIELD field_20156 DAYS_LEFT_LABEL_TEXT Lnet/minecraft/class_2561; FIELD field_20157 daysLeft Lnet/minecraft/class_2561; FIELD field_20158 startDate Lnet/minecraft/class_2561; FIELD field_20159 type Lnet/minecraft/class_4887$class_4322; diff --git a/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping b/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping index 89ebcd3b49..99c7c21bbc 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4446 net/minecraft/client/realms/util/RealmsTextureManager - FIELD field_20253 textures Ljava/util/Map; - FIELD field_20254 skinFetchStatus Ljava/util/Map; - FIELD field_20255 fetchedSkins Ljava/util/Map; + FIELD field_20253 TEXTURES Ljava/util/Map; + FIELD field_20254 SKIN_FETCH_STATUS Ljava/util/Map; + FIELD field_20255 FETCHED_SKINS Ljava/util/Map; FIELD field_20256 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_22730 ISLES Lnet/minecraft/class_2960; METHOD method_21558 bindFace (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping index 41ef77889a..6e5d993bc0 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4448 net/minecraft/client/realms/util/RealmsUtil FIELD field_20260 gameProfileCache Lcom/google/common/cache/LoadingCache; - FIELD field_20261 authenticationService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; - FIELD field_20262 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; + FIELD field_20261 AUTHENTICATION_SERVICE Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; + FIELD field_20262 SESSION_SERVICE Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD field_32129 SECONDS_PER_MINUTE I FIELD field_32130 SECONDS_PER_HOUR I FIELD field_32131 SECONDS_PER_DAY I diff --git a/mappings/net/minecraft/client/realms/util/UploadTokenCache.mapping b/mappings/net/minecraft/client/realms/util/UploadTokenCache.mapping index 8faead6e97..774801d7f5 100644 --- a/mappings/net/minecraft/client/realms/util/UploadTokenCache.mapping +++ b/mappings/net/minecraft/client/realms/util/UploadTokenCache.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4453 net/minecraft/client/realms/util/UploadTokenCache - FIELD field_20270 tokenCache Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_20270 TOKEN_CACHE Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; METHOD method_21585 get (J)Ljava/lang/String; ARG 0 worldId METHOD method_21586 put (JLjava/lang/String;)V diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 5c1ad78d62..b3bfe4dcc4 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender FIELD field_27743 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_32784 BRIGHTNESS_CACHE_MAX_SIZE I FIELD field_4178 colors Lnet/minecraft/class_324; - FIELD field_4179 brightnessCache Ljava/lang/ThreadLocal; + FIELD field_4179 BRIGHTNESS_CACHE Ljava/lang/ThreadLocal; METHOD (Lnet/minecraft/class_324;)V ARG 1 colors METHOD method_20544 enableBrightnessCache ()V diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping index 8944cf912d..61ef5b7d94 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_5619 net/minecraft/client/render/entity/EntityRenderers FIELD field_27767 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_27768 rendererFactories Ljava/util/Map; - FIELD field_27769 playerRendererFactories Ljava/util/Map; + FIELD field_27768 RENDERER_FACTORIES Ljava/util/Map; + FIELD field_27769 PLAYER_RENDERER_FACTORIES Ljava/util/Map; FIELD field_32922 DEFAULT Ljava/lang/String; METHOD method_32172 isMissingRendererFactories ()Z METHOD method_32173 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_5617;)V diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping index e5d899b36a..f3a82ee49e 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_3888 net/minecraft/client/render/entity/feature/Villag ARG 1 hatType METHOD method_17167 getHatType ()Lnet/minecraft/class_3888$class_3889; CLASS class_3889 HatType - FIELD field_17163 byName Ljava/util/Map; + FIELD field_17163 BY_NAME Ljava/util/Map; FIELD field_17164 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name diff --git a/mappings/net/minecraft/client/render/entity/model/SilverfishEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SilverfishEntityModel.mapping index f80f9be7b2..e0f149d36a 100644 --- a/mappings/net/minecraft/client/render/entity/model/SilverfishEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SilverfishEntityModel.mapping @@ -2,8 +2,8 @@ CLASS net/minecraft/class_604 net/minecraft/client/render/entity/model/Silverfis FIELD field_27497 root Lnet/minecraft/class_630; FIELD field_32556 BODY_PARTS_COUNT I FIELD field_3557 scales [Lnet/minecraft/class_630; - FIELD field_3558 segmentLocations [[I - FIELD field_3559 segmentSizes [[I + FIELD field_3558 SEGMENT_LOCATIONS [[I + FIELD field_3559 SEGMENT_SIZES [[I FIELD field_3560 body [Lnet/minecraft/class_630; METHOD (Lnet/minecraft/class_630;)V ARG 1 root diff --git a/mappings/net/minecraft/client/sound/SoundSystem.mapping b/mappings/net/minecraft/client/sound/SoundSystem.mapping index 11c56a3ee3..6964511a08 100644 --- a/mappings/net/minecraft/client/sound/SoundSystem.mapping +++ b/mappings/net/minecraft/client/sound/SoundSystem.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem FIELD field_5557 tickingSounds Ljava/util/List; FIELD field_5558 listeners Ljava/util/List; FIELD field_5559 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_5561 unknownSounds Ljava/util/Set; + FIELD field_5561 UNKNOWN_SOUNDS Ljava/util/Set; FIELD field_5563 started Z FIELD field_5566 startTicks Ljava/util/Map; METHOD (Lnet/minecraft/class_1144;Lnet/minecraft/class_315;Lnet/minecraft/class_3300;)V diff --git a/mappings/net/minecraft/command/EntitySelectorOptions.mapping b/mappings/net/minecraft/command/EntitySelectorOptions.mapping index 4438102602..031918c956 100644 --- a/mappings/net/minecraft/command/EntitySelectorOptions.mapping +++ b/mappings/net/minecraft/command/EntitySelectorOptions.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions FIELD field_10888 IRREVERSIBLE_SORT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10889 INVALID_MODE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10890 NEGATIVE_DISTANCE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_10891 options Ljava/util/Map; + FIELD field_10891 OPTIONS Ljava/util/Map; FIELD field_10892 INVALID_TYPE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10893 NEGATIVE_LEVEL_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_9930 suggestOptions (Lnet/minecraft/class_2303;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V diff --git a/mappings/net/minecraft/command/argument/ArgumentTypes.mapping b/mappings/net/minecraft/command/argument/ArgumentTypes.mapping index 5b39ed8e78..c6ddd433ae 100644 --- a/mappings/net/minecraft/command/argument/ArgumentTypes.mapping +++ b/mappings/net/minecraft/command/argument/ArgumentTypes.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2316 net/minecraft/command/argument/ArgumentTypes - FIELD field_10921 classMap Ljava/util/Map; - FIELD field_10922 idMap Ljava/util/Map; + FIELD field_10921 CLASS_MAP Ljava/util/Map; + FIELD field_10922 ID_MAP Ljava/util/Map; FIELD field_10923 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_10013 byClass (Lcom/mojang/brigadier/arguments/ArgumentType;)Lnet/minecraft/class_2316$class_2317; METHOD method_10014 fromPacket (Lnet/minecraft/class_2540;)Lcom/mojang/brigadier/arguments/ArgumentType; diff --git a/mappings/net/minecraft/command/argument/EntityAnchorArgumentType.mapping b/mappings/net/minecraft/command/argument/EntityAnchorArgumentType.mapping index 1302bc93e1..9cc9e86b32 100644 --- a/mappings/net/minecraft/command/argument/EntityAnchorArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/EntityAnchorArgumentType.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_2183 net/minecraft/command/argument/EntityAnchorArgume CLASS class_2184 EntityAnchor FIELD field_9848 offset Ljava/util/function/BiFunction; FIELD field_9849 id Ljava/lang/String; - FIELD field_9852 anchors Ljava/util/Map; + FIELD field_9852 ANCHORS Ljava/util/Map; METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/BiFunction;)V ARG 3 id ARG 4 offset diff --git a/mappings/net/minecraft/command/argument/ItemSlotArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemSlotArgumentType.mapping index d12edce665..005ef8ef72 100644 --- a/mappings/net/minecraft/command/argument/ItemSlotArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ItemSlotArgumentType.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2240 net/minecraft/command/argument/ItemSlotArgumentType FIELD field_9955 UNKNOWN_SLOT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_9956 EXAMPLES Ljava/util/Collection; - FIELD field_9957 slotNamesToSlotCommandId Ljava/util/Map; + FIELD field_9957 SLOT_NAMES_TO_SLOT_COMMAND_ID Ljava/util/Map; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping b/mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping index 07a2041ab6..17fa3cb536 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3788 net/minecraft/datafixer/fix/ChunkStatusFix2 - FIELD field_16691 statusMap Ljava/util/Map; + FIELD field_16691 STATUS_MAP Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping index 30024e6c70..7c4c4798e4 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3590 net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix - FIELD field_15889 structures Lcom/google/common/collect/ImmutableMap; + FIELD field_15889 STRUCTURES Lcom/google/common/collect/ImmutableMap; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/RecipeFix.mapping b/mappings/net/minecraft/datafixer/fix/RecipeFix.mapping index 543eaf9608..882e69baf5 100644 --- a/mappings/net/minecraft/datafixer/fix/RecipeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RecipeFix.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1206 net/minecraft/datafixer/fix/RecipeFix - FIELD field_5708 recipes Ljava/util/Map; + FIELD field_5708 RECIPES Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping b/mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping index 4a2343e2c5..46202fdaf9 100644 --- a/mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1205 net/minecraft/datafixer/fix/RecipeRenamingFix - FIELD field_5707 recipes Ljava/util/Map; + FIELD field_5707 RECIPES Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/enchantment/DamageEnchantment.mapping b/mappings/net/minecraft/enchantment/DamageEnchantment.mapping index 54aa30c1d1..763423b6ec 100644 --- a/mappings/net/minecraft/enchantment/DamageEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/DamageEnchantment.mapping @@ -2,10 +2,10 @@ CLASS net/minecraft/class_1882 net/minecraft/enchantment/DamageEnchantment FIELD field_30947 ALL_INDEX I FIELD field_30948 UNDEAD_INDEX I FIELD field_30949 ARTHROPODS_INDEX I - FIELD field_9063 basePowers [I - FIELD field_9064 minMaxPowerDifferences [I - FIELD field_9065 typeNames [Ljava/lang/String; - FIELD field_9066 powersPerLevel [I + FIELD field_9063 BASE_POWERS [I + FIELD field_9064 MIN_MAX_POWER_DIFFERENCES [I + FIELD field_9065 TYPE_NAMES [Ljava/lang/String; + FIELD field_9066 POWERS_PER_LEVEL [I FIELD field_9067 typeIndex I METHOD (Lnet/minecraft/class_1887$class_1888;I[Lnet/minecraft/class_1304;)V ARG 1 weight diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index 618b138663..70be60decc 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack FIELD field_14194 resourceClass Ljava/lang/Class; FIELD field_14195 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_14196 resourcePath Ljava/nio/file/Path; - FIELD field_17917 typeToFileSystem Ljava/util/Map; + FIELD field_17917 TYPE_TO_FILE_SYSTEM Ljava/util/Map; FIELD field_26938 metadata Lnet/minecraft/class_3272; METHOD (Lnet/minecraft/class_3272;[Ljava/lang/String;)V ARG 1 metadata diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/TestFunctions.mapping index 9d040b7073..4978ddd47c 100644 --- a/mappings/net/minecraft/test/TestFunctions.mapping +++ b/mappings/net/minecraft/test/TestFunctions.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions FIELD field_20570 TEST_FUNCTIONS Ljava/util/Collection; - FIELD field_20571 testClasses Ljava/util/Set; + FIELD field_20571 TEST_CLASSES Ljava/util/Set; FIELD field_20572 BEFORE_BATCH_CONSUMERS Ljava/util/Map; FIELD field_25302 FAILED_TEST_FUNCTIONS Ljava/util/Collection; FIELD field_27806 AFTER_BATCH_CONSUMERS Ljava/util/Map; diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 7c44784bc9..38241d2818 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -2,8 +2,8 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer FIELD field_33156 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_33158 batches Ljava/util/List; FIELD field_33159 pos Lnet/minecraft/class_2338; - FIELD field_33160 gameRules Lnet/minecraft/class_1928; - FIELD field_33161 testLevel Lnet/minecraft/class_1940; + FIELD field_33160 GAME_RULES Lnet/minecraft/class_1928; + FIELD field_33161 TEST_LEVEL Lnet/minecraft/class_1940; FIELD field_33162 testSet Lnet/minecraft/class_4524; METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_5455$class_5457;)V ARG 1 serverThread diff --git a/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping b/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping index 7564e4f344..8bad0feff8 100644 --- a/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping +++ b/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2864 net/minecraft/world/level/storage/AlphaChunkIo - FIELD field_28130 world Lnet/minecraft/class_5539; + FIELD field_28130 WORLD Lnet/minecraft/class_5539; METHOD method_12432 convertAlphaChunk (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_2864$class_2865;Lnet/minecraft/class_2487;Lnet/minecraft/class_1966;)V ARG 1 alphaChunk ARG 2 nbt