Skip to content

Commit

Permalink
Some datafixer methods and fields (FabricMC#2536)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
YanisBft and github-actions[bot] authored Jul 1, 2021
1 parent 7a6582f commit f3a7d26
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 2 deletions.
32 changes: 32 additions & 0 deletions mappings/net/minecraft/datafixer/fix/BlockStateFlattening.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,35 @@ CLASS net/minecraft/class_3580 net/minecraft/datafixer/fix/BlockStateFlattening
METHOD method_15600 lookupBlock (Ljava/lang/String;)Ljava/lang/String;
ARG 0 oldBlockName
METHOD method_22426 fillEmptyStates ()V
METHOD method_31448 putStatesFromBlocks0To15 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 0 and 15 before 1.13.
METHOD method_31449 putStatesFromBlocks16To31 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 16 and 31 before 1.13.
METHOD method_31450 putStatesFromBlocks32To47 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 32 and 47 before 1.13.
METHOD method_31451 putStatesFromBlocks48To63 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 48 and 63 before 1.13.
METHOD method_31452 putStatesFromBlocks64To79 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 64 and 79 before 1.13.
METHOD method_31453 putStatesFromBlocks80To95 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 80 and 95 before 1.13.
METHOD method_31454 putStatesFromBlocks96To111 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 96 and 111 before 1.13.
METHOD method_31455 putStatesFromBlocks112To127 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 112 and 127 before 1.13.
METHOD method_31456 putStatesFromBlocks128To143 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 128 and 143 before 1.13.
METHOD method_31457 putStatesFromBlocks144To159 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 144 and 159 before 1.13.
METHOD method_31458 putStatesFromBlocks160To175 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 160 and 175 before 1.13.
METHOD method_31459 putStatesFromBlocks176To191 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 176 and 191 before 1.13.
METHOD method_31460 putStatesFromBlocks192To207 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 192 and 207 before 1.13.
METHOD method_31461 putStatesFromBlocks208To223 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 208 and 223 before 1.13.
METHOD method_31462 putStatesFromBlocks224To239 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 224 and 239 before 1.13.
METHOD method_31463 putStatesFromBlocks240To255 ()V
COMMENT Adds states to flatten from the blocks which had numeric IDs between 240 and 255 before 1.13.
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
CLASS net/minecraft/class_5299 net/minecraft/datafixer/fix/StructureSeparationDataFix
FIELD field_24647 STRUCTURE_SPACING Lcom/google/common/collect/ImmutableMap;
FIELD field_29915 VILLAGE_STRUCTURE_ID Ljava/lang/String;
FIELD field_29916 DESERT_PYRAMID_STRUCTURE_ID Ljava/lang/String;
FIELD field_29917 IGLOO_STRUCTURE_ID Ljava/lang/String;
FIELD field_29918 JUNGLE_PYRAMID_STRUCTURE_ID Ljava/lang/String;
FIELD field_29919 SWAMP_HUT_STRUCTURE_ID Ljava/lang/String;
FIELD field_29920 PILLAGER_OUTPOST_STRUCTURE_ID Ljava/lang/String;
FIELD field_29921 END_CITY_STRUCTURE_ID Ljava/lang/String;
FIELD field_29922 MANSION_STRUCTURE_ID Ljava/lang/String;
FIELD field_29923 MONUMENT_STRUCTURE_ID Ljava/lang/String;
METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
ARG 1 outputSchema
CLASS class_5300 Information
FIELD field_24648 CODEC Lcom/mojang/serialization/Codec;
FIELD field_24649 spacing I
Expand Down
3 changes: 2 additions & 1 deletion mappings/net/minecraft/datafixer/schema/Schema100.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ CLASS net/minecraft/class_1222 net/minecraft/datafixer/schema/Schema100
METHOD <init> (ILcom/mojang/datafixers/schemas/Schema;)V
ARG 1 versionKey
ARG 2 parent
METHOD method_5195 targetEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
METHOD method_5195 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
METHOD method_5196 targetItems (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate;
METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V
ARG 2 entityTypes
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/schema/Schema1800.mapping
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
CLASS net/minecraft/class_1245 net/minecraft/datafixer/schema/Schema1800
METHOD method_5285 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
3 changes: 3 additions & 0 deletions mappings/net/minecraft/datafixer/schema/Schema1928.mapping
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
CLASS net/minecraft/class_3984 net/minecraft/datafixer/schema/Schema1928
METHOD method_17997 targetItems (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate;
METHOD method_17998 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/schema/Schema501.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ CLASS net/minecraft/class_1247 net/minecraft/datafixer/schema/Schema501
METHOD <init> (ILcom/mojang/datafixers/schemas/Schema;)V
ARG 1 versionKey
ARG 2 parent
METHOD method_5290 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/schema/Schema700.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ CLASS net/minecraft/class_1246 net/minecraft/datafixer/schema/Schema700
METHOD <init> (ILcom/mojang/datafixers/schemas/Schema;)V
ARG 1 versionKey
ARG 2 parent
METHOD method_5288 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/schema/Schema701.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ CLASS net/minecraft/class_1249 net/minecraft/datafixer/schema/Schema701
METHOD <init> (ILcom/mojang/datafixers/schemas/Schema;)V
ARG 1 versionKey
ARG 2 parent
METHOD method_5294 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/schema/Schema702.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ CLASS net/minecraft/class_1248 net/minecraft/datafixer/schema/Schema702
METHOD <init> (ILcom/mojang/datafixers/schemas/Schema;)V
ARG 1 versionKey
ARG 2 parent
METHOD method_5292 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/schema/Schema704.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ CLASS net/minecraft/class_1250 net/minecraft/datafixer/schema/Schema704
METHOD <init> (ILcom/mojang/datafixers/schemas/Schema;)V
ARG 1 versionKey
ARG 2 parent
METHOD method_5296 targetItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 blockEntityId
METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V
ARG 2 entityTypes
ARG 3 blockEntityTypes
4 changes: 4 additions & 0 deletions mappings/net/minecraft/datafixer/schema/Schema705.mapping
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
CLASS net/minecraft/class_1253 net/minecraft/datafixer/schema/Schema705
METHOD method_5311 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
METHOD method_5330 targetInTile (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V
ARG 2 entityTypes
ARG 3 blockEntityTypes
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/schema/Schema808.mapping
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
CLASS net/minecraft/class_1252 net/minecraft/datafixer/schema/Schema808
METHOD method_5309 targetItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 blockEntityId
8 changes: 8 additions & 0 deletions mappings/net/minecraft/datafixer/schema/Schema99.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ CLASS net/minecraft/class_1254 net/minecraft/datafixer/schema/Schema99
METHOD <init> (ILcom/mojang/datafixers/schemas/Schema;)V
ARG 1 versionKey
ARG 2 parent
METHOD method_5339 targetEquipment (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
METHOD method_5346 targetItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
METHOD method_5353 targetEquipment (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate;
METHOD method_5368 targetInTile (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
METHOD method_5377 targetDisplayTile (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
ARG 2 entityId
METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V
ARG 2 entityTypes
ARG 3 blockEntityTypes
2 changes: 1 addition & 1 deletion mappings/net/minecraft/util/JsonHelper.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
ARG 1 name
METHOD method_15294 hasElement (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
ARG 0 object
ARG 1 lement
ARG 1 element
METHOD method_15295 asObject (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lcom/google/gson/JsonObject;
ARG 0 element
ARG 1 name
Expand Down

0 comments on commit f3a7d26

Please sign in to comment.