mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Names for some fields and methods in net.minecraft.data.server (#1021) 

* Rename Gson fields in some classes to GSON

* Name some methods in RecipesProvider

Also a param fix in InventoryChangedCriterion's constructor.

* Rename field in LootTablesProvider

* Rename some methods in AbstractTagProvider

* Name some methods in AdventureTabAdvancementGenerator

* Rename some fields and methods for BlockLootTableGenerator

* Rename some fields and methods in EntityToolTableGenerator and EntityType

* Rename fields in FishingLootTableGenerator

These were loot condition constants checking for biomes.

* Rename fields and methods in HusbandryTabAdvancementGenerator

* method_10422 -> RecipesProvider.requireEnteringFluid

* Rename parameters to SnbtProvider.CompressedData

* Rename some fields and methods in NbtProvider

* method_10422 -> ItemListProvider#toJson

* NEED_ and REQUIRE_ -> NEEDS

* Remove 'loot table' and 'block' in BlockLootTableGenerator method names

Suggested by liach.

* Fix names in EntityLootTableGenerator to align with standards
This commit is contained in:
Tae Lim Kook 2020-01-03 15:52:07 -05:00 committed by modmuss50
parent ddb831ea5e
commit 80cf8e5ada
13 changed files with 128 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping
View File

@ -9,6 +9,9 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan
FIELD field_9631 empty Lnet/minecraft/class_2096$class_2100;
FIELD field_9632 items [Lnet/minecraft/class_2073;
METHOD <init> (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2073;)V
ARG 1 occupied
ARG 2 full
ARG 3 empty
ARG 4 items
METHOD method_8957 items ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068;
ARG 0 items

4
mappings/net/minecraft/data/SnbtProvider.mapping
View File

@ -18,3 +18,7 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider
FIELD field_20538 name Ljava/lang/String;
FIELD field_20539 bytes [B
FIELD field_20540 sha1 Ljava/lang/String;
METHOD <init> (Ljava/lang/String;[BLjava/lang/String;)V
ARG 1 name
ARG 2 bytes
ARG 3 sha1

7
mappings/net/minecraft/data/dev/NbtProvider.mapping
View File

@ -1,3 +1,10 @@
CLASS net/minecraft/class_2461 net/minecraft/data/dev/NbtProvider
FIELD field_11449 root Lnet/minecraft/class_2403;
FIELD field_11450 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD method_10493 convertNbtToSnbt (Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/file/Path;)Ljava/nio/file/Path;
ARG 0 inputPath
ARG 1 location
ARG 2 outputPath
METHOD method_10496 getLocation (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/String;
ARG 1 targetPath
ARG 2 rootPath

1
mappings/net/minecraft/data/report/ItemListProvider.mapping
View File

@ -1,3 +1,4 @@
CLASS net/minecraft/class_2427 net/minecraft/data/report/ItemListProvider
FIELD field_11323 root Lnet/minecraft/class_2403;
FIELD field_17170 GSON Lcom/google/gson/Gson;
METHOD method_17175 toJson (Lnet/minecraft/class_2385;)Lcom/google/gson/JsonElement;

3
mappings/net/minecraft/data/server/AbstractTagProvider.mapping
View File

@ -1,9 +1,12 @@
CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider
FIELD field_11479 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_11480 GSON Lcom/google/gson/Gson;
FIELD field_11481 tagBuilders Ljava/util/Map;
FIELD field_11482 registry Lnet/minecraft/class_2378;
FIELD field_11483 root Lnet/minecraft/class_2403;
METHOD <init> (Lnet/minecraft/class_2403;Lnet/minecraft/class_2378;)V
ARG 1 root
METHOD method_10510 getOutput (Lnet/minecraft/class_2960;)Ljava/nio/file/Path;
METHOD method_10511 setContainer (Lnet/minecraft/class_3503;)V
METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_3494;)Lnet/minecraft/class_3494$class_3495;
METHOD method_10514 configure ()V

2
mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping
View File

@ -1,3 +1,5 @@
CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancementGenerator
FIELD field_11293 BIOMES [Lnet/minecraft/class_1959;
FIELD field_11294 MONSTERS [Lnet/minecraft/class_1299;
METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;

66
mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping
View File

@ -1 +1,67 @@
CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator
FIELD field_11336 NEEDS_SILK_TOUCH Lnet/minecraft/class_4570$class_210;
FIELD field_11337 DOESNT_NEED_SILK_TOUCH Lnet/minecraft/class_4570$class_210;
FIELD field_11338 JUNGLE_SAPLING_DROP_CHANCES_FROM_LEAVES [F
FIELD field_11339 SAPLING_DROP_CHANCES_FROM_LEAVES [F
FIELD field_11340 ALWAYS_DROPPED_FROM_EXPLOSION Ljava/util/Set;
FIELD field_11341 DOESNT_NEED_SILK_TOUCH_SHEARS Lnet/minecraft/class_4570$class_210;
FIELD field_11342 NEEDS_SILK_TOUCH_SHEARS Lnet/minecraft/class_4570$class_210;
FIELD field_11343 NEEDS_SHEARS Lnet/minecraft/class_4570$class_210;
FIELD field_16493 lootTables Ljava/util/Map;
METHOD method_10371 createForTallGrass (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
METHOD method_10372 createForBlockNeedingShears (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
METHOD method_10373 createForNeedingSilkTouch (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
METHOD method_10375 createForMultiblock (Lnet/minecraft/class_2248;Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Lnet/minecraft/class_52$class_53;
METHOD method_10377 createForOreWithSingleItemDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53;
METHOD method_10378 createForOakLeaves (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;[F)Lnet/minecraft/class_52$class_53;
METHOD method_10380 createForNeedingShears (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53;
ARG 1 child
METHOD method_10381 create (Lnet/minecraft/class_2248;Lnet/minecraft/class_4570$class_210;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53;
ARG 1 conditionBuilder
ARG 2 child
METHOD method_10382 createForBlockWithItemDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
ARG 1 lootWithoutSilkTouch
METHOD method_10383 createForSlabs (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
METHOD method_10384 create (Lnet/minecraft/class_1935;Lnet/minecraft/class_59;)Lnet/minecraft/class_52$class_53;
ARG 1 count
METHOD method_10385 createForLargeMushroomBlock (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
ARG 1 loot
METHOD method_10386 createForBlockWithItemDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;Lnet/minecraft/class_59;)Lnet/minecraft/class_52$class_53;
ARG 1 lootWithoutSilkTouch
ARG 2 count
METHOD method_10387 createForCropStem (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53;
ARG 1 seeds
METHOD method_10388 createForNeedingSilkTouchShears (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53;
ARG 1 child
METHOD method_10389 createForPottedPlant (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
METHOD method_10390 createForLeaves (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;[F)Lnet/minecraft/class_52$class_53;
ARG 0 leafBlock
ARG 1 sapling
ARG 2 saplingDropChances
METHOD method_10391 createForCrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_4570$class_210;)Lnet/minecraft/class_52$class_53;
ARG 1 food
ARG 2 seeds
ARG 3 condition
METHOD method_10392 addSurvivesExplosionLootCondition (Lnet/minecraft/class_1935;Lnet/minecraft/class_192;)Ljava/lang/Object;
METHOD method_10393 addExplosionDecayLootFunction (Lnet/minecraft/class_1935;Lnet/minecraft/class_116;)Ljava/lang/Object;
METHOD method_10394 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
METHOD method_10395 createEmpty ()Lnet/minecraft/class_52$class_53;
METHOD method_10396 createForNameableContainer (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
METHOD method_10397 createForNeedingSilkTouch (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53;
ARG 1 child
METHOD method_16238 registerForNeedingSilkTouch (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V
ARG 1 block
ARG 2 droppedBlock
METHOD method_16256 register (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)V
ARG 2 loot
METHOD method_16258 register (Lnet/minecraft/class_2248;Lnet/minecraft/class_52$class_53;)V
METHOD method_16262 registerForNeedingSilkTouch (Lnet/minecraft/class_2248;)V
METHOD method_16285 registerForPottedPlant (Lnet/minecraft/class_2248;)V
METHOD method_16293 registerWithFunction (Lnet/minecraft/class_2248;Ljava/util/function/Function;)V
METHOD method_16329 registerForSelfDrop (Lnet/minecraft/class_2248;)V
METHOD method_16876 createForShulkerBox (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
METHOD method_16877 createForBanner (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
METHOD method_22142 createForBeeNest (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
METHOD method_22143 createForBeehive (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
METHOD method_23229 createForAttachedCropStem (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53;
ARG 1 seeds

6
mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping
View File

@ -1 +1,7 @@
CLASS net/minecraft/class_2434 net/minecraft/data/server/EntityLootTableGenerator
FIELD field_11344 NEEDS_ENTITY_ON_FIRE Lnet/minecraft/class_2048$class_2049;
FIELD field_16543 lootTables Ljava/util/Map;
FIELD field_19339 ENTITY_TYPES_IN_MISC_CATEGORY_TO_CHECK Ljava/util/Set;
METHOD method_10401 createForSheep (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
METHOD method_16368 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_52$class_53;)V
METHOD method_16369 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V

7
mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping
View File

@ -1 +1,8 @@
CLASS net/minecraft/class_2437 net/minecraft/data/server/FishingLootTableGenerator
FIELD field_11346 NEEDS_JUNGLE_BIOME Lnet/minecraft/class_4570$class_210;
FIELD field_11347 NEEDS_JUNGLE_HILLS_BIOME Lnet/minecraft/class_4570$class_210;
FIELD field_11348 NEEDS_MODIFIED_JUNGLE_BIOME Lnet/minecraft/class_4570$class_210;
FIELD field_11349 NEEDS_BAMBOO_JUNGLE_BIOME Lnet/minecraft/class_4570$class_210;
FIELD field_11350 NEEDS_JUNGLE_EDGE_BIOME Lnet/minecraft/class_4570$class_210;
FIELD field_11351 NEEDS_MODIFIED_JUNGLE_EDGE_BIOME Lnet/minecraft/class_4570$class_210;
FIELD field_11352 NEEDS_BAMBOO_JUNGLE_HILLS_BIOME Lnet/minecraft/class_4570$class_210;

9
mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping
View File

@ -1 +1,10 @@
CLASS net/minecraft/class_2414 net/minecraft/data/server/HusbandryTabAdvancementGenerator
FIELD field_11295 FISH_ITEMS [Lnet/minecraft/class_1792;
FIELD field_11296 BREEDABLE_ANIMALS [Lnet/minecraft/class_1299;
FIELD field_11297 FISH_BUCKET_ITEMS [Lnet/minecraft/class_1792;
FIELD field_11298 FOOD_ITEMS [Lnet/minecraft/class_1792;
METHOD method_10339 requireListedFishCaught (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
METHOD method_10340 requireListedFishBucketsFilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
METHOD method_10341 requireFoodItemsEaten (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
METHOD method_10342 requireListedAnimalsBred (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;

1
mappings/net/minecraft/data/server/LootTablesProvider.mapping
View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_2438 net/minecraft/data/server/LootTablesProvider
FIELD field_11353 root Lnet/minecraft/class_2403;
FIELD field_11354 lootTypeGenerators Ljava/util/List;
FIELD field_11355 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_11356 GSON Lcom/google/gson/Gson;
METHOD method_10409 getOutput (Ljava/nio/file/Path;Lnet/minecraft/class_2960;)Ljava/nio/file/Path;

10
mappings/net/minecraft/data/server/RecipesProvider.mapping
View File

@ -3,3 +3,13 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider
FIELD field_11374 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_11375 GSON Lcom/google/gson/Gson;
METHOD method_10419 generate (Ljava/util/function/Consumer;)V
METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2066$class_2068;
METHOD method_10422 requireEnteringFluid (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039;
METHOD method_10423 conditionsFromItemPredicates ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068;
ARG 1 items
METHOD method_10425 saveRecipe (Lnet/minecraft/class_2408;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V
METHOD method_10426 conditionsFromItem (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068;
METHOD method_10427 saveRecipeAdvancement (Lnet/minecraft/class_2408;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V
METHOD method_17585 generateCookingRecipes (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_3957;I)V
ARG 2 recipeType
ARG 4 cookTime

9
mappings/net/minecraft/entity/EntityType.mapping
View File

@ -2,6 +2,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
FIELD field_16526 lootTableId Lnet/minecraft/class_2960;
FIELD field_18070 dimensions Lnet/minecraft/class_4048;
FIELD field_18981 fireImmune Z
FIELD field_19423 spawnableFarFromPlayer Z
FIELD field_6056 saveable Z
FIELD field_6072 summonable Z
FIELD field_6088 LOGGER Lorg/apache/logging/log4j/Logger;
@ -15,6 +16,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
ARG 3 saveable
ARG 4 summonable
ARG 5 fireImmune
ARG 6 spawnableFarFromPlayer
ARG 7 dimensions
METHOD method_16351 getLootTableId ()Lnet/minecraft/class_2960;
METHOD method_17683 createSimpleBoundingBox (DDD)Lnet/minecraft/class_238;
@ -49,6 +51,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
ARG 1 world
METHOD method_5884 getOriginY (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;ZLnet/minecraft/class_238;)D
ARG 1 pos
ARG 2 invertY
ARG 3 boundingBox
METHOD method_5886 newInstance (Lnet/minecraft/class_1937;Lnet/minecraft/class_1299;)Lnet/minecraft/class_1297;
ARG 0 world
@ -61,6 +64,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
ARG 5 pos
ARG 6 spawnType
ARG 7 alignPosition
ARG 8 invertY
METHOD method_5889 createInstanceFromId (ILnet/minecraft/class_1937;)Lnet/minecraft/class_1297;
ARG 0 type
ARG 1 world
@ -77,6 +81,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
ARG 3 player
ARG 4 pos
ARG 5 spawnType
ARG 6 alignPosition
ARG 7 invertY
METHOD method_5895 register (Ljava/lang/String;Lnet/minecraft/class_1299$class_1300;)Lnet/minecraft/class_1299;
ARG 0 id
ARG 1 type
@ -91,9 +97,12 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
ARG 4 player
ARG 5 pos
ARG 6 spawnType
ARG 7 alignPosition
ARG 8 invertY
CLASS class_1300 Builder
FIELD field_18071 size Lnet/minecraft/class_4048;
FIELD field_18982 fireImmune Z
FIELD field_19424 spawnableFarFromPlayer Z
FIELD field_6148 factory Lnet/minecraft/class_1299$class_4049;
FIELD field_6149 category Lnet/minecraft/class_1311;
FIELD field_6150 summonable Z