From 9497721136cf71e35a1cf7fc1a68b0cd95945307 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 11 Mar 2020 17:25:56 +0000 Subject: [PATCH] 20w11a --- build.gradle | 2 +- .../dto/RealmsWorldOptions.mapping | 1 - .../block/AbstractPlantPartBlock.mapping | 3 +-- .../block/AbstractPlantStemBlock.mapping | 4 +-- .../net/minecraft/block/BlockState.mapping | 3 +-- .../screen/CustomizeBuffetLevelScreen.mapping | 3 +-- .../screen/CustomizeFlatLevelScreen.mapping | 6 +---- .../screen/world/CreateWorldScreen.mapping | 2 +- .../data/client/model/PropertiesEntry.mapping | 2 +- .../data/client/model/PropertiesMap.mapping | 2 +- .../datafixer/fix/BiomeRenameFix.mapping | 3 +-- mappings/net/minecraft/entity/Entity.mapping | 3 --- .../minecraft/entity/ai/BlockSenses.mapping | 6 ----- .../ai/brain/task/CrossbowAttackTask.mapping | 1 - .../ai/brain/task/LookTargetUtil.mapping | 3 --- .../ai/brain/task/MeleeAttackTask.mapping | 4 --- .../ai/brain/task/RangedApproachTask.mapping | 6 ----- .../minecraft/entity/mob/MobEntity.mapping | 1 - .../minecraft/entity/mob/PiglinEntity.mapping | 1 - .../projectile/ProjectileEntity.mapping | 1 - .../minecraft/server/MinecraftServer.mapping | 4 +-- .../util/CuboidBlockIterator.mapping | 1 - .../net/minecraft/util/math/BlockPos.mapping | 26 ------------------- .../minecraft/util/registry/Registry.mapping | 2 -- .../util/registry/SimpleRegistry.mapping | 1 + .../biome/source/BiomeSourceType.mapping | 8 +++--- .../minecraft/world/chunk/WorldChunk.mapping | 4 +-- .../gen/chunk/CavesChunkGenerator.mapping | 3 +-- .../gen/chunk/ChunkGeneratorFactory.mapping | 3 +-- .../world/level/LevelGeneratorType.mapping | 12 --------- .../minecraft/world/level/LevelInfo.mapping | 10 ++----- .../world/level/LevelProperties.mapping | 6 +---- 32 files changed, 23 insertions(+), 114 deletions(-) delete mode 100644 mappings/net/minecraft/entity/ai/BlockSenses.mapping diff --git a/build.gradle b/build.gradle index fb3f111b32..8268dceb1f 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "20w10a" +def minecraft_version = "20w11a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping b/mappings/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping index 61b8c3e62b..be14874ab5 100644 --- a/mappings/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping +++ b/mappings/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping @@ -25,7 +25,6 @@ CLASS net/minecraft/class_4883 com/mojang/realmsclient/dto/RealmsWorldOptions ARG 8 gameMode ARG 9 forceGameMode ARG 10 slotName - METHOD clone clone ()Ljava/lang/Object; METHOD method_25076 getDefaults ()Lnet/minecraft/class_4883; METHOD method_25077 getSlotName (I)Ljava/lang/String; ARG 1 i diff --git a/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping b/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping index a71e0406ae..cdd46f06e3 100644 --- a/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping +++ b/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_4863 net/minecraft/block/AbstractPlantPartBlock FIELD field_22507 growthDirection Lnet/minecraft/class_2350; FIELD field_22508 tickWater Z - METHOD (Lnet/minecraft/class_2248$class_2251;Lnet/minecraft/class_2350;Z)V + METHOD (Lnet/minecraft/class_2248$class_2251;Lnet/minecraft/class_2350;Lnet/minecraft/class_265;Z)V ARG 1 settings ARG 2 growthDirection - ARG 3 tickWater METHOD method_24945 getStem ()Lnet/minecraft/class_4865; METHOD method_24946 getPlant ()Lnet/minecraft/class_2248; METHOD method_24947 canAttachTo (Lnet/minecraft/class_2248;)Z diff --git a/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping b/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping index 4efc8761d1..05a5821811 100644 --- a/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping +++ b/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/class_4865 net/minecraft/block/AbstractPlantStemBlock FIELD field_22509 AGE Lnet/minecraft/class_2758; FIELD field_22510 growthChance D - METHOD (Lnet/minecraft/class_2248$class_2251;Lnet/minecraft/class_2350;ZD)V + METHOD (Lnet/minecraft/class_2248$class_2251;Lnet/minecraft/class_2350;Lnet/minecraft/class_265;ZD)V ARG 1 settings ARG 2 growthDirection - ARG 3 tickWater - ARG 4 growthChance METHOD method_24948 getRandomGrowthState (Lnet/minecraft/class_1936;)Lnet/minecraft/class_2680; ARG 1 world METHOD method_24949 chooseStemState (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 8a0fe404f6..3bd688b272 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -204,12 +204,11 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState METHOD method_24220 hasInWallOverlay (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos - METHOD method_24432 hasSolidSurface (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;Lnet/minecraft/class_2350;)Z + METHOD method_24432 isSideOpaque (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;Lnet/minecraft/class_2350;)Z ARG 1 world ARG 2 pos ARG 3 entity ARG 4 side - METHOD method_24432 isSideOpaque (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;Lnet/minecraft/class_2350;)Z CLASS class_3752 ShapeCache FIELD field_16555 lightSubtracted I FIELD field_16556 translucent Z diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping index cad0d7e7bf..ea3382777e 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping @@ -5,9 +5,8 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLev FIELD field_2438 confirmButton Lnet/minecraft/class_4185; FIELD field_2439 biomeListLength I FIELD field_2441 biomeSelectionList Lnet/minecraft/class_415$class_4190; - METHOD (Lnet/minecraft/class_525;Lnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_525;Lnet/minecraft/class_4952;)V ARG 1 parent - ARG 2 generatorOptionsTag METHOD method_2151 refreshConfirmButton ()V METHOD method_2153 getGeneratorTag ()Lnet/minecraft/class_2487; METHOD method_2161 initListSelectLogic ()V diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping index 735ee7f8a3..6b80749801 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping @@ -5,15 +5,11 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevel FIELD field_2422 parent Lnet/minecraft/class_525; FIELD field_2424 layers Lnet/minecraft/class_413$class_4192; FIELD field_2425 heightText Ljava/lang/String; - METHOD (Lnet/minecraft/class_525;Lnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_525;Lnet/minecraft/class_4952;)V ARG 1 parent - ARG 2 generatorOptions METHOD method_2138 getConfigString ()Ljava/lang/String; METHOD method_2139 setConfigString (Ljava/lang/String;)V ARG 1 config - METHOD method_2140 getConfigTag ()Lnet/minecraft/class_2487; - METHOD method_2144 setConfigTag (Lnet/minecraft/class_2487;)V - ARG 1 config CLASS class_4192 SuperflatLayersListWidget CLASS class_4193 SuperflatLayerItem METHOD method_19373 (II)V diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index d3be6c3ac3..3b57d6d817 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldScreen - FIELD field_18979 generatorOptionsTag Lnet/minecraft/class_2487; + FIELD field_18979 generatorOptionsTag Lnet/minecraft/class_4952; FIELD field_3178 hardcore Z FIELD field_3179 tweakedCheats Z FIELD field_3180 structures Z diff --git a/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping b/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping index 87717b4fab..a6c4070dee 100644 --- a/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping +++ b/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4933 net/minecraft/data/client/model/PropertiesEntry COMMENT Represents a property to value pair in block state definition. - COMMENT + COMMENT COMMENT

