Clean up static final fields in various datafixers (#358)

* Clean up static final fields in various datafixers

* Manually fix wrongly created clinit entry
This commit is contained in:
Urey. Xue 2018-12-24 00:56:49 -08:00 committed by Adrian Siekierka
parent d110c89950
commit 3cfa622330
22 changed files with 46 additions and 24 deletions

View File

@ -1,2 +1,2 @@
CLASS zk net/minecraft/datafixers/fixes/BiomesFix
FIELD a biomes Ljava/util/Map;
FIELD a RENAMED_BIOMES Ljava/util/Map;

View File

@ -1 +1,2 @@
CLASS zo net/minecraft/datafixers/fixes/BlockEntityIdFix
FIELD a RENAMED_BLOCK_ENTITIES Ljava/util/Map;

View File

@ -1,2 +1,3 @@
CLASS zs net/minecraft/datafixers/fixes/BlockEntitySignTextStrictJsonFix
FIELD a GSON Lcom/google/gson/Gson;
METHOD a transform (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;

View File

@ -1,11 +1,19 @@
CLASS zv net/minecraft/datafixers/fixes/BlockStateFlattening
FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
FIELD b states [Lcom/mojang/datafixers/Dynamic;
FIELD c stateObjToId Lit/unimi/dsi/fastutil/objects/Object2IntMap;
FIELD d stateStrToId Lit/unimi/dsi/fastutil/objects/Object2IntMap;
FIELD b NEW_IDS_TO_STATES [Lcom/mojang/datafixers/Dynamic;
FIELD c OLD_STATES_TO_NEW_IDS Lit/unimi/dsi/fastutil/objects/Object2IntMap;
FIELD d BLOCKS_TO_DEFAULT_IDS Lit/unimi/dsi/fastutil/objects/Object2IntMap;
METHOD a lookup (I)Ljava/lang/String;
ARG 0 stateId
METHOD a putStates (ILjava/lang/String;[Ljava/lang/String;)V
ARG 0 newId
ARG 1 newStateStr
ARG 2 oldStateStrings
METHOD a lookupState (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic;
ARG 0 oldState
METHOD a lookup (Ljava/lang/String;)Ljava/lang/String;
ARG 0 blockId
METHOD b lookupState (I)Lcom/mojang/datafixers/Dynamic;
ARG 0 stateId
METHOD b parseState (Ljava/lang/String;)Lcom/mojang/datafixers/Dynamic;
ARG 0 stateStr

View File

@ -1 +1,4 @@
CLASS aah net/minecraft/datafixers/fixes/EntityBlockStateFix
FIELD a BLOCK_NAME_TO_ID Ljava/util/Map;
METHOD a getNumericalBlockId (Ljava/lang/String;)I
ARG 0 blockId

View File

@ -1,2 +1,2 @@
CLASS aan net/minecraft/datafixers/fixes/EntityHealthFix
FIELD a entities Ljava/util/Set;
FIELD a ENTITIES Ljava/util/Set;

View File

@ -1 +1,2 @@
CLASS aaq net/minecraft/datafixers/fixes/EntityIdFix
FIELD a RENAMED_ENTITIES Ljava/util/Map;

View File

@ -1,2 +1,2 @@
CLASS aas net/minecraft/datafixers/fixes/EntityMinecartIdentifiersFix
FIELD a minecarts Ljava/util/List;
FIELD a MINECARTS Ljava/util/List;

View File

@ -1,2 +1,2 @@
CLASS aat net/minecraft/datafixers/fixes/EntityPaintingFix
FIELD a offsets [[I
FIELD a OFFSETS [[I

View File

@ -1,3 +1,3 @@
CLASS aau net/minecraft/datafixers/fixes/EntityPaintingMotiveFix
FIELD a paintings Ljava/util/Map;
FIELD a RENAMED_MOTIVES Ljava/util/Map;
METHOD a transform (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;

View File

@ -1,3 +1,3 @@
CLASS aav net/minecraft/datafixers/fixes/EntityPufferfishRenameFix
FIELD a convert Ljava/util/Map;
FIELD a RENAMED_FISHES Ljava/util/Map;
METHOD a rename (Ljava/lang/String;)Ljava/lang/String;

View File

@ -1,3 +1,3 @@
CLASS abl net/minecraft/datafixers/fixes/ItemIdFix
FIELD a items Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
FIELD a NUMERICAL_ID_TO_STRING_ID_MAP Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
METHOD a fromId (I)Ljava/lang/String;

View File

@ -1,2 +1,2 @@
CLASS abt net/minecraft/datafixers/fixes/ItemInstanceSpawnEggFix
FIELD a entityEggs Ljava/util/Map;
FIELD a ENTITY_SPAWN_EGGS Ljava/util/Map;

View File

@ -1,5 +1,7 @@
CLASS abu net/minecraft/datafixers/fixes/ItemInstanceTheFlatteningFix
FIELD a damageMap Ljava/util/Map;
FIELD b itemNames Ljava/util/Set;
FIELD c damagedItems Ljava/util/Set;
FIELD a FLATTENING_MAP Ljava/util/Map;
FIELD b ORIGINAL_ITEM_NAMES Ljava/util/Set;
FIELD c DAMAGABLE_ITEMS Ljava/util/Set;
METHOD a getItem (Ljava/lang/String;I)Ljava/lang/String;
ARG 0 originalName
ARG 1 damage

View File

@ -1,2 +1,2 @@
CLASS abn net/minecraft/datafixers/fixes/ItemPotionFix
FIELD a potions [Ljava/lang/String;
FIELD a ID_TO_POTIONS [Ljava/lang/String;

View File

@ -1,2 +1,2 @@
CLASS abp net/minecraft/datafixers/fixes/ItemShulkerBoxColorFix
FIELD a colorNames [Ljava/lang/String;
FIELD a COLORED_SHULKER_BOX_IDS [Ljava/lang/String;

View File

@ -1,2 +1,2 @@
CLASS abq net/minecraft/datafixers/fixes/ItemSpawnEggFix
FIELD a entities [Ljava/lang/String;
FIELD a DAMAGE_TO_ENTITY_IDS [Ljava/lang/String;

View File

@ -1,2 +1,2 @@
CLASS abr net/minecraft/datafixers/fixes/ItemStackEnchantmentFix
FIELD a enchants Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
FIELD a ID_TO_ENCHANTMENTS_MAP Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;

View File

@ -1,2 +1,2 @@
CLASS aby net/minecraft/datafixers/fixes/LevelDataGeneratorOptionsFix
FIELD a biomes Ljava/util/Map;
FIELD a NUMERICAL_IDS_TO_BIOME_IDS Ljava/util/Map;

View File

@ -1,3 +1,7 @@
CLASS abz net/minecraft/datafixers/fixes/LevelFlatGeneratorInfoFix
FIELD b commas Lcom/google/common/base/Splitter;
FIELD a SPLIT_ON_SEMICOLON Lcom/google/common/base/Splitter;
FIELD b SPLIT_ON_COMMA Lcom/google/common/base/Splitter;
FIELD c SPLIT_ON_LOWER_X Lcom/google/common/base/Splitter;
FIELD d SPLIT_ON_ASTERISK Lcom/google/common/base/Splitter;
FIELD e SPLIT_ON_COLON Lcom/google/common/base/Splitter;
METHOD a transform (Ljava/lang/String;)Ljava/lang/String;

View File

@ -1,2 +1,2 @@
CLASS acf net/minecraft/datafixers/fixes/OptionsKeyLwjgl3Fix
FIELD a keys Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
FIELD a NUMERICAL_KEY_IDS_TO_KEY_NAMES Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;

View File

@ -1,6 +1,8 @@
CLASS acq net/minecraft/datafixers/fixes/StatsCounterFix
FIELD a skip Ljava/util/Set;
FIELD b customMap Ljava/util/Map;
FIELD e entityMap Ljava/util/Map;
FIELD a SKIP Ljava/util/Set;
FIELD b RENAMED_GENERAL_STATS Ljava/util/Map;
FIELD c RENAMED_ITEM_STATS Ljava/util/Map;
FIELD d RENAMED_ENTITY_STATS Ljava/util/Map;
FIELD e RENAMED_ENTITIES Ljava/util/Map;
METHOD a getItem (Ljava/lang/String;)Ljava/lang/String;
METHOD b getBlock (Ljava/lang/String;)Ljava/lang/String;