From 3c373a9870196513c5205e9dd6f3d5357deb5df3 Mon Sep 17 00:00:00 2001 From: haykam821 <24855774+haykam821@users.noreply.github.com> Date: Thu, 8 Oct 2020 03:51:44 -0400 Subject: [PATCH] Fix some static final fields not having uppercase names (#1780) * Fix some static final fields not having uppercase names * Fix typo in capitalization of static final message field Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../client/gui/screen/PresetsScreen.mapping | 2 +- .../ingame/CreativeInventoryScreen.mapping | 2 +- .../MultiplayerWarningScreen.mapping | 8 ++-- .../client/texture/TextureStitcher.mapping | 2 +- .../command/argument/TimeArgumentType.mapping | 2 +- .../net/minecraft/datafixer/Schemas.mapping | 2 +- .../fix/ChunkPalettedStorageFix.mapping | 40 +++++++++---------- .../minecraft/entity/data/DataTracker.mapping | 2 +- .../util/collection/Int2ObjectBiMap.mapping | 2 +- .../math/noise/SimplexNoiseSampler.mapping | 2 +- .../world/chunk/ChunkSection.mapping | 2 +- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index 3deb2d2355..f737fdaec5 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen - FIELD field_2518 presets Ljava/util/List; + FIELD field_2518 PRESETS Ljava/util/List; FIELD field_2519 parent Lnet/minecraft/class_413; FIELD field_2520 shareText Lnet/minecraft/class_2561; FIELD field_2521 listWidget Lnet/minecraft/class_430$class_4196; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index af7dcafe00..d5601e6078 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv FIELD field_2892 scrolling Z FIELD field_2893 TEXTURE Lnet/minecraft/class_2960; FIELD field_2894 searchBox Lnet/minecraft/class_342; - FIELD field_2895 inventory Lnet/minecraft/class_1277; + FIELD field_2895 INVENTORY Lnet/minecraft/class_1277; FIELD field_2896 selectedTab I METHOD (Lnet/minecraft/class_1657;)V ARG 1 player diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping index 14ef40cbd5..7110ce6dc9 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_4749 net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen FIELD field_21842 parent Lnet/minecraft/class_437; - FIELD field_21843 header Lnet/minecraft/class_2561; - FIELD field_21844 message Lnet/minecraft/class_2561; - FIELD field_21845 checkMessage Lnet/minecraft/class_2561; - FIELD field_21846 proceedText Lnet/minecraft/class_2561; + FIELD field_21843 HEADER Lnet/minecraft/class_2561; + FIELD field_21844 MESSAGE Lnet/minecraft/class_2561; + FIELD field_21845 CHECK_MESSAGE Lnet/minecraft/class_2561; + FIELD field_21846 PROCEED_TEXT Lnet/minecraft/class_2561; FIELD field_21848 checkbox Lnet/minecraft/class_4286; FIELD field_21849 lines Lnet/minecraft/class_5489; METHOD (Lnet/minecraft/class_437;)V diff --git a/mappings/net/minecraft/client/texture/TextureStitcher.mapping b/mappings/net/minecraft/client/texture/TextureStitcher.mapping index be7a2fcaad..556f925c0e 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcher.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcher.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher - FIELD field_18030 comparator Ljava/util/Comparator; + FIELD field_18030 COMPARATOR Ljava/util/Comparator; FIELD field_5237 holders Ljava/util/Set; FIELD field_5238 maxHeight I FIELD field_5239 slots Ljava/util/List; diff --git a/mappings/net/minecraft/command/argument/TimeArgumentType.mapping b/mappings/net/minecraft/command/argument/TimeArgumentType.mapping index dd90f231bf..d56d0a4e81 100644 --- a/mappings/net/minecraft/command/argument/TimeArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/TimeArgumentType.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_2245 net/minecraft/command/argument/TimeArgumentType FIELD field_9969 EXAMPLES Ljava/util/Collection; FIELD field_9970 INVALID_UNIT_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_9971 INVALID_COUNT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_9972 units Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_9972 UNITS Lit/unimi/dsi/fastutil/objects/Object2IntMap; 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/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping index 74340d341d..ec00d1c0b0 100644 --- a/mappings/net/minecraft/datafixer/Schemas.mapping +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas FIELD field_15775 EMPTY_IDENTIFIER_NORMALIZE Ljava/util/function/BiFunction; FIELD field_15776 EMPTY Ljava/util/function/BiFunction; - FIELD field_15777 fixer Lcom/mojang/datafixers/DataFixer; + FIELD field_15777 FIXER Lcom/mojang/datafixers/DataFixer; METHOD method_15450 getFixer ()Lcom/mojang/datafixers/DataFixer; METHOD method_15451 build (Lcom/mojang/datafixers/DataFixerBuilder;)V ARG 0 builder diff --git a/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping index 3e6fe9842b..cb53469b99 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping @@ -1,25 +1,25 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageFix - FIELD field_15834 grassUpper Lcom/mojang/serialization/Dynamic; - FIELD field_15835 roseUpper Lcom/mojang/serialization/Dynamic; - FIELD field_15836 door Ljava/util/Map; - FIELD field_15837 colors Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - FIELD field_15838 snowyGrass Lcom/mojang/serialization/Dynamic; - FIELD field_15839 sunflowerUpper Lcom/mojang/serialization/Dynamic; - FIELD field_15840 pumpkin Lcom/mojang/serialization/Dynamic; - FIELD field_15841 flowerPot Ljava/util/Map; - FIELD field_15842 blocksNeedingSideUpdate Ljava/util/BitSet; - FIELD field_15843 air Lcom/mojang/serialization/Dynamic; + FIELD field_15834 GRASS_UPPER Lcom/mojang/serialization/Dynamic; + FIELD field_15835 ROSE_UPPER Lcom/mojang/serialization/Dynamic; + FIELD field_15836 DOOR Ljava/util/Map; + FIELD field_15837 COLORS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_15838 SNOWY_GRASS Lcom/mojang/serialization/Dynamic; + FIELD field_15839 SUNFLOWER_UPPER Lcom/mojang/serialization/Dynamic; + FIELD field_15840 PUMPKIN Lcom/mojang/serialization/Dynamic; + FIELD field_15841 FLOWER_POT Ljava/util/Map; + FIELD field_15842 BLOCKS_NEEDING_SIDE_UPDATE Ljava/util/BitSet; + FIELD field_15843 AIR Lcom/mojang/serialization/Dynamic; FIELD field_15844 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_15845 fernUpper Lcom/mojang/serialization/Dynamic; - FIELD field_15846 noteBlock Ljava/util/Map; - FIELD field_15847 peonyUpper Lcom/mojang/serialization/Dynamic; - FIELD field_15848 lilacUpper Lcom/mojang/serialization/Dynamic; - FIELD field_15849 bed Ljava/util/Map; - FIELD field_15850 snowyMycelium Lcom/mojang/serialization/Dynamic; - FIELD field_15851 banner Ljava/util/Map; - FIELD field_15852 podzol Lcom/mojang/serialization/Dynamic; - FIELD field_15853 skull Ljava/util/Map; - FIELD field_15854 blocksNeedingInPlaceUpdate Ljava/util/BitSet; + FIELD field_15845 FERN_UPPER Lcom/mojang/serialization/Dynamic; + FIELD field_15846 NOTE_BLOCK Ljava/util/Map; + FIELD field_15847 PEONY_UPPER Lcom/mojang/serialization/Dynamic; + FIELD field_15848 LILAC_UPPER Lcom/mojang/serialization/Dynamic; + FIELD field_15849 BED Ljava/util/Map; + FIELD field_15850 SNOWY_MYCELIUM Lcom/mojang/serialization/Dynamic; + FIELD field_15851 BANNER Ljava/util/Map; + FIELD field_15852 PODZOL Lcom/mojang/serialization/Dynamic; + FIELD field_15853 SKULL Ljava/util/Map; + FIELD field_15854 BLOCKS_NEEDING_IN_PLACE_UPDATE Ljava/util/BitSet; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index 71bf78d68b..bff2ea64d9 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker FIELD field_13329 dirty Z FIELD field_13330 empty Z FIELD field_13331 entries Ljava/util/Map; - FIELD field_13332 trackedEntities Ljava/util/Map; + FIELD field_13332 TRACKED_ENTITIES Ljava/util/Map; FIELD field_13333 trackedEntity Lnet/minecraft/class_1297; FIELD field_13334 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13335 lock Ljava/util/concurrent/locks/ReadWriteLock; diff --git a/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping b/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping index c228af1f20..e166366556 100644 --- a/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping +++ b/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_3513 net/minecraft/util/collection/Int2ObjectBiMap FIELD field_15647 idToValues [Ljava/lang/Object; FIELD field_15648 size I FIELD field_15649 nextId I - FIELD field_15650 empty Ljava/lang/Object; + FIELD field_15650 EMPTY Ljava/lang/Object; FIELD field_15651 values [Ljava/lang/Object; METHOD (I)V ARG 1 size diff --git a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping index 4e9a2569e5..a9bd119680 100644 --- a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3541 net/minecraft/util/math/noise/SimplexNoiseSampler FIELD field_15761 originZ D FIELD field_15762 originY D FIELD field_15763 originX D - FIELD field_15764 sqrt3 D + FIELD field_15764 SQRT_3 D FIELD field_15765 permutations [I FIELD field_15766 gradients [[I FIELD field_15767 UNSKEW_FACTOR_2D D diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index c09617c9f5..091370a7c7 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection FIELD field_12877 nonEmptyBlockCount S FIELD field_12878 container Lnet/minecraft/class_2841; - FIELD field_12879 palette Lnet/minecraft/class_2837; + FIELD field_12879 PALETTE Lnet/minecraft/class_2837; FIELD field_12880 yOffset I FIELD field_12881 nonEmptyFluidCount S FIELD field_12882 randomTickableBlockCount S