This object is immutable. FIELD field_22879 property Lnet/minecraft/class_2769; FIELD field_22880 value Ljava/lang/Comparable; diff --git a/mappings/net/minecraft/data/client/model/PropertiesMap.mapping b/mappings/net/minecraft/data/client/model/PropertiesMap.mapping index 5de87ee964..df30a36c67 100644 --- a/mappings/net/minecraft/data/client/model/PropertiesMap.mapping +++ b/mappings/net/minecraft/data/client/model/PropertiesMap.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4934 net/minecraft/data/client/model/PropertiesMap COMMENT Represents a set of property to value pairs, used as conditions for model COMMENT application. - COMMENT + COMMENT COMMENT

This object is immutable. FIELD field_22881 EMPTY Lnet/minecraft/class_4934; FIELD field_22882 COMPARATOR Ljava/util/Comparator; diff --git a/mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping index 6c3ebad045..6bc0b3f01a 100644 --- a/mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_4753 net/minecraft/datafixer/fix/BiomeRenameFix FIELD field_21959 renames Ljava/util/Map; - METHOD (Lcom/mojang/datafixers/schemas/Schema;ZLjava/util/Map;)V + METHOD (Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;Ljava/util/Map;)V ARG 1 outputSchema ARG 2 changesType - ARG 3 renames diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index b9b3bb4d05..54ff29af14 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -37,7 +37,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_5983 teleporting Z FIELD field_5985 ignoreCameraFrustum Z FIELD field_5986 entityId I - FIELD field_5987 x D FIELD field_5988 removed Z FIELD field_5989 lastRenderZ D FIELD field_5990 FLAGS Lnet/minecraft/class_2940; @@ -57,7 +56,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6007 velocityDirty Z FIELD field_6008 timeUntilRegen I FIELD field_6009 invulnerable Z - FIELD field_6010 y D FIELD field_6011 dataTracker Lnet/minecraft/class_2945; FIELD field_6012 age I FIELD field_6013 stepHeight F @@ -81,7 +79,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6032 AIR Lnet/minecraft/class_2940; FIELD field_6033 inanimate Z FIELD field_6034 vehicle Lnet/minecraft/class_1297; - FIELD field_6035 z D FIELD field_6036 prevY D FIELD field_6037 velocityModified Z FIELD field_6038 lastRenderX D diff --git a/mappings/net/minecraft/entity/ai/BlockSenses.mapping b/mappings/net/minecraft/entity/ai/BlockSenses.mapping deleted file mode 100644 index 4f6c014f83..0000000000 --- a/mappings/net/minecraft/entity/ai/BlockSenses.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_4800 net/minecraft/entity/ai/BlockSenses - METHOD method_24501 findBlock (Lnet/minecraft/class_2338;IILjava/util/function/Predicate;)Ljava/util/Optional; - ARG 0 center - ARG 1 horizontalRadius - ARG 2 verticalRadius - ARG 3 predicate diff --git a/mappings/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.mapping index bad4f76a68..b91e57c7e8 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_4810 net/minecraft/entity/ai/brain/task/CrossbowAttackTask - FIELD field_22292 range I FIELD field_22293 chargingCooldown I FIELD field_22294 state Lnet/minecraft/class_4810$class_4811; METHOD method_24568 getAttackTarget (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping index 4dff8c7d36..055689cdca 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping @@ -29,9 +29,6 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil ARG 0 world ARG 1 center ARG 2 radius - METHOD method_24556 isAttackTargetClose (Lnet/minecraft/class_1309;D)Z - ARG 0 entity - ARG 1 radius METHOD method_24557 walkTowards (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;I)V ARG 0 entity ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping index e2a32c55d8..8f0fb70972 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_4816 net/minecraft/entity/ai/brain/task/MeleeAttackTask - FIELD field_22307 range D FIELD field_22308 interval I - METHOD (DI)V - ARG 1 range - ARG 3 interval diff --git a/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping index 64597a8d79..d78a37f16e 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping @@ -7,9 +7,3 @@ CLASS net/minecraft/class_4822 net/minecraft/entity/ai/brain/task/RangedApproach METHOD method_24605 rememberWalkTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V ARG 1 entity ARG 2 target - METHOD method_24606 getRange (Lnet/minecraft/class_1799;)D - ARG 1 weapon - METHOD method_24607 getAttackTarget (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; - ARG 0 entity - METHOD method_24608 getWeaponRange (Lnet/minecraft/class_1309;)D - ARG 1 entity diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index da01c6ddb9..fa325007aa 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -54,7 +54,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_24523 tryEquip (Lnet/minecraft/class_1799;)Z ARG 1 equipment METHOD method_24834 equipLootStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V - ARG 1 slot ARG 2 stack METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F METHOD method_5930 setForwardSpeed (F)V diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index e86b3d2a27..3eb60d32d4 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -10,7 +10,6 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity FIELD field_22382 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_22419 IMMUNE_TO_ZOMBIFICATION Lnet/minecraft/class_2940; METHOD method_24694 zombify (Lnet/minecraft/class_3218;)V - ARG 1 world METHOD method_24695 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index eaf72734f8..26c95daef3 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/ProjectileEntity FIELD field_7577 flyingTick I FIELD field_7578 life I FIELD field_7579 piercingKilledEntities Ljava/util/List; - FIELD field_7580 OPTIONAL_UUID Lnet/minecraft/class_2940; FIELD field_7584 sound Lnet/minecraft/class_3414; FIELD field_7586 inBlockState Lnet/minecraft/class_2680; FIELD field_7588 inGround Z diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index bcd9f9fc2e..ce298b982e 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -133,12 +133,10 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 whitelistEnabled METHOD method_3732 shouldBroadcastRconToOps ()Z METHOD method_3734 getCommandManager ()Lnet/minecraft/class_2170; - METHOD method_3735 loadWorld (Ljava/lang/String;Ljava/lang/String;JLnet/minecraft/class_1942;Lcom/google/gson/JsonElement;)V + METHOD method_3735 loadWorld (Ljava/lang/String;Ljava/lang/String;JLnet/minecraft/class_4952;)V ARG 1 name ARG 2 serverName ARG 3 seed - ARG 5 generatorType - ARG 6 generatorSettings METHOD method_3736 shouldSpawnNpcs ()Z METHOD method_3738 getWorlds ()Ljava/lang/Iterable; METHOD method_3739 getCommandSource ()Lnet/minecraft/class_2168; diff --git a/mappings/net/minecraft/util/CuboidBlockIterator.mapping b/mappings/net/minecraft/util/CuboidBlockIterator.mapping index 5b2e4e9e83..fc32db7b9d 100644 --- a/mappings/net/minecraft/util/CuboidBlockIterator.mapping +++ b/mappings/net/minecraft/util/CuboidBlockIterator.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_3980 net/minecraft/util/CuboidBlockIterator FIELD field_18233 x I FIELD field_18234 y I FIELD field_18235 z I - FIELD field_18236 complete Z METHOD (IIIIII)V ARG 1 startX ARG 2 startY diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index e33c0aa4c3..73be756fe6 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -69,12 +69,6 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos METHOD method_10093 offset (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338; ARG 1 direction METHOD method_10094 iterate (IIIIII)Ljava/lang/Iterable; - ARG 0 minX - ARG 1 minY - ARG 2 minZ - ARG 3 maxX - ARG 4 maxY - ARG 5 maxZ METHOD method_10095 north ()Lnet/minecraft/class_2338; METHOD method_10096 add (JIII)J ARG 0 value @@ -85,12 +79,6 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos ARG 0 pos1 ARG 1 pos2 METHOD method_17962 stream (IIIIII)Ljava/util/stream/Stream; - ARG 0 minX - ARG 1 minY - ARG 2 minZ - ARG 3 maxX - ARG 4 maxY - ARG 5 maxZ METHOD method_19438 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2338; ARG 0 dynamic METHOD method_20437 stream (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; @@ -99,20 +87,6 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos METHOD method_23627 stream (Lnet/minecraft/class_3341;)Ljava/util/stream/Stream; ARG 0 box METHOD method_25503 mutableCopy ()Lnet/minecraft/class_2338$class_2339; - CLASS 1 - FIELD field_17676 connector Lnet/minecraft/class_3980; - FIELD field_18231 position Lnet/minecraft/class_2338$class_2339; - METHOD tryAdvance (Ljava/util/function/Consumer;)Z - ARG 1 consumer - CLASS 2 - FIELD field_10990 maxZ I - FIELD field_10991 maxY I - FIELD field_10992 maxX I - FIELD field_10993 minZ I - FIELD field_10994 minY I - FIELD field_10995 minX I - FIELD field_17596 iterator Lnet/minecraft/class_3980; - FIELD field_18232 pos Lnet/minecraft/class_2338$class_2339; CLASS class_2339 Mutable METHOD method_10098 setOffset (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338$class_2339; ARG 1 direction diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 4db06c95c7..178f63c968 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -29,8 +29,6 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 2 id ARG 3 entry METHOD method_10235 getIds ()Ljava/util/Set; - METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object; - ARG 1 random METHOD method_10247 create (Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; ARG 0 id METHOD method_10249 getRawId (Ljava/lang/Object;)I diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping index 113b20d56b..ba6213fc45 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry FIELD field_11109 nextId I FIELD field_11110 indexedEntries Lnet/minecraft/class_3513; FIELD field_11111 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping b/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping index 549754f5f8..2bd760fe84 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping @@ -1,15 +1,15 @@ CLASS net/minecraft/class_1969 net/minecraft/world/biome/source/BiomeSourceType FIELD field_9398 CHECKERBOARD Lnet/minecraft/class_1969; FIELD field_9399 THE_END Lnet/minecraft/class_1969; - FIELD field_9400 config Ljava/util/function/Function; + FIELD field_9400 config Ljava/util/function/LongFunction; FIELD field_9401 FIXED Lnet/minecraft/class_1969; FIELD field_9402 VANILLA_LAYERED Lnet/minecraft/class_1969; FIELD field_9403 biomeSource Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;Ljava/util/function/Function;)V + METHOD (Ljava/util/function/Function;Ljava/util/function/LongFunction;)V ARG 1 biomeSource METHOD method_8772 applyConfig (Lnet/minecraft/class_1970;)Lnet/minecraft/class_1966; ARG 1 config - METHOD method_8773 register (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_1969; + METHOD method_8773 register (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/LongFunction;)Lnet/minecraft/class_1969; ARG 0 id ARG 1 biomeSource - METHOD method_8774 getConfig (Lnet/minecraft/class_31;)Lnet/minecraft/class_1970; + METHOD method_8774 getConfig (J)Lnet/minecraft/class_1970; diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index adcd26406b..59b1ba13d6 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -23,13 +23,13 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk FIELD field_12857 fluidTickScheduler Lnet/minecraft/class_1951; FIELD field_12858 world Lnet/minecraft/class_1937; FIELD field_20655 biomeArray Lnet/minecraft/class_4548; - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2839;)V - ARG 1 world METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;Lnet/minecraft/class_4548;Lnet/minecraft/class_2843;Lnet/minecraft/class_1951;Lnet/minecraft/class_1951;J[Lnet/minecraft/class_2826;Ljava/util/function/Consumer;)V ARG 5 blockTickScheduler ARG 6 fluidTickScheduler ARG 7 inhabitedTime ARG 10 loadToWorldConsumer + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2839;)V + ARG 1 world METHOD method_12023 getLightingProvider ()Lnet/minecraft/class_3568; METHOD method_12200 getWorld ()Lnet/minecraft/class_1937; METHOD method_12201 getBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2818$class_2819;)Lnet/minecraft/class_2586; diff --git a/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping index 3b2d5e8279..5ff708906f 100644 --- a/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_2908 net/minecraft/world/gen/chunk/CavesChunkGenerator FIELD field_16569 noiseFalloff [D - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1966;Lnet/minecraft/class_2900;)V - ARG 1 world + METHOD (Lnet/minecraft/class_1936;Lnet/minecraft/class_1966;Lnet/minecraft/class_2900;)V ARG 2 biomeSource ARG 3 config METHOD method_16403 buildNoiseFalloff ()[D diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorFactory.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorFactory.mapping index 92d564399e..626be532a3 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorFactory.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorFactory.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2801 net/minecraft/world/gen/chunk/ChunkGeneratorFactory - METHOD create (Lnet/minecraft/class_1937;Lnet/minecraft/class_1966;Lnet/minecraft/class_2888;)Lnet/minecraft/class_2794; - ARG 1 world + METHOD create (Lnet/minecraft/class_1936;Lnet/minecraft/class_1966;Lnet/minecraft/class_2888;)Lnet/minecraft/class_2794; ARG 2 biomeSource ARG 3 config diff --git a/mappings/net/minecraft/world/level/LevelGeneratorType.mapping b/mappings/net/minecraft/world/level/LevelGeneratorType.mapping index a76f257cf2..66f91e8e06 100644 --- a/mappings/net/minecraft/world/level/LevelGeneratorType.mapping +++ b/mappings/net/minecraft/world/level/LevelGeneratorType.mapping @@ -16,18 +16,6 @@ CLASS net/minecraft/class_1942 net/minecraft/world/level/LevelGeneratorType FIELD field_9279 TYPES [Lnet/minecraft/class_1942; FIELD field_9280 version I FIELD field_9281 id I - METHOD (ILjava/lang/String;)V - ARG 1 id - ARG 2 name - METHOD (ILjava/lang/String;I)V - ARG 1 id - ARG 2 name - ARG 3 version - METHOD (ILjava/lang/String;Ljava/lang/String;I)V - ARG 1 id - ARG 2 name - ARG 3 storedName - ARG 4 version METHOD method_8629 setHasInfo ()Lnet/minecraft/class_1942; METHOD method_8630 getInfoTranslationKey ()Ljava/lang/String; METHOD method_8631 setCustomizable (Z)Lnet/minecraft/class_1942; diff --git a/mappings/net/minecraft/world/level/LevelInfo.mapping b/mappings/net/minecraft/world/level/LevelInfo.mapping index b3bced1cb0..bb7f5d6b94 100644 --- a/mappings/net/minecraft/world/level/LevelInfo.mapping +++ b/mappings/net/minecraft/world/level/LevelInfo.mapping @@ -2,25 +2,19 @@ CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo FIELD field_9257 gameMode Lnet/minecraft/class_1934; FIELD field_9258 bonusChest Z FIELD field_9259 commands Z - FIELD field_9260 generatorType Lnet/minecraft/class_1942; FIELD field_9261 hardcore Z FIELD field_9262 structures Z FIELD field_9263 seed J - FIELD field_9264 generatorOptions Lcom/google/gson/JsonElement; - METHOD (JLnet/minecraft/class_1934;ZZLnet/minecraft/class_1942;)V + METHOD (JLnet/minecraft/class_1934;ZZLnet/minecraft/class_4952;)V ARG 1 seed ARG 4 structures ARG 5 hardcore - ARG 6 generatorType METHOD method_8573 allowCommands ()Z METHOD method_8574 getGameMode ()Lnet/minecraft/class_1934; METHOD method_8575 setBonusChest ()Lnet/minecraft/class_1940; - METHOD method_8576 getGeneratorType ()Lnet/minecraft/class_1942; + METHOD method_8576 getGeneratorType ()Lnet/minecraft/class_4952; METHOD method_8577 getSeed ()J METHOD method_8578 enableCommands ()Lnet/minecraft/class_1940; - METHOD method_8579 setGeneratorOptions (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_1940; - ARG 1 generatorOptions METHOD method_8581 hasBonusChest ()Z METHOD method_8582 isHardcore ()Z METHOD method_8583 hasStructures ()Z - METHOD method_8584 getGeneratorOptions ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index b8c3047a96..f8a535fa92 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -11,10 +11,8 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_160 borderSizeLerpTarget D FIELD field_161 borderWarningTime I FIELD field_162 versionName Ljava/lang/String; - FIELD field_163 generatorType Lnet/minecraft/class_1942; FIELD field_164 borderCenterX D FIELD field_165 lastPlayed J - FIELD field_166 generatorOptions Lnet/minecraft/class_2487; FIELD field_167 spawnY I FIELD field_168 thundering Z FIELD field_169 levelName Ljava/lang/String; @@ -92,14 +90,13 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties METHOD method_167 setClearWeatherTime (I)V ARG 1 clearWeatherTime METHOD method_168 getVersion ()I - METHOD method_169 getGeneratorOptions ()Lnet/minecraft/class_2487; + METHOD method_169 getGeneratorOptions ()Lnet/minecraft/class_4952; METHOD method_170 getWorldData (Lnet/minecraft/class_2874;)Lnet/minecraft/class_2487; METHOD method_171 isVersionSnapshot ()Z METHOD method_173 setThunderTime (I)V ARG 1 thunderTime METHOD method_174 setBorderSizeLerpTarget (D)V ARG 1 borderSizeLerpTarget - METHOD method_175 setGeneratorOptions (Lnet/minecraft/class_2487;)V METHOD method_177 setTime (J)V ARG 1 time METHOD method_178 getBorderSafeZone ()D @@ -168,7 +165,6 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties ARG 1 initialized METHOD method_22418 sha256Hash (J)J ARG 0 seed - METHOD method_225 setGeneratorType (Lnet/minecraft/class_1942;)V METHOD method_226 getPlayerData ()Lnet/minecraft/class_2487; METHOD method_227 getBorderWarningBlocks ()I METHOD method_228 getCustomBossEvents ()Lnet/minecraft/class_2487;