From 2e1a85620ac576cdb0e076cf7c0e56aabc25a995 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Mon, 11 Oct 2021 08:10:18 +1100 Subject: [PATCH] 21w40a stuff (#2733) * 21w40a stuff * Create LegacyBiomeMapping.mapping * canSpawn * stuff --- .../network/ClientPlayNetworkHandler.mapping | 1 + .../net/minecraft/client/world/ClientWorld.mapping | 4 ++++ .../datafixer/mapping/LegacyBiomeMapping.mapping | 2 ++ .../entity/mob/WaterCreatureEntity.mapping | 6 ++++++ .../minecraft/entity/passive/AxolotlEntity.mapping | 6 ++++++ .../entity/passive/GlowSquidEntity.mapping | 6 ++++++ .../entity/passive/TropicalFishEntity.mapping | 6 ++++++ .../listener/ClientPlayPacketListener.mapping | 2 ++ .../packet/s2c/play/ChunkDataS2CPacket.mapping | 2 ++ .../s2c/play/SimulationDistanceS2CPacket.mapping | 3 +++ .../minecraft/world/biome/BuiltinBiomes.mapping | 2 ++ .../AlwaysTrueBlockPredicate.mapping | 6 ++++++ .../gen/blockpredicate/BlockPredicate.mapping | 14 ++++++++++++-- .../MatchingBlocksBlockPredicate.mapping | 3 +++ .../MatchingFluidsBlockPredicate.mapping | 3 +++ .../gen/blockpredicate/OffsetPredicate.mapping | 9 +++++++++ .../WouldSurviveBlockPredicate.mapping | 10 ++++++++++ .../world/gen/feature/ConfiguredFeatures.mapping | 2 ++ .../world/gen/feature/DefaultBiomeFeatures.mapping | 3 +++ 19 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 mappings/net/minecraft/datafixer/mapping/LegacyBiomeMapping.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping create mode 100644 mappings/net/minecraft/world/gen/blockpredicate/AlwaysTrueBlockPredicate.mapping create mode 100644 mappings/net/minecraft/world/gen/blockpredicate/OffsetPredicate.mapping create mode 100644 mappings/net/minecraft/world/gen/blockpredicate/WouldSurviveBlockPredicate.mapping diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 4b8c664da4..ada91c8614 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_25273 worldKeys Ljava/util/Set; FIELD field_26620 DISCONNECT_LOST_TEXT Lnet/minecraft/class_2561; FIELD field_34963 telemetrySender Lnet/minecraft/class_6628; + FIELD field_35164 simulationDistance I FIELD field_3687 random Ljava/util/Random; FIELD field_3688 recipeManager Lnet/minecraft/class_1863; FIELD field_3689 connection Lnet/minecraft/class_2535; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 1c641094ba..33f58e8d0a 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_32641 PARTICLE_Y_OFFSET D COMMENT A minor offset applied when spawning particles. FIELD field_34804 chunkUpdaters Ljava/util/Deque; + FIELD field_35163 simulationDistance I FIELD field_3727 netHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_3733 scoreboard Lnet/minecraft/class_269; @@ -124,6 +125,9 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 1 pos METHOD method_38538 (Lnet/minecraft/class_2338;)I ARG 1 pos + METHOD method_39023 setSimulationDistance (I)V + ARG 1 simulationDistance + METHOD method_39024 getSimulationDistance ()I METHOD method_8435 setTimeOfDay (J)V ARG 1 timeOfDay METHOD method_8441 tick (Ljava/util/function/BooleanSupplier;)V diff --git a/mappings/net/minecraft/datafixer/mapping/LegacyBiomeMapping.mapping b/mappings/net/minecraft/datafixer/mapping/LegacyBiomeMapping.mapping new file mode 100644 index 0000000000..2f3de22b2b --- /dev/null +++ b/mappings/net/minecraft/datafixer/mapping/LegacyBiomeMapping.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_6669 net/minecraft/datafixer/mapping/LegacyBiomeMapping + FIELD field_35100 MAP Lcom/google/common/collect/ImmutableMap; diff --git a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping index c8d9c98941..eb8f039132 100644 --- a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping @@ -1,3 +1,9 @@ CLASS net/minecraft/class_1480 net/minecraft/entity/mob/WaterCreatureEntity + METHOD method_38986 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 + ARG 2 reason + ARG 3 pos + ARG 4 random METHOD method_6673 tickWaterBreathingAir (I)V ARG 1 air diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index 177cd490a1..9865b05fa1 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -63,6 +63,12 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity METHOD method_35175 appreciatePlayer (Lnet/minecraft/class_5762;)V ARG 0 axolotl METHOD method_36282 hydrateFromPotion ()V + METHOD method_38987 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z + ARG 0 type + ARG 1 world + ARG 2 reason + ARG 3 pos + ARG 4 random CLASS class_5763 AxolotlData FIELD field_28338 variants [Lnet/minecraft/class_5762$class_5767; METHOD ([Lnet/minecraft/class_5762$class_5767;)V diff --git a/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping b/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping index 38bf48f2a8..2a6750c8ea 100644 --- a/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping @@ -3,3 +3,9 @@ CLASS net/minecraft/class_5776 net/minecraft/entity/passive/GlowSquidEntity METHOD method_33333 setDarkTicksRemaining (I)V ARG 1 ticks METHOD method_33334 getDarkTicksRemaining ()I + METHOD method_38962 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z + ARG 0 type + ARG 1 world + ARG 2 reason + ARG 3 pos + ARG 4 random diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping index ad66d7d741..2324965c0f 100644 --- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping @@ -6,6 +6,12 @@ CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity FIELD field_6877 commonSpawn Z FIELD field_6878 SMALL_FISH_VARIETY_IDS [Lnet/minecraft/class_2960; FIELD field_6879 COMMON_VARIANTS [I + METHOD method_38985 canTropicalFishSpawn (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 + ARG 2 reason + ARG 3 pos + ARG 4 random METHOD method_6644 getVariant ()I METHOD method_6645 getPattern (I)I ARG 0 variant diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 79d9613147..5307f4cbf1 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -203,3 +203,5 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_36895 onPing (Lnet/minecraft/class_6373;)V ARG 1 packet + METHOD method_39025 onSimulationDistance (Lnet/minecraft/class_6682;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping index 2644f07c1a..4c302ebd68 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping @@ -10,3 +10,5 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2 ARG 2 lightProvider METHOD method_11523 getX ()I METHOD method_11524 getZ ()I + METHOD method_38598 getChunkData ()Lnet/minecraft/class_6603; + METHOD method_38599 getLightData ()Lnet/minecraft/class_6606; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping new file mode 100644 index 0000000000..1298e8d46f --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_6682 net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping b/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping index d8ebf52df5..cc84dfd61d 100644 --- a/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping +++ b/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_5504 net/minecraft/world/biome/BuiltinBiomes FIELD field_26734 PLAINS Lnet/minecraft/class_1959; FIELD field_26735 THE_VOID Lnet/minecraft/class_1959; METHOD method_31145 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1959;)Lnet/minecraft/class_1959; + ARG 0 key + ARG 1 biome diff --git a/mappings/net/minecraft/world/gen/blockpredicate/AlwaysTrueBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/AlwaysTrueBlockPredicate.mapping new file mode 100644 index 0000000000..6dedaeb75a --- /dev/null +++ b/mappings/net/minecraft/world/gen/blockpredicate/AlwaysTrueBlockPredicate.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_6680 net/minecraft/world/gen/blockpredicate/AlwaysTrueBlockPredicate + FIELD field_35158 instance Lnet/minecraft/class_6680; + FIELD field_35159 CODEC Lcom/mojang/serialization/Codec; + METHOD test (Ljava/lang/Object;Ljava/lang/Object;)Z + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping index b0c839b450..d4e34e44e0 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi METHOD method_38873 getType ()Lnet/minecraft/class_6647; METHOD method_38876 matchingBlock (Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; ARG 0 block - ARG 1 pos + ARG 1 offset METHOD method_38877 not (Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicate METHOD method_38878 bothOf (Lnet/minecraft/class_6646;Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; @@ -11,10 +11,12 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi ARG 1 second METHOD method_38879 matchingFluid (Lnet/minecraft/class_3611;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; ARG 0 fluid - ARG 1 pos + ARG 1 offset METHOD method_38880 allOf (Ljava/util/List;)Lnet/minecraft/class_6646; ARG 0 predicates METHOD method_38881 matchingBlocks (Ljava/util/List;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; + ARG 0 blocks + ARG 1 offset METHOD method_38882 allOf ([Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicates METHOD method_38883 replaceable ()Lnet/minecraft/class_6646; @@ -24,5 +26,13 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi METHOD method_38885 anyOf (Ljava/util/List;)Lnet/minecraft/class_6646; ARG 0 predicates METHOD method_38886 matchingFluids (Ljava/util/List;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; + ARG 0 fluids + ARG 1 offset METHOD method_38887 anyOf ([Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicates + METHOD method_39009 wouldSurvive (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; + ARG 0 state + ARG 1 offset + METHOD method_39010 replaceable (Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; + ARG 0 offset + METHOD method_39011 alwaysTrue ()Lnet/minecraft/class_6646; diff --git a/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping index 793ba103d2..662e7aeeb4 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_6649 net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate FIELD field_35062 CODEC Lcom/mojang/serialization/Codec; FIELD field_35063 blocks Ljava/util/List; + METHOD (Lnet/minecraft/class_2338;Ljava/util/List;)V + ARG 1 offset + ARG 2 blocks diff --git a/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping index 33a33bbd33..8adc6bfd55 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_6650 net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate FIELD field_35065 CODEC Lcom/mojang/serialization/Codec; FIELD field_35066 fluids Ljava/util/List; + METHOD (Lnet/minecraft/class_2338;Ljava/util/List;)V + ARG 1 offset + ARG 2 fluids diff --git a/mappings/net/minecraft/world/gen/blockpredicate/OffsetPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/OffsetPredicate.mapping new file mode 100644 index 0000000000..9dc3dd69ae --- /dev/null +++ b/mappings/net/minecraft/world/gen/blockpredicate/OffsetPredicate.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_6679 net/minecraft/world/gen/blockpredicate/OffsetPredicate + FIELD field_35157 offset Lnet/minecraft/class_2338; + METHOD (Lnet/minecraft/class_2338;)V + ARG 1 offset + METHOD method_38893 test (Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD test (Ljava/lang/Object;Ljava/lang/Object;)Z + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/blockpredicate/WouldSurviveBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/WouldSurviveBlockPredicate.mapping new file mode 100644 index 0000000000..f18c10f5b1 --- /dev/null +++ b/mappings/net/minecraft/world/gen/blockpredicate/WouldSurviveBlockPredicate.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_6681 net/minecraft/world/gen/blockpredicate/WouldSurviveBlockPredicate + FIELD field_35160 CODEC Lcom/mojang/serialization/Codec; + FIELD field_35161 pos Lnet/minecraft/class_2338; + FIELD field_35162 state Lnet/minecraft/class_2680; + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state + METHOD test (Ljava/lang/Object;Ljava/lang/Object;)Z + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping index e412fc5314..f01018c65c 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/class_5464 net/minecraft/world/gen/feature/ConfiguredFeature FIELD field_33634 EMERALD_ORE_TARGETS Lcom/google/common/collect/ImmutableList; FIELD field_33635 COPPER_ORE_TARGETS Lcom/google/common/collect/ImmutableList; FIELD field_33636 COAL_ORE_TARGETS Lcom/google/common/collect/ImmutableList; + FIELD field_35167 IS_AIR Lnet/minecraft/class_6646; + FIELD field_35170 IS_AIR_OR_WATER Lnet/minecraft/class_6646; METHOD method_30590 register (Ljava/lang/String;Lnet/minecraft/class_2975;)Lnet/minecraft/class_2975; ARG 0 id ARG 1 configuredFeature diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index adf1b22fbd..c24020354f 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -135,6 +135,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 1 zombieWeight ARG 2 zombieVillagerWeight ARG 3 skeletonWeight + ARG 4 drowned METHOD method_30579 addCaveMobs (Lnet/minecraft/class_5483$class_5496;)V ARG 0 builder METHOD method_30580 addFarmAnimals (Lnet/minecraft/class_5483$class_5496;)V @@ -176,3 +177,5 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 0 builder METHOD method_38745 addGroveTrees (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder + METHOD method_38941 addDripstoneCaveMobs (Lnet/minecraft/class_5483$class_5496;)V + ARG 0 builder