From 3a95f539e7c6cd4ae08bd15bde7324f6cb49e355 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 30 Nov 2018 22:38:47 +1100 Subject: [PATCH] some things (#220) --- mappings/ai.mapping | 7 --- mappings/bty.mapping | 1 + mappings/buk.mapping | 3 + mappings/bzu.mapping | 1 + mappings/cah.mapping | 2 + mappings/cap.mapping | 36 +++++++++++ mappings/cat.mapping | 3 + mappings/cba.mapping | 20 +++--- mappings/cbd.mapping | 2 + mappings/coq.mapping | 4 +- .../net/minecraft/SharedConstants.mapping | 1 + .../net/minecraft/block/BambooBlock.mapping | 4 +- .../net/minecraft/block/CocoaBlock.mapping | 4 +- .../net/minecraft/block/CropBlock.mapping | 4 +- .../net/minecraft/block/FernBlock.mapping | 4 +- .../net/minecraft/block/Fertilizable.mapping | 4 +- .../net/minecraft/block/GrassBlock.mapping | 4 +- .../block/MushroomPlantBlock.mapping | 4 +- .../block/SaplingBambooBlock.mapping | 4 +- .../net/minecraft/block/SaplingBlock.mapping | 4 +- .../minecraft/block/SeaPickleBlock.mapping | 4 +- .../net/minecraft/block/SeagrassBlock.mapping | 4 +- .../net/minecraft/block/StemBlock.mapping | 4 +- .../minecraft/block/TallFlowerBlock.mapping | 4 +- ...ftGame.mapping => MinecraftClient.mapping} | 4 +- .../client/MinecraftClientGame.mapping | 5 ++ .../client/audio/MusicTracker.mapping | 6 +- .../client/audio/WeightedSoundSet.mapping | 2 +- .../client/font/FontRenderer.mapping | 2 +- .../minecraft/client/font/FontStorage.mapping | 2 +- .../gui/AbstractCommandBlockGui.mapping | 2 +- .../client/gui/CommandBlockGui.mapping | 2 +- mappings/net/minecraft/client/gui/Gui.mapping | 6 +- .../client/gui/container/AnvilGui.mapping | 2 +- .../gui/container/EnchantingGui.mapping | 2 +- .../gui/container/RecipeBookGui.mapping | 4 +- .../client/gui/hud/BossBarHud.mapping | 4 +- .../minecraft/client/gui/hud/ChatHud.mapping | 4 +- .../client/gui/hud/ChatListenerHud.mapping | 4 +- .../minecraft/client/gui/hud/DebugHud.mapping | 4 +- .../client/gui/hud/InGameHud.mapping | 6 +- .../client/gui/hud/ScoreboardHud.mapping | 4 +- .../client/gui/hud/SpectatorHud.mapping | 4 +- .../client/gui/hud/SubtitlesHud.mapping | 4 +- .../client/gui/ingame/ChatGui.mapping | 2 +- .../gui/ingame/CreativeInventoryGui.mapping | 2 +- .../client/gui/ingame/JigsawBlockGui.mapping | 2 +- .../gui/ingame/StructureBlockGui.mapping | 2 +- .../client/gui/menu/AddServerGui.mapping | 2 +- .../client/gui/menu/BackupLevelGui.mapping | 2 +- .../gui/menu/DirectConnectServerGui.mapping | 2 +- .../menu/ListEntryLocalScanProgress.mapping | 2 +- .../gui/menu/ListEntryLocalServer.mapping | 2 +- .../gui/menu/ListEntryRemoteServer.mapping | 2 +- .../gui/menu/NewLevelPresetsGui.mapping | 2 +- .../client/gui/menu/RealmsGui.mapping | 2 +- .../gui/menu/ServerConnectingGui.mapping | 2 +- .../menu/settings/AudioSettingsGui.mapping | 2 +- .../gui/widget/AbstractListWidget.mapping | 4 +- .../gui/widget/AdvancementTreeWidget.mapping | 4 +- .../gui/widget/AdvancementWidget.mapping | 4 +- .../client/gui/widget/ButtonWidget.mapping | 1 + .../client/gui/widget/EntryListWidget.mapping | 2 + .../gui/widget/KeyBindingListWidget.mapping | 2 +- .../gui/widget/LevelEntryWidget.mapping | 2 +- .../gui/widget/OptionSliderWidget.mapping | 2 +- .../gui/widget/RealmsButtonWidget.mapping | 2 +- .../gui/widget/ServerListWidget.mapping | 2 +- .../widget/VideoSettingsListWidget.mapping | 2 + .../network/ClientLoginNetworkHandler.mapping | 4 +- .../network/ClientPlayNetworkHandler.mapping | 6 +- .../client/particle/ManagerParticle.mapping | 2 +- .../client/particle/Particle.mapping | 2 +- .../client/particle/SpellParticle.mapping | 2 +- .../client/player/ClientPlayerEntity.mapping | 4 +- .../client/player/PlayerCapabilitites.mapping | 4 +- .../client/render/FirstPersonRenderer.mapping | 4 +- .../minecraft/client/render/Renderer.mapping | 4 +- .../client/render/WorldRenderer.mapping | 6 +- .../debug/ChunkBorderDebugRenderer.mapping | 4 +- .../debug/HeightmapDebugRenderer.mapping | 4 +- .../debug/PathfindingDebugRenderer.mapping | 4 +- .../client/render/debug/RenderDebug.mapping | 2 + .../render/debug/WaterDebugRenderer.mapping | 4 +- .../render/entity/ItemEntityRenderer.mapping | 2 +- .../entity/ItemFrameEntityRenderer.mapping | 2 +- .../client/settings/GameSettings.mapping | 4 +- .../client/settings/ServerList.mapping | 4 +- .../client/sortme/AdvancementHandler.mapping | 3 + .../client/sortme/ClientCommandSource.mapping | 4 +- .../client/toast/ToastManager.mapping | 4 +- .../client/tutorial/TutorialManager.mapping | 6 +- .../client/util/EnchantingPhrases.mapping | 2 +- .../minecraft/client/util/Keyboard.mapping | 4 +- .../net/minecraft/client/util/Mouse.mapping | 4 +- .../client/world/ClientChunkProvider.mapping | 2 +- .../client/world/ClientWorld.mapping | 4 +- .../EnchantingTableContainer.mapping | 2 +- .../fixes/EntityZombieVillagerTypeFix.mapping | 2 +- .../enchantment/EnchantmentHelper.mapping | 6 +- mappings/net/minecraft/entity/Entity.mapping | 2 +- .../{tracker => data}/DataTracker.mapping | 2 +- .../{tracker => data}/TrackedData.mapping | 2 +- .../TrackedDataHandler.mapping | 2 +- .../TrackedDataHandlerRegistry.mapping | 2 +- .../entity/player/PlayerAbilities.mapping | 4 ++ .../entity/tracker/EntityTracker.mapping | 18 ++++++ .../entity/tracker/TrackedEntity.mapping} | 2 +- mappings/net/minecraft/item/Item.mapping | 2 +- .../predicate/DamagePredicate.mapping | 28 +++++++++ ....mapping => DamageSourcePredicate.mapping} | 2 +- .../minecraft/server/MinecraftServer.mapping | 2 +- ...nManager.mapping => PlayerManager.mapping} | 4 +- ...mapping => DedicatedPlayerManager.mapping} | 4 +- .../IntegratedPlayerManager.mapping} | 2 +- .../{ => integrated}/IntegratedServer.mapping | 6 +- .../structures/DesertTempleGenerator.mapping | 2 + .../sortme/structures/IglooGenerator.mapping | 2 + .../structures/JungleTempleGenerator.mapping | 4 +- .../structures/MineshaftGenerator.mapping | 26 +++++++- .../NetherFortressGenerator.mapping | 62 +++++++++++++++++++ .../structures/OceanTempleGenerator.mapping | 2 + .../structures/ShipwreckGenerator.mapping | 2 + .../structures/StrongholdGenerator.mapping | 50 ++++++++++++++- .../structures/SwampHutGenerator.mapping | 2 + .../structures/VillageGenerator.mapping | 34 ++++++++++ .../net/minecraft/util/WeightedPicker.mapping | 4 +- .../net/minecraft/util/math/Facing.mapping | 5 +- .../minecraft/util/math/MathHelper.mapping | 10 +-- mappings/net/minecraft/world/World.mapping | 2 +- .../minecraft/world/chunk/EmptyChunk.mapping} | 7 ++- .../world/explosion/Explosion.mapping | 2 +- .../decorator/CarvingMaskDecorator.mapping | 1 + .../ChanceHeightmapDecorator.mapping | 1 + .../ChanceHeightmapDoubleDecorator.mapping | 1 + .../ChanceTopSolidHeightmapDecorator.mapping | 1 + .../decorator/ChorusPlantDecorator.mapping | 1 + .../gen/decorator/ConfiguredDecorator.mapping | 2 +- .../CountChanceHeightmapDecorator.mapping | 1 + ...ountChanceHeightmapDoubleDecorator.mapping | 1 + .../CountExtraHeightmapDecorator.mapping | 1 + .../decorator/CountHeight64Decorator.mapping | 1 + .../CountHeightmap32Decorator.mapping | 1 + .../decorator/CountHeightmapDecorator.mapping | 1 + .../CountHeightmapDoubleDecorator.mapping | 1 + .../decorator/CountTopSolidDecorator.mapping | 1 + .../decorator/DarkOakTreeDecorator.mapping | 1 + .../world/gen/decorator/Decorator.mapping | 4 +- .../gen/decorator/DungeonsDecorator.mapping | 1 + .../gen/decorator/EndGatewayDecorator.mapping | 1 + .../gen/decorator/ForestRockDecorator.mapping | 1 + .../gen/decorator/HeightmapDecorator.mapping | 1 + .../HeightmapNoiseBiasedDecorator.mapping | 1 + .../decorator/HeightmapRangeDecorator.mapping | 1 + .../gen/decorator/IcebergDecorator.mapping | 1 + .../gen/decorator/LakeLakeDecorator.mapping | 1 + .../gen/decorator/MagmaDecorator.mapping | 1 + .../NoiseHeightmap32Decorator.mapping | 1 + .../NoiseHeightmapDoubleDecorator.mapping | 1 + .../gen/decorator/WaterLakeDecorator.mapping | 1 + .../world/gen/feature/BambooFeature.mapping | 1 + .../world/gen/feature/BlueIceFeature.mapping | 1 + .../gen/feature/BonusChestFeature.mapping | 1 + .../world/gen/feature/BushFeature.mapping | 1 + .../world/gen/feature/CactusFeature.mapping | 1 + .../gen/feature/ChorusPlantFeature.mapping | 1 + .../gen/feature/ConfiguredFeature.mapping | 2 +- .../world/gen/feature/CoralFeature.mapping | 1 + .../world/gen/feature/DeadBushFeature.mapping | 1 + .../gen/feature/DecoratedFeature.mapping | 1 + .../gen/feature/DesertWellFeature.mapping | 1 + .../world/gen/feature/DiskFeature.mapping | 1 + .../gen/feature/DoublePlantFeature.mapping | 1 + .../world/gen/feature/DungeonFeature.mapping | 1 + .../world/gen/feature/EmeraldOre.mapping | 1 + .../gen/feature/EndGatewayFeature.mapping | 1 + .../gen/feature/EndIslandFeature.mapping | 1 + .../gen/feature/EndPillarFeature.mapping | 1 + .../world/gen/feature/Feature.mapping | 1 + .../world/gen/feature/FlowerFeature.mapping | 1 + .../gen/feature/ForestRockFeature.mapping | 1 + .../world/gen/feature/FossilFeature.mapping | 1 + .../gen/feature/FreezeTopLayerFeature.mapping | 1 + .../gen/feature/GlowstoneBlobFeature.mapping | 1 + .../world/gen/feature/GrassFeature.mapping | 1 + .../feature/HugeBrownMushroomFeature.mapping | 1 + .../feature/HugeRedMushroomFeature.mapping | 1 + .../world/gen/feature/IcePatchFeature.mapping | 1 + .../world/gen/feature/IceSpikeFeature.mapping | 1 + .../world/gen/feature/IcebergFeature.mapping | 1 + .../gen/feature/JungleGrassFeature.mapping | 1 + .../world/gen/feature/KelpFeature.mapping | 1 + .../world/gen/feature/LakeFeature.mapping | 1 + .../world/gen/feature/MelonFeature.mapping | 1 + .../gen/feature/NetherFireFeature.mapping | 1 + .../gen/feature/NetherSpringFeature.mapping | 1 + .../world/gen/feature/OreFeature.mapping | 1 + .../world/gen/feature/PumpkinFeature.mapping | 1 + .../gen/feature/RandomBooleanFeature.mapping | 1 + .../world/gen/feature/RandomFeature.mapping | 1 + .../gen/feature/RandomFeatureEntry.mapping | 2 +- .../gen/feature/RandomRandomFeature.mapping | 1 + .../world/gen/feature/ReedFeature.mapping | 1 + .../gen/feature/SeaPickleFeature.mapping | 1 + .../world/gen/feature/SeagrassFeature.mapping | 1 + .../gen/feature/SimpleBlockFeature.mapping | 1 + .../gen/feature/SimpleRandomFeature.mapping | 1 + .../world/gen/feature/SpringFeature.mapping | 1 + .../gen/feature/StructureFeature.mapping | 1 + .../gen/feature/TaigaGrassFeature.mapping | 1 + .../world/gen/feature/TreeFeature.mapping | 1 + .../world/gen/feature/VinesFeature.mapping | 1 + .../feature/VoidStartPlatformFeature.mapping | 1 + .../gen/feature/WaterlilyFeature.mapping | 1 + mappings/ue.mapping | 6 -- 215 files changed, 599 insertions(+), 166 deletions(-) delete mode 100644 mappings/ai.mapping create mode 100644 mappings/buk.mapping create mode 100644 mappings/cat.mapping rename mappings/net/minecraft/client/{MinecraftGame.mapping => MinecraftClient.mapping} (97%) create mode 100644 mappings/net/minecraft/client/MinecraftClientGame.mapping rename mappings/net/minecraft/entity/{tracker => data}/DataTracker.mapping (94%) rename mappings/net/minecraft/entity/{tracker => data}/TrackedData.mapping (70%) rename mappings/net/minecraft/entity/{tracker => data}/TrackedDataHandler.mapping (73%) rename mappings/net/minecraft/entity/{tracker => data}/TrackedDataHandlerRegistry.mapping (99%) create mode 100644 mappings/net/minecraft/entity/tracker/EntityTracker.mapping rename mappings/{uq.mapping => net/minecraft/entity/tracker/TrackedEntity.mapping} (84%) create mode 100644 mappings/net/minecraft/predicate/DamagePredicate.mapping rename mappings/net/minecraft/predicate/entity/{DamagePredicate.mapping => DamageSourcePredicate.mapping} (95%) rename mappings/net/minecraft/server/{config/ServerConfigurationManager.mapping => PlayerManager.mapping} (96%) rename mappings/net/minecraft/server/dedicated/{DedicatedServerConfigurationManager.mapping => DedicatedPlayerManager.mapping} (86%) rename mappings/net/minecraft/server/{IntegratedServerConfigurationManager.mapping => integrated/IntegratedPlayerManager.mapping} (71%) rename mappings/net/minecraft/server/{ => integrated}/IntegratedServer.mapping (92%) rename mappings/{bqd.mapping => net/minecraft/world/chunk/EmptyChunk.mapping} (83%) delete mode 100644 mappings/ue.mapping diff --git a/mappings/ai.mapping b/mappings/ai.mapping deleted file mode 100644 index e3c306ab2b..0000000000 --- a/mappings/ai.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS ai - FIELD b dealt Lbf$c; - FIELD c taken Lbf$c; - FIELD d sourceEntity Las; - FIELD e blocked Ljava/lang/Boolean; - FIELD f type Laj; - METHOD a toJson ()Lcom/google/gson/JsonElement; diff --git a/mappings/bty.mapping b/mappings/bty.mapping index 7f3e18202f..12aabeba59 100644 --- a/mappings/bty.mapping +++ b/mappings/bty.mapping @@ -1,3 +1,4 @@ CLASS bty METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/buk.mapping b/mappings/buk.mapping new file mode 100644 index 0000000000..54367f4658 --- /dev/null +++ b/mappings/buk.mapping @@ -0,0 +1,3 @@ +CLASS buk + METHOD a (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z + ARG 3 random diff --git a/mappings/bzu.mapping b/mappings/bzu.mapping index c4b1c0d452..3eb6ba8805 100644 --- a/mappings/bzu.mapping +++ b/mappings/bzu.mapping @@ -2,3 +2,4 @@ CLASS bzu METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/cah.mapping b/mappings/cah.mapping index f0ec823cf9..d28dd5c7e3 100644 --- a/mappings/cah.mapping +++ b/mappings/cah.mapping @@ -1,3 +1,5 @@ CLASS cah CLASS cah$a + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V diff --git a/mappings/cap.mapping b/mappings/cap.mapping index 125135c3cb..93e4ce557b 100644 --- a/mappings/cap.mapping +++ b/mappings/cap.mapping @@ -1,3 +1,39 @@ CLASS cap + CLASS cap$h + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cap$j + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cap$k + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cap$l + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cap$m + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cap$n + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cap$o + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cap$p + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cap$q + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random CLASS cap$r METHOD a toNbt (Lhp;)V + CLASS cap$s + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cap$t + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cap$u + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random diff --git a/mappings/cat.mapping b/mappings/cat.mapping new file mode 100644 index 0000000000..9fd6ff38f4 --- /dev/null +++ b/mappings/cat.mapping @@ -0,0 +1,3 @@ +CLASS cat + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random diff --git a/mappings/cba.mapping b/mappings/cba.mapping index 779ef7bec9..e1fed31949 100644 --- a/mappings/cba.mapping +++ b/mappings/cba.mapping @@ -2,6 +2,8 @@ CLASS cba CLASS cba$a FIELD a block Lboj; METHOD a getBlock ()Lboj; + METHOD a (Ljava/util/Random;IIIZ)V + ARG 1 random FIELD a facing Ley; FIELD b mirror Lbja; FIELD c rotation Lbka; @@ -46,13 +48,13 @@ CLASS cba ARG 7 maxY ARG 8 maxZ ARG 9 replaceBlocks - ARG 10 rand + ARG 10 random METHOD a fillWithOutlineUnderSealevel (Lbar;Lcag;Ljava/util/Random;FIIIIIILboj;Lboj;ZZ)V - ARG 3 rand + ARG 3 random METHOD a addBlockWithRandomThreshold (Lbar;Lcag;Ljava/util/Random;FIIILboj;)V ARG 1 world ARG 2 bounds - ARG 3 rand + ARG 3 random ARG 4 threshold ARG 5 x ARG 6 y @@ -60,26 +62,30 @@ CLASS cba METHOD a addDoor (Lbar;Lcag;Ljava/util/Random;IIILey;Lbha;)V ARG 1 world ARG 2 bounds - ARG 3 rand + ARG 3 random ARG 4 x ARG 5 y ARG 6 z ARG 7 facing METHOD a addDispenser (Lbar;Lcag;Ljava/util/Random;IIILey;Lpy;)Z - ARG 3 rand + ARG 3 random ARG 4 x ARG 5 y ARG 6 z METHOD a (Lbar;Lcag;Ljava/util/Random;IIILpy;)Z - ARG 3 rand + ARG 3 random METHOD a addChest (Lbar;Lcag;Ljava/util/Random;Let;Lpy;Lboj;)Z ARG 1 world - ARG 3 rand + ARG 3 random ARG 4 pos + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a isUnderSeaLevel (Lbau;IIILcag;)Z ARG 2 x ARG 3 z ARG 4 y + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V METHOD b applyZTransform (II)I METHOD b (Lbar;Lboj;IIILcag;)V diff --git a/mappings/cbd.mapping b/mappings/cbd.mapping index aeee11f783..0eb0f8f4a9 100644 --- a/mappings/cbd.mapping +++ b/mappings/cbd.mapping @@ -2,4 +2,6 @@ CLASS cbd METHOD a translate (III)V ARG 1 x ARG 2 y + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V diff --git a/mappings/coq.mapping b/mappings/coq.mapping index 18290928d7..94b5514e79 100644 --- a/mappings/coq.mapping +++ b/mappings/coq.mapping @@ -1,3 +1,5 @@ CLASS coq - FIELD a game Lcnv; + FIELD a client Lcnv; + METHOD (Lcnv;)V + ARG 1 client METHOD a onChatMessage (Liy;Lja;)V diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index 79e1c9661e..059459248c 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -2,6 +2,7 @@ CLASS l net/minecraft/SharedConstants FIELD a RESOURCE_LEAK_DETECTOR_DISABLED Lio/netty/util/ResourceLeakDetector$Level; FIELD b isDevelopment Z FIELD c INVALID_CHARS_LEVEL_NAME [C + METHOD a getVersion ()Lcom/mojang/bridge/game/GameVersion; METHOD a isValidChar (C)Z ARG 0 chr METHOD a stripInvalidChars (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/block/BambooBlock.mapping b/mappings/net/minecraft/block/BambooBlock.mapping index 11ce7d2360..55aeba20fc 100644 --- a/mappings/net/minecraft/block/BambooBlock.mapping +++ b/mappings/net/minecraft/block/BambooBlock.mapping @@ -9,7 +9,7 @@ CLASS bfa net/minecraft/block/BambooBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD a calcBlockBreakingDelta (Lboj;Laqj;Lbac;Let;)F ARG 1 state @@ -35,6 +35,6 @@ CLASS bfa net/minecraft/block/BambooBlock METHOD aa_ getOffsetType ()Lbfr$b; METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD c getRenderLayer ()Lbad; diff --git a/mappings/net/minecraft/block/CocoaBlock.mapping b/mappings/net/minecraft/block/CocoaBlock.mapping index 8e3a95b5d3..8dae4a1358 100644 --- a/mappings/net/minecraft/block/CocoaBlock.mapping +++ b/mappings/net/minecraft/block/CocoaBlock.mapping @@ -9,7 +9,7 @@ CLASS bgi net/minecraft/block/CocoaBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj; ARG 1 state @@ -27,6 +27,6 @@ CLASS bgi net/minecraft/block/CocoaBlock ARG 1 builder METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD c getRenderLayer ()Lbad; diff --git a/mappings/net/minecraft/block/CropBlock.mapping b/mappings/net/minecraft/block/CropBlock.mapping index d5a6015566..e2941bcd99 100644 --- a/mappings/net/minecraft/block/CropBlock.mapping +++ b/mappings/net/minecraft/block/CropBlock.mapping @@ -12,7 +12,7 @@ CLASS bgs net/minecraft/block/CropBlock METHOD a applyGrowth (Lbaq;Let;Lboj;)V METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj; ARG 1 state @@ -33,7 +33,7 @@ CLASS bgs net/minecraft/block/CropBlock METHOD b withCropAge (I)Lboj; METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD b canPlantOnTop (Lboj;Lbac;Let;)Z ARG 1 floor diff --git a/mappings/net/minecraft/block/FernBlock.mapping b/mappings/net/minecraft/block/FernBlock.mapping index ef74cb9ae7..07791fc186 100644 --- a/mappings/net/minecraft/block/FernBlock.mapping +++ b/mappings/net/minecraft/block/FernBlock.mapping @@ -7,7 +7,7 @@ CLASS bli net/minecraft/block/FernBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj; ARG 1 state @@ -16,5 +16,5 @@ CLASS bli net/minecraft/block/FernBlock METHOD aa_ getOffsetType ()Lbfr$b; METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos diff --git a/mappings/net/minecraft/block/Fertilizable.mapping b/mappings/net/minecraft/block/Fertilizable.mapping index f26f10b360..dd0637d93a 100644 --- a/mappings/net/minecraft/block/Fertilizable.mapping +++ b/mappings/net/minecraft/block/Fertilizable.mapping @@ -5,9 +5,9 @@ CLASS bft net/minecraft/block/Fertilizable ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos diff --git a/mappings/net/minecraft/block/GrassBlock.mapping b/mappings/net/minecraft/block/GrassBlock.mapping index 283e65665f..eaa189e250 100644 --- a/mappings/net/minecraft/block/GrassBlock.mapping +++ b/mappings/net/minecraft/block/GrassBlock.mapping @@ -7,11 +7,11 @@ CLASS bhy net/minecraft/block/GrassBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD c getRenderLayer ()Lbad; METHOD e isFullBoundsCubeForCulling (Lboj;)Z diff --git a/mappings/net/minecraft/block/MushroomPlantBlock.mapping b/mappings/net/minecraft/block/MushroomPlantBlock.mapping index 1eee79baaf..b62953bf3a 100644 --- a/mappings/net/minecraft/block/MushroomPlantBlock.mapping +++ b/mappings/net/minecraft/block/MushroomPlantBlock.mapping @@ -7,7 +7,7 @@ CLASS bjb net/minecraft/block/MushroomPlantBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj; ARG 1 state @@ -21,7 +21,7 @@ CLASS bjb net/minecraft/block/MushroomPlantBlock ARG 1 world METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD b canPlantOnTop (Lboj;Lbac;Let;)Z ARG 1 floor diff --git a/mappings/net/minecraft/block/SaplingBambooBlock.mapping b/mappings/net/minecraft/block/SaplingBambooBlock.mapping index d6a5786a76..3f9b47b8e3 100644 --- a/mappings/net/minecraft/block/SaplingBambooBlock.mapping +++ b/mappings/net/minecraft/block/SaplingBambooBlock.mapping @@ -10,7 +10,7 @@ CLASS bfb net/minecraft/block/SaplingBambooBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD a calcBlockBreakingDelta (Lboj;Laqj;Lbac;Let;)F ARG 1 state @@ -31,6 +31,6 @@ CLASS bfb net/minecraft/block/SaplingBambooBlock METHOD aa_ getOffsetType ()Lbfr$b; METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD c getRenderLayer ()Lbad; diff --git a/mappings/net/minecraft/block/SaplingBlock.mapping b/mappings/net/minecraft/block/SaplingBlock.mapping index f7cacbbb97..ca20fd346b 100644 --- a/mappings/net/minecraft/block/SaplingBlock.mapping +++ b/mappings/net/minecraft/block/SaplingBlock.mapping @@ -6,7 +6,7 @@ CLASS bkc net/minecraft/block/SaplingBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj; ARG 1 state @@ -20,5 +20,5 @@ CLASS bkc net/minecraft/block/SaplingBlock ARG 1 builder METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos diff --git a/mappings/net/minecraft/block/SeaPickleBlock.mapping b/mappings/net/minecraft/block/SeaPickleBlock.mapping index 3b0537fd7c..258e3fb883 100644 --- a/mappings/net/minecraft/block/SeaPickleBlock.mapping +++ b/mappings/net/minecraft/block/SeaPickleBlock.mapping @@ -9,7 +9,7 @@ CLASS bke net/minecraft/block/SeaPickleBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj; ARG 1 state @@ -23,7 +23,7 @@ CLASS bke net/minecraft/block/SeaPickleBlock ARG 1 builder METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD b canPlantOnTop (Lboj;Lbac;Let;)Z ARG 1 floor diff --git a/mappings/net/minecraft/block/SeagrassBlock.mapping b/mappings/net/minecraft/block/SeagrassBlock.mapping index e70c02be62..fb45575ea5 100644 --- a/mappings/net/minecraft/block/SeagrassBlock.mapping +++ b/mappings/net/minecraft/block/SeagrassBlock.mapping @@ -9,7 +9,7 @@ CLASS bkf net/minecraft/block/SeagrassBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj; ARG 1 state @@ -19,7 +19,7 @@ CLASS bkf net/minecraft/block/SeagrassBlock ARG 1 state METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD b canPlantOnTop (Lboj;Lbac;Let;)Z ARG 1 floor diff --git a/mappings/net/minecraft/block/StemBlock.mapping b/mappings/net/minecraft/block/StemBlock.mapping index 4191a48874..74b9d8134f 100644 --- a/mappings/net/minecraft/block/StemBlock.mapping +++ b/mappings/net/minecraft/block/StemBlock.mapping @@ -8,7 +8,7 @@ CLASS bla net/minecraft/block/StemBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj; ARG 1 state @@ -22,7 +22,7 @@ CLASS bla net/minecraft/block/StemBlock ARG 1 builder METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD b canPlantOnTop (Lboj;Lbac;Let;)Z ARG 1 floor diff --git a/mappings/net/minecraft/block/TallFlowerBlock.mapping b/mappings/net/minecraft/block/TallFlowerBlock.mapping index 7e9f5292e5..412cff6d78 100644 --- a/mappings/net/minecraft/block/TallFlowerBlock.mapping +++ b/mappings/net/minecraft/block/TallFlowerBlock.mapping @@ -7,9 +7,9 @@ CLASS blh net/minecraft/block/TallFlowerBlock ARG 3 state METHOD a canGrow (Lbaq;Ljava/util/Random;Let;Lboj;)Z ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V ARG 1 world - ARG 2 rand + ARG 2 random ARG 3 pos diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping similarity index 97% rename from mappings/net/minecraft/client/MinecraftGame.mapping rename to mappings/net/minecraft/client/MinecraftClient.mapping index 5074cc9024..40be1177eb 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -1,4 +1,4 @@ -CLASS cnv net/minecraft/client/MinecraftGame +CLASS cnv net/minecraft/client/MinecraftClient FIELD E LOGGER Lorg/apache/logging/log4j/Logger; FIELD H sessionPropertyMap Lcom/mojang/authlib/properties/PropertyMap; FIELD J currentServerEntry Lczn; @@ -23,6 +23,7 @@ CLASS cnv net/minecraft/client/MinecraftGame FIELD aH bakedModelManager Ldmy; FIELD aI blockRenderManager Ldcw; FIELD aJ toastManager Lcqb; + FIELD aK game Lcnq; FIELD aL isRunning Z FIELD aN fpsCounter I FIELD aO tutorialManager Ldpa; @@ -107,6 +108,7 @@ CLASS cnv net/minecraft/client/MinecraftGame METHOD ak getCreativeHotbarStorage ()Lcns; METHOD al getBakedModelManager ()Ldmy; METHOD an getProfiler ()Laek; + METHOD ao getGame ()Lcnq; METHOD ap init ()V METHOD ar checkIs64Bit ()Z METHOD at registerMetadataDeserializers ()V diff --git a/mappings/net/minecraft/client/MinecraftClientGame.mapping b/mappings/net/minecraft/client/MinecraftClientGame.mapping new file mode 100644 index 0000000000..e6a58deca4 --- /dev/null +++ b/mappings/net/minecraft/client/MinecraftClientGame.mapping @@ -0,0 +1,5 @@ +CLASS cnq net/minecraft/client/MinecraftClientGame + FIELD a client Lcnv; + FIELD b launcher Lcom/mojang/bridge/launcher/Launcher; + METHOD (Lcnv;)V + ARG 1 client diff --git a/mappings/net/minecraft/client/audio/MusicTracker.mapping b/mappings/net/minecraft/client/audio/MusicTracker.mapping index 2c59b7751f..93ba4b7815 100644 --- a/mappings/net/minecraft/client/audio/MusicTracker.mapping +++ b/mappings/net/minecraft/client/audio/MusicTracker.mapping @@ -13,9 +13,11 @@ CLASS don net/minecraft/client/audio/MusicTracker METHOD a getSound ()Lxf; METHOD b getMinDelay ()I METHOD c getMaxDelay ()I - FIELD a rand Ljava/util/Random; - FIELD b game Lcnv; + FIELD a random Ljava/util/Random; + FIELD b client Lcnv; FIELD c current Ldnt; FIELD d timeUntilNextSong I + METHOD (Lcnv;)V + ARG 1 client METHOD a play (Ldon$a;)V METHOD ab_ tick ()V diff --git a/mappings/net/minecraft/client/audio/WeightedSoundSet.mapping b/mappings/net/minecraft/client/audio/WeightedSoundSet.mapping index 5f9c911e99..a2465c1475 100644 --- a/mappings/net/minecraft/client/audio/WeightedSoundSet.mapping +++ b/mappings/net/minecraft/client/audio/WeightedSoundSet.mapping @@ -1,6 +1,6 @@ CLASS dor net/minecraft/client/audio/WeightedSoundSet FIELD a sounds Ljava/util/List; - FIELD b rand Ljava/util/Random; + FIELD b random Ljava/util/Random; FIELD c id Lpy; FIELD d subtitle Lja; METHOD (Lpy;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/client/font/FontRenderer.mapping b/mappings/net/minecraft/client/font/FontRenderer.mapping index 2f0ff3f924..24c7a2e43b 100644 --- a/mappings/net/minecraft/client/font/FontRenderer.mapping +++ b/mappings/net/minecraft/client/font/FontRenderer.mapping @@ -11,7 +11,7 @@ CLASS coj net/minecraft/client/font/FontRenderer METHOD a draw (Lcnf;)V ARG 0 buffer FIELD a FONT_HEIGHT I - FIELD b rand Ljava/util/Random; + FIELD b random Ljava/util/Random; FIELD c textureManager Ldln; FIELD d font Lcqg; FIELD e rightToLeft Z diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index b643d8e0b2..2af0451d51 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -1,6 +1,6 @@ CLASS cqg net/minecraft/client/font/FontStorage FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD d RAND Ljava/util/Random; + FIELD d RANDOM Ljava/util/Random; FIELD h entries Ljava/util/List; FIELD j glyphCache Lit/unimi/dsi/fastutil/chars/Char2ObjectMap; METHOD a getGlyph (C)Lclz; diff --git a/mappings/net/minecraft/client/gui/AbstractCommandBlockGui.mapping b/mappings/net/minecraft/client/gui/AbstractCommandBlockGui.mapping index 38fe9a3532..d2d74a44ed 100644 --- a/mappings/net/minecraft/client/gui/AbstractCommandBlockGui.mapping +++ b/mappings/net/minecraft/client/gui/AbstractCommandBlockGui.mapping @@ -17,7 +17,7 @@ CLASS csv net/minecraft/client/gui/AbstractCommandBlockGui ARG 1 mouseX ARG 2 mouseY METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V METHOD f update ()V diff --git a/mappings/net/minecraft/client/gui/CommandBlockGui.mapping b/mappings/net/minecraft/client/gui/CommandBlockGui.mapping index ffea63d16e..3c14c6dfba 100644 --- a/mappings/net/minecraft/client/gui/CommandBlockGui.mapping +++ b/mappings/net/minecraft/client/gui/CommandBlockGui.mapping @@ -15,6 +15,6 @@ CLASS ctb net/minecraft/client/gui/CommandBlockGui FIELD E conditional Z FIELD F alwaysActive Z METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V diff --git a/mappings/net/minecraft/client/gui/Gui.mapping b/mappings/net/minecraft/client/gui/Gui.mapping index 6a168588c8..e6ca22e4ec 100644 --- a/mappings/net/minecraft/client/gui/Gui.mapping +++ b/mappings/net/minecraft/client/gui/Gui.mapping @@ -3,7 +3,7 @@ CLASS csb net/minecraft/client/gui/Gui FIELD f PROTOCOLS Ljava/util/Set; FIELD g uri Ljava/net/URI; FIELD j listeners Ljava/util/List; - FIELD k game Lcnv; + FIELD k client Lcnv; FIELD l itemRenderer Ldhn; FIELD m width I FIELD n height I @@ -18,7 +18,7 @@ CLASS csb net/minecraft/client/gui/Gui ARG 1 stack ARG 2 x METHOD a initialize (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD a addButton (Lcou;)Lcou; METHOD a drawTextComponentHover (Lja;II)V @@ -34,7 +34,7 @@ CLASS csb net/minecraft/client/gui/Gui METHOD aj_ canClose ()Z METHOD b getListeners ()Ljava/util/List; METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V METHOD c drawTextureBackground (I)V diff --git a/mappings/net/minecraft/client/gui/container/AnvilGui.mapping b/mappings/net/minecraft/client/gui/container/AnvilGui.mapping index 8c1ad85277..1008c35bec 100644 --- a/mappings/net/minecraft/client/gui/container/AnvilGui.mapping +++ b/mappings/net/minecraft/client/gui/container/AnvilGui.mapping @@ -22,7 +22,7 @@ CLASS csx net/minecraft/client/gui/container/AnvilGui METHOD a onContainerRegistered (Lasb;Lfh;)V ARG 1 container METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V METHOD c drawForeground (II)V diff --git a/mappings/net/minecraft/client/gui/container/EnchantingGui.mapping b/mappings/net/minecraft/client/gui/container/EnchantingGui.mapping index 970abdd012..1a558a212c 100644 --- a/mappings/net/minecraft/client/gui/container/EnchantingGui.mapping +++ b/mappings/net/minecraft/client/gui/container/EnchantingGui.mapping @@ -2,7 +2,7 @@ CLASS ctj net/minecraft/client/gui/container/EnchantingGui FIELD D BG_TEX Lpy; FIELD E BOOK_TEX Lpy; FIELD G playerInv Laqi; - FIELD H rand Ljava/util/Random; + FIELD H random Ljava/util/Random; FIELD I container Lasn; METHOD (Laqi;Lbaq;Lafi;)V ARG 1 playerInv diff --git a/mappings/net/minecraft/client/gui/container/RecipeBookGui.mapping b/mappings/net/minecraft/client/gui/container/RecipeBookGui.mapping index 3b98b4c4a0..19dd6657ea 100644 --- a/mappings/net/minecraft/client/gui/container/RecipeBookGui.mapping +++ b/mappings/net/minecraft/client/gui/container/RecipeBookGui.mapping @@ -1,9 +1,11 @@ CLASS cuh net/minecraft/client/gui/container/RecipeBookGui FIELD a TEXTURE Lpy; - FIELD i game Lcnv; + FIELD i client Lcnv; FIELD j recipeBook Lcno; FIELD r searchField Lcoy; FIELD t cachedInvChangeCount I + METHOD a (IILcnv;ZLatb;)V + ARG 3 client METHOD a triggerPirateSpeakEasterEgg (Ljava/lang/String;)V METHOD charTyped (CI)Z ARG 1 chr diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index 7fc9d0a5ea..41fb606f93 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -1,7 +1,9 @@ CLASS cot net/minecraft/client/gui/hud/BossBarHud FIELD a BAR_TEX Lpy; - FIELD f game Lcnv; + FIELD f client Lcnv; FIELD g bossBars Ljava/util/Map; + METHOD (Lcnv;)V + ARG 1 client METHOD a draw ()V METHOD a drawBossBar (IILaet;)V ARG 1 x diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 0e73a683da..bc8a908264 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -1,6 +1,8 @@ CLASS cov net/minecraft/client/gui/hud/ChatHud FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD f game Lcnv; + FIELD f client Lcnv; + METHOD (Lcnv;)V + ARG 1 client METHOD a reset ()V METHOD a addMessage (Lja;)V METHOD a addMessage (Lja;I)V diff --git a/mappings/net/minecraft/client/gui/hud/ChatListenerHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatListenerHud.mapping index 7af867cfc6..2208960bcb 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatListenerHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatListenerHud.mapping @@ -1,3 +1,5 @@ CLASS cor net/minecraft/client/gui/hud/ChatListenerHud - FIELD a game Lcnv; + FIELD a client Lcnv; + METHOD (Lcnv;)V + ARG 1 client METHOD a onChatMessage (Liy;Lja;)V diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index eddb9d1e01..391261e0c3 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -1,4 +1,6 @@ CLASS cox net/minecraft/client/gui/hud/DebugHud - FIELD a game Lcnv; + FIELD a client Lcnv; FIELD f fontRenderer Lcoj; + METHOD (Lcnv;)V + ARG 1 client METHOD c drawLeftInfoText ()V diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index d6da192e2c..30d8bb3315 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -5,8 +5,8 @@ CLASS cok net/minecraft/client/gui/hud/InGameHud FIELD f VIGNETTE_TEX Lpy; FIELD g WIDGETS_TEX Lpy; FIELD h PUMPKIN_BLUR Lpy; - FIELD i rand Ljava/util/Random; - FIELD j game Lcnv; + FIELD i random Ljava/util/Random; + FIELD j client Lcnv; FIELD k itemRenderer Ldhn; FIELD l hudChat Lcov; FIELD m ticks I @@ -19,6 +19,8 @@ CLASS cok net/minecraft/client/gui/hud/InGameHud FIELD u hudSpectator Lcpv; FIELD v hudScoreboard Lcpk; FIELD w hudBossBar Lcot; + METHOD (Lcnv;)V + ARG 1 client METHOD a draw (F)V METHOD a addChatMessage (Liy;Lja;)V METHOD a setOverlayMessage (Lja;Z)V diff --git a/mappings/net/minecraft/client/gui/hud/ScoreboardHud.mapping b/mappings/net/minecraft/client/gui/hud/ScoreboardHud.mapping index 27170fbc18..8c8c04ea18 100644 --- a/mappings/net/minecraft/client/gui/hud/ScoreboardHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ScoreboardHud.mapping @@ -1,6 +1,6 @@ CLASS cpk net/minecraft/client/gui/hud/ScoreboardHud - FIELD f game Lcnv; + FIELD f client Lcnv; FIELD g hudInGame Lcok; METHOD (Lcnv;Lcok;)V - ARG 1 game + ARG 1 client METHOD a clear ()V diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index 6924db007e..f7fb442238 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -1,6 +1,8 @@ CLASS cpv net/minecraft/client/gui/hud/SpectatorHud FIELD a SPECTATOR_TEX Lpy; FIELD f WIDGETS_TEX Lpy; - FIELD g game Lcnv; + FIELD g client Lcnv; FIELD i spectatorMenu Lcvi; + METHOD (Lcnv;)V + ARG 1 client METHOD a draw (F)V diff --git a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping index e608b6a91b..8c3884f878 100644 --- a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping @@ -7,8 +7,10 @@ CLASS cpo net/minecraft/client/gui/hud/SubtitlesHud METHOD a reset (Lckp;)V METHOD b getTime ()J METHOD c getPosition ()Lckp; - FIELD a game Lcnv; + FIELD a client Lcnv; FIELD f entries Ljava/util/List; FIELD g enabled Z + METHOD (Lcnv;)V + ARG 1 client METHOD a onSoundPlayed (Ldnt;Ldor;)V ARG 1 sound diff --git a/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping b/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping index 4a92ba7403..8e8475e591 100644 --- a/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping @@ -4,7 +4,7 @@ CLASS cre net/minecraft/client/gui/ingame/ChatGui ARG 1 mouseX ARG 2 mouseY METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V METHOD e isPauseScreen ()Z diff --git a/mappings/net/minecraft/client/gui/ingame/CreativeInventoryGui.mapping b/mappings/net/minecraft/client/gui/ingame/CreativeInventoryGui.mapping index 6ad9a8bfe5..c8fe651b18 100644 --- a/mappings/net/minecraft/client/gui/ingame/CreativeInventoryGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/CreativeInventoryGui.mapping @@ -63,7 +63,7 @@ CLASS ctf net/minecraft/client/gui/ingame/CreativeInventoryGui ARG 2 x METHOD b setSelectedTab (Lauj;)V METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V METHOD c drawForeground (II)V diff --git a/mappings/net/minecraft/client/gui/ingame/JigsawBlockGui.mapping b/mappings/net/minecraft/client/gui/ingame/JigsawBlockGui.mapping index e8108b3abb..b6e82b292a 100644 --- a/mappings/net/minecraft/client/gui/ingame/JigsawBlockGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/JigsawBlockGui.mapping @@ -7,7 +7,7 @@ CLASS ctp net/minecraft/client/gui/ingame/JigsawBlockGui ARG 1 mouseX ARG 2 mouseY METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V METHOD f update ()V diff --git a/mappings/net/minecraft/client/gui/ingame/StructureBlockGui.mapping b/mappings/net/minecraft/client/gui/ingame/StructureBlockGui.mapping index 2cdaf5ac46..3b064718bd 100644 --- a/mappings/net/minecraft/client/gui/ingame/StructureBlockGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/StructureBlockGui.mapping @@ -77,7 +77,7 @@ CLASS ctv net/minecraft/client/gui/ingame/StructureBlockGui ARG 2 mouseY METHOD a parseLong (Ljava/lang/String;)J METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD b parseFloat (Ljava/lang/String;)F METHOD c onInitialized ()V diff --git a/mappings/net/minecraft/client/gui/menu/AddServerGui.mapping b/mappings/net/minecraft/client/gui/menu/AddServerGui.mapping index f79fb8271e..0132006f8e 100644 --- a/mappings/net/minecraft/client/gui/menu/AddServerGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/AddServerGui.mapping @@ -13,7 +13,7 @@ CLASS crp net/minecraft/client/gui/menu/AddServerGui ARG 1 mouseX ARG 2 mouseY METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V METHOD f update ()V diff --git a/mappings/net/minecraft/client/gui/menu/BackupLevelGui.mapping b/mappings/net/minecraft/client/gui/menu/BackupLevelGui.mapping index 2d924d3063..44467d9fa2 100644 --- a/mappings/net/minecraft/client/gui/menu/BackupLevelGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/BackupLevelGui.mapping @@ -39,7 +39,7 @@ CLASS cva net/minecraft/client/gui/menu/BackupLevelGui ARG 0 level ARG 1 name METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V METHOD charTyped (CI)Z diff --git a/mappings/net/minecraft/client/gui/menu/DirectConnectServerGui.mapping b/mappings/net/minecraft/client/gui/menu/DirectConnectServerGui.mapping index 078d8d9896..c3c13ed078 100644 --- a/mappings/net/minecraft/client/gui/menu/DirectConnectServerGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/DirectConnectServerGui.mapping @@ -9,7 +9,7 @@ CLASS crn net/minecraft/client/gui/menu/DirectConnectServerGui ARG 1 mouseX ARG 2 mouseY METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V METHOD charTyped (CI)Z diff --git a/mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping b/mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping index 87583e77b9..d8f988c56e 100644 --- a/mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping +++ b/mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping @@ -1,3 +1,3 @@ CLASS ctz net/minecraft/client/gui/menu/ListEntryLocalScanProgress - FIELD c game Lcnv; + FIELD c client Lcnv; METHOD a drawEntry (IIIIZF)V diff --git a/mappings/net/minecraft/client/gui/menu/ListEntryLocalServer.mapping b/mappings/net/minecraft/client/gui/menu/ListEntryLocalServer.mapping index 487c4e44cd..657c59f6fd 100644 --- a/mappings/net/minecraft/client/gui/menu/ListEntryLocalServer.mapping +++ b/mappings/net/minecraft/client/gui/menu/ListEntryLocalServer.mapping @@ -1,5 +1,5 @@ CLASS cua net/minecraft/client/gui/menu/ListEntryLocalServer - FIELD c mc Lcnv; + FIELD c client Lcnv; FIELD d entry Ldoh; FIELD e gui Lcty; FIELD f lastUpdateMillis J diff --git a/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping b/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping index 9cba09630b..e8b8888d92 100644 --- a/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping +++ b/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping @@ -4,7 +4,7 @@ CLASS cub net/minecraft/client/gui/menu/ListEntryRemoteServer FIELD e UNKNOWN_SERVER Lpy; FIELD f SERVER_SELECTION Lpy; FIELD g guiMultiplayer Lcty; - FIELD h game Lcnv; + FIELD h client Lcnv; FIELD i serverEntry Lczn; METHOD a drawEntry (IIIIZF)V METHOD a drawIcon (IILpy;)V diff --git a/mappings/net/minecraft/client/gui/menu/NewLevelPresetsGui.mapping b/mappings/net/minecraft/client/gui/menu/NewLevelPresetsGui.mapping index 85f2ca3da2..ce43eedaaa 100644 --- a/mappings/net/minecraft/client/gui/menu/NewLevelPresetsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/NewLevelPresetsGui.mapping @@ -16,7 +16,7 @@ CLASS cry net/minecraft/client/gui/menu/NewLevelPresetsGui ARG 1 mouseX ARG 2 mouseY METHOD b onScaleChanged (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD c onInitialized ()V METHOD f update ()V diff --git a/mappings/net/minecraft/client/gui/menu/RealmsGui.mapping b/mappings/net/minecraft/client/gui/menu/RealmsGui.mapping index b0681bdd74..7545a65fd9 100644 --- a/mappings/net/minecraft/client/gui/menu/RealmsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/RealmsGui.mapping @@ -15,7 +15,7 @@ CLASS cqx net/minecraft/client/gui/menu/RealmsGui ARG 1 stack ARG 2 x METHOD a initialize (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 width METHOD a wrapStringToList (Ljava/lang/String;I)Ljava/util/List; METHOD a drawTooltip (Ljava/lang/String;II)V diff --git a/mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping b/mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping index 4d7f11661f..712c4d1577 100644 --- a/mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping @@ -6,7 +6,7 @@ CLASS cri net/minecraft/client/gui/menu/ServerConnectingGui FIELD i parent Lcsb; METHOD (Lcsb;Lcnv;Lczn;)V ARG 1 parent - ARG 2 game + ARG 2 client METHOD a draw (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/menu/settings/AudioSettingsGui.mapping b/mappings/net/minecraft/client/gui/menu/settings/AudioSettingsGui.mapping index 06400f7401..25e0a42ac9 100644 --- a/mappings/net/minecraft/client/gui/menu/settings/AudioSettingsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/settings/AudioSettingsGui.mapping @@ -10,7 +10,7 @@ CLASS csf net/minecraft/client/gui/menu/settings/AudioSettingsGui ARG 0 mouseX METHOD a drawBackground (Lcnv;II)V ARG 0 game - ARG 1 mouseX + ARG 1 client ARG 2 mouseY METHOD a onPressed (Ldoq;)V ARG 0 soundLoader diff --git a/mappings/net/minecraft/client/gui/widget/AbstractListWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractListWidget.mapping index be02fc22ee..0a2c4f1ea8 100644 --- a/mappings/net/minecraft/client/gui/widget/AbstractListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AbstractListWidget.mapping @@ -1,5 +1,5 @@ CLASS cpl net/minecraft/client/gui/widget/AbstractListWidget - FIELD a game Lcnv; + FIELD a client Lcnv; FIELD f width I FIELD g height I FIELD h y1 I @@ -7,6 +7,8 @@ CLASS cpl net/minecraft/client/gui/widget/AbstractListWidget FIELD j x2 I FIELD k x1 I FIELD l entryHeight I + METHOD (Lcnv;IIIII)V + ARG 1 client METHOD a isSelected (I)Z METHOD a draw (IIF)V ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/widget/AdvancementTreeWidget.mapping b/mappings/net/minecraft/client/gui/widget/AdvancementTreeWidget.mapping index 8efa49907a..c022ea9c3c 100644 --- a/mappings/net/minecraft/client/gui/widget/AdvancementTreeWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AdvancementTreeWidget.mapping @@ -1,10 +1,10 @@ CLASS csm net/minecraft/client/gui/widget/AdvancementTreeWidget - FIELD a mc Lcnv; + FIELD a client Lcnv; FIELD g tabType Lcsn; FIELD i rootAdvancement Ln; FIELD n widgets Ljava/util/Map; METHOD (Lcnv;Lcsq;Lcsn;ILn;Lw;)V - ARG 1 mc + ARG 1 client ARG 5 rootAdvancement METHOD a drawIcon (IILdhn;)V ARG 1 x diff --git a/mappings/net/minecraft/client/gui/widget/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/widget/AdvancementWidget.mapping index 29a231fce6..4983b2157f 100644 --- a/mappings/net/minecraft/client/gui/widget/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AdvancementWidget.mapping @@ -3,12 +3,12 @@ CLASS cso net/minecraft/client/gui/widget/AdvancementWidget FIELD g tree Lcsm; FIELD h advancement Ln; FIELD i display Lw; - FIELD m mc Lcnv; + FIELD m client Lcnv; FIELD o children Ljava/util/List; FIELD q xPos I FIELD r yPos I METHOD (Lcsm;Lcnv;Ln;Lw;)V ARG 1 tree - ARG 2 mc + ARG 2 client ARG 3 advancement METHOD a getRootWidget (Ln;)Lcso; diff --git a/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping index b607f4414d..3b73618818 100644 --- a/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping @@ -25,6 +25,7 @@ CLASS cou net/minecraft/client/gui/widget/ButtonWidget METHOD a onHover (II)V METHOD a draw (IIF)V METHOD a drawBackground (Lcnv;II)V + ARG 1 client METHOD a onPressed (Ldoq;)V METHOD a getTextureId (Z)I METHOD b getWidth ()I diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 0b60315814..e436a1fc4c 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -12,6 +12,8 @@ CLASS cpg net/minecraft/client/gui/widget/EntryListWidget METHOD set (ILjava/lang/Object;)Ljava/lang/Object; ARG 0 index ARG 1 value + METHOD (Lcnv;IIIII)V + ARG 1 client METHOD a isSelected (I)Z METHOD a drawEntry (IIIIIIF)V ARG 1 x diff --git a/mappings/net/minecraft/client/gui/widget/KeyBindingListWidget.mapping b/mappings/net/minecraft/client/gui/widget/KeyBindingListWidget.mapping index bcc629bfb4..a26d826e37 100644 --- a/mappings/net/minecraft/client/gui/widget/KeyBindingListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/KeyBindingListWidget.mapping @@ -19,7 +19,7 @@ CLASS css net/minecraft/client/gui/widget/KeyBindingListWidget ARG 1 mouseX ARG 2 keyCode FIELD v gui Lcst; - FIELD w game Lcnv; + FIELD w client Lcnv; METHOD (Lcst;Lcnv;)V ARG 1 gui METHOD e getEntryWidth ()I diff --git a/mappings/net/minecraft/client/gui/widget/LevelEntryWidget.mapping b/mappings/net/minecraft/client/gui/widget/LevelEntryWidget.mapping index 595f87d6df..1be8011ef0 100644 --- a/mappings/net/minecraft/client/gui/widget/LevelEntryWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/LevelEntryWidget.mapping @@ -1,7 +1,7 @@ CLASS cvd net/minecraft/client/gui/widget/LevelEntryWidget FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d DATE_FORMAT Ljava/text/DateFormat; - FIELD g game Lcnv; + FIELD g client Lcnv; FIELD h guiLevelSelect Lcvc; FIELD i levelSummary Lcgy; FIELD j iconLocation Lpy; diff --git a/mappings/net/minecraft/client/gui/widget/OptionSliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionSliderWidget.mapping index 54ff359fb0..47ee221ba9 100644 --- a/mappings/net/minecraft/client/gui/widget/OptionSliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/OptionSliderWidget.mapping @@ -8,7 +8,7 @@ CLASS cpm net/minecraft/client/gui/widget/OptionSliderWidget METHOD a onPressed (DD)V ARG 1 mouseX METHOD a drawBackground (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 mouseX METHOD a getTextureId (Z)I METHOD b onReleased (DD)V diff --git a/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping index e92c5b8ee9..31eec89b21 100644 --- a/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping @@ -15,7 +15,7 @@ CLASS cqv net/minecraft/client/gui/widget/RealmsButtonWidget METHOD a onPressed (DD)V ARG 1 mouseX METHOD a drawBackground (Lcnv;II)V - ARG 1 game + ARG 1 client ARG 2 mouseX METHOD a setText (Ljava/lang/String;)V METHOD a getTextureId (Z)I diff --git a/mappings/net/minecraft/client/gui/widget/ServerListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ServerListWidget.mapping index b96fa8e63b..faf62601e6 100644 --- a/mappings/net/minecraft/client/gui/widget/ServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ServerListWidget.mapping @@ -6,7 +6,7 @@ CLASS cuc net/minecraft/client/gui/widget/ServerListWidget FIELD z selectedIndex I METHOD (Lcty;Lcnv;IIIII)V ARG 1 gui - ARG 2 mc + ARG 2 client ARG 3 width ARG 4 height ARG 5 y1 diff --git a/mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping b/mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping index b17379fedd..53c9d449a6 100644 --- a/mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping @@ -12,5 +12,7 @@ CLASS cpi net/minecraft/client/gui/widget/VideoSettingsListWidget ARG 0 mouseX ARG 1 mouseX ARG 2 keyCode + METHOD (Lcnv;IIIII[Lcnx$a;)V + ARG 1 client METHOD e getEntryWidth ()I METHOD f getScrollbarPosition ()I diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index 97dde62a56..b3f471d84c 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -1,11 +1,11 @@ CLASS czg net/minecraft/client/network/ClientLoginNetworkHandler FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b game Lcnv; + FIELD b client Lcnv; FIELD c parentGui Lcsb; FIELD e connection Lio; FIELD f playerProfile Lcom/mojang/authlib/GameProfile; METHOD (Lio;Lcnv;Lcsb;Ljava/util/function/Consumer;)V ARG 1 connection - ARG 2 game + ARG 2 client ARG 3 parentGui METHOD a onConnectionLost (Lja;)V diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 711ed2ea17..952cbaaa49 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -1,14 +1,16 @@ CLASS czh net/minecraft/client/network/ClientPlayNetworkHandler FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b connection Lio; - FIELD e game Lcnv; + FIELD e client Lcnv; FIELD f world Lczk; FIELD i advancementHandler Lcze; FIELD j commandSource Lczi; FIELD k tagManager Lxz; - FIELD m rand Ljava/util/Random; + FIELD m random Ljava/util/Random; FIELD n commandDispatcher Lcom/mojang/brigadier/CommandDispatcher; FIELD o recipeManager Laxz; + METHOD (Lcnv;Lcsb;Lio;Lcom/mojang/authlib/GameProfile;)V + ARG 1 client METHOD a getClientConnection ()Lio; METHOD a onConnectionLost (Lja;)V METHOD a sendPacket (Ljo;)V diff --git a/mappings/net/minecraft/client/particle/ManagerParticle.mapping b/mappings/net/minecraft/client/particle/ManagerParticle.mapping index 2ac74a4e1d..e8729099a8 100644 --- a/mappings/net/minecraft/client/particle/ManagerParticle.mapping +++ b/mappings/net/minecraft/client/particle/ManagerParticle.mapping @@ -3,7 +3,7 @@ CLASS dar net/minecraft/client/particle/ManagerParticle FIELD b PARTICLE_TEX Lpy; FIELD c particleQueues [[Ljava/util/ArrayDeque; FIELD e textureManager Ldln; - FIELD f rand Ljava/util/Random; + FIELD f random Ljava/util/Random; FIELD h newParticles Ljava/util/Queue; METHOD (Lbaq;Ldln;)V ARG 1 world diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 7aa1700591..6df17f6355 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -22,7 +22,7 @@ CLASS daq net/minecraft/client/particle/Particle FIELD m dead Z FIELD n spacingXZ F FIELD o spacingY F - FIELD p rand Ljava/util/Random; + FIELD p random Ljava/util/Random; FIELD q tileU I FIELD r tileV I FIELD u age I diff --git a/mappings/net/minecraft/client/particle/SpellParticle.mapping b/mappings/net/minecraft/client/particle/SpellParticle.mapping index 53fc90660b..1e55aa07aa 100644 --- a/mappings/net/minecraft/client/particle/SpellParticle.mapping +++ b/mappings/net/minecraft/client/particle/SpellParticle.mapping @@ -74,7 +74,7 @@ CLASS dax net/minecraft/client/particle/SpellParticle ARG 4 z ARG 5 velocityX ARG 6 velocityY - FIELD J RAND Ljava/util/Random; + FIELD J RANDOM Ljava/util/Random; METHOD (Lbaq;DDDDDD)V ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/client/player/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/player/ClientPlayerEntity.mapping index 3d7962fb96..cd03740fb3 100644 --- a/mappings/net/minecraft/client/player/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/player/ClientPlayerEntity.mapping @@ -4,7 +4,9 @@ CLASS dbn net/minecraft/client/player/ClientPlayerEntity FIELD cl clientPermissionLevel I FIELD cw serverBrand Ljava/lang/String; FIELD d networkHandler Lczh; - FIELD f game Lcnv; + FIELD f client Lcnv; + METHOD (Lcnv;Lbaq;Lczh;Lxq;Lcno;)V + ARG 1 client METHOD U_ update ()V METHOD V_ stopRiding ()V METHOD a setClientPermissionLevel (I)V diff --git a/mappings/net/minecraft/client/player/PlayerCapabilitites.mapping b/mappings/net/minecraft/client/player/PlayerCapabilitites.mapping index f07b9d59e1..b3b5d3222c 100644 --- a/mappings/net/minecraft/client/player/PlayerCapabilitites.mapping +++ b/mappings/net/minecraft/client/player/PlayerCapabilitites.mapping @@ -1,5 +1,5 @@ CLASS czj net/minecraft/client/player/PlayerCapabilitites - FIELD a game Lcnv; + FIELD a client Lcnv; FIELD b networkHandler Lczh; FIELD c currentBreakingPos Let; FIELD e currentBreakingProgress F @@ -7,7 +7,7 @@ CLASS czj net/minecraft/client/player/PlayerCapabilitites FIELD i currentGameMode Lban; FIELD j lastSelectedSlot I METHOD (Lcnv;Lczh;)V - ARG 1 game + ARG 1 client METHOD a hasStatusBars ()Z METHOD a copyAbilities (Laqj;)V METHOD a attackEntity (Laqj;Lagi;)V diff --git a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping index 824730ce9b..92e7c3121f 100644 --- a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping +++ b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping @@ -1,7 +1,7 @@ CLASS dce net/minecraft/client/render/FirstPersonRenderer FIELD a MAP_BACKGROUND_TEX Lpy; FIELD b UNDERWATER_TEX Lpy; - FIELD c game Lcnv; + FIELD c client Lcnv; FIELD d mainHand Lavs; FIELD e offHand Lavs; FIELD f equipProgressMainHand F @@ -10,6 +10,8 @@ CLASS dce net/minecraft/client/render/FirstPersonRenderer FIELD i prevEquipProgressOffHand F FIELD j renderManager Ldgs; FIELD k itemRenderer Ldhn; + METHOD (Lcnv;)V + ARG 1 client METHOD a updateHeldItems ()V METHOD a renderFirstPersonItem (F)V METHOD a rotate (FF)V diff --git a/mappings/net/minecraft/client/render/Renderer.mapping b/mappings/net/minecraft/client/render/Renderer.mapping index 79185575f1..642fc0a705 100644 --- a/mappings/net/minecraft/client/render/Renderer.mapping +++ b/mappings/net/minecraft/client/render/Renderer.mapping @@ -15,11 +15,13 @@ CLASS dcg net/minecraft/client/render/Renderer FIELD e CLOUDS_TEX Lpy; FIELD f END_SKY_TEX Lpy; FIELD g FORCEFIELD_TEX Lpy; - FIELD h game Lcnv; + FIELD h client Lcnv; FIELD i textureManager Ldln; FIELD j entityRenderDispatcher Ldgs; FIELD k world Lczk; FIELD o chunkRenderDispatcher Ldcq; + METHOD (Lcnv;)V + ARG 1 client METHOD a renderSky (F)V METHOD a markRegionForRenderUpdate (IIIZ)V METHOD a onGlobalWorldEvent (ILet;I)V diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index a2012f8df6..54d8b195a4 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -3,9 +3,11 @@ CLASS dcc net/minecraft/client/render/WorldRenderer FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d RAIN_LOC Lpy; FIELD e SNOW_LOC Lpy; - FIELD f game Lcnv; + FIELD f client Lcnv; FIELD g resourceContainer Lwc; - FIELD h rand Ljava/util/Random; + FIELD h random Ljava/util/Random; + METHOD (Lcnv;Lwc;)V + ARG 1 client METHOD a onSetCameraEntity (Lagi;)V METHOD a loadShader (Lpy;)V METHOD a onResourceReload (Lwc;)V diff --git a/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping index 72f3ae779a..6704bdbdce 100644 --- a/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping @@ -1,3 +1,5 @@ CLASS dfh net/minecraft/client/render/debug/ChunkBorderDebugRenderer - FIELD a game Lcnv; + FIELD a client Lcnv; + METHOD (Lcnv;)V + ARG 1 client METHOD a render (FJ)V diff --git a/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping index fdecfbd7e0..8eabd22fad 100644 --- a/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping @@ -1,3 +1,5 @@ CLASS dfl net/minecraft/client/render/debug/HeightmapDebugRenderer - FIELD a game Lcnv; + FIELD a client Lcnv; + METHOD (Lcnv;)V + ARG 1 client METHOD a render (FJ)V diff --git a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping index 0ae4c60dde..154123da3a 100644 --- a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping @@ -1,3 +1,5 @@ CLASS dfo net/minecraft/client/render/debug/PathfindingDebugRenderer - FIELD a game Lcnv; + FIELD a client Lcnv; + METHOD (Lcnv;)V + ARG 1 client METHOD a render (FJ)V diff --git a/mappings/net/minecraft/client/render/debug/RenderDebug.mapping b/mappings/net/minecraft/client/render/debug/RenderDebug.mapping index 6a3ecb7b03..39964d1e38 100644 --- a/mappings/net/minecraft/client/render/debug/RenderDebug.mapping +++ b/mappings/net/minecraft/client/render/debug/RenderDebug.mapping @@ -8,5 +8,7 @@ CLASS dfk net/minecraft/client/render/debug/RenderDebug FIELD n showPathfinding Z FIELD o showWater Z FIELD p showHeightmap Z + METHOD (Lcnv;)V + ARG 1 client METHOD a renderDebuggers (FJ)V METHOD b toggleShowChunkBorder ()Z diff --git a/mappings/net/minecraft/client/render/debug/WaterDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/WaterDebugRenderer.mapping index 03e46c9eee..5df8c392ec 100644 --- a/mappings/net/minecraft/client/render/debug/WaterDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/WaterDebugRenderer.mapping @@ -1,7 +1,9 @@ CLASS dfr net/minecraft/client/render/debug/WaterDebugRenderer - FIELD a game Lcnv; + FIELD a client Lcnv; FIELD b player Laqj; FIELD c playerX D FIELD d playerY D FIELD e playerZ D + METHOD (Lcnv;)V + ARG 1 client METHOD a render (FJ)V diff --git a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping index 6b36606b9f..7732921721 100644 --- a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping @@ -1,6 +1,6 @@ CLASS dhl net/minecraft/client/render/entity/ItemEntityRenderer FIELD a itemRenderer Ldhn; - FIELD f rand Ljava/util/Random; + FIELD f random Ljava/util/Random; METHOD (Ldgs;Ldhn;)V ARG 1 renderManager METHOD a getTexture (Lagi;)Lpy; diff --git a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping index d8bcab01a9..dec0a0256f 100644 --- a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping @@ -1,6 +1,6 @@ CLASS dhm net/minecraft/client/render/entity/ItemFrameEntityRenderer FIELD a MAP_BACKGROUND_TEX Lpy; - FIELD h game Lcnv; + FIELD h client Lcnv; FIELD i itemRenderer Ldhn; METHOD (Ldgs;Ldhn;)V ARG 1 renderManager diff --git a/mappings/net/minecraft/client/settings/GameSettings.mapping b/mappings/net/minecraft/client/settings/GameSettings.mapping index a152b60fc6..29b34abdc1 100644 --- a/mappings/net/minecraft/client/settings/GameSettings.mapping +++ b/mappings/net/minecraft/client/settings/GameSettings.mapping @@ -124,7 +124,7 @@ CLASS cnx net/minecraft/client/settings/GameSettings FIELD as keySaveToolbarActivator Lcnt; FIELD at keyLoadToolbarActivator Lcnt; FIELD au keysAll [Lcnt; - FIELD av game Lcnv; + FIELD av client Lcnv; FIELD aw difficulty Laez; FIELD az debugEnabled Z FIELD b NARRATOR_SETTINGS [Ljava/lang/String; @@ -153,7 +153,7 @@ CLASS cnx net/minecraft/client/settings/GameSettings FIELD y pauseOnLostFocus Z FIELD z touchscreen Z METHOD (Lcnv;Ljava/io/File;)V - ARG 1 game + ARG 1 client METHOD a load ()V METHOD a togglePlayerModelPart (Laqk;)V METHOD a setPlayerModelPart (Laqk;Z)V diff --git a/mappings/net/minecraft/client/settings/ServerList.mapping b/mappings/net/minecraft/client/settings/ServerList.mapping index 5928877724..b18f13ae41 100644 --- a/mappings/net/minecraft/client/settings/ServerList.mapping +++ b/mappings/net/minecraft/client/settings/ServerList.mapping @@ -1,7 +1,9 @@ CLASS czo net/minecraft/client/settings/ServerList FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b mc Lcnv; + FIELD b client Lcnv; FIELD c serverEntries Ljava/util/List; + METHOD (Lcnv;)V + ARG 1 client METHOD a loadFile ()V METHOD a get (I)Lczn; METHOD a swapEntries (II)V diff --git a/mappings/net/minecraft/client/sortme/AdvancementHandler.mapping b/mappings/net/minecraft/client/sortme/AdvancementHandler.mapping index eb1483580d..263ab83b4a 100644 --- a/mappings/net/minecraft/client/sortme/AdvancementHandler.mapping +++ b/mappings/net/minecraft/client/sortme/AdvancementHandler.mapping @@ -1,4 +1,7 @@ CLASS cze net/minecraft/client/sortme/AdvancementHandler FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b client Lcnv; + METHOD (Lcnv;)V + ARG 1 client METHOD a setGui (Lcze$a;)V METHOD a onAdvancements (Lmu;)V diff --git a/mappings/net/minecraft/client/sortme/ClientCommandSource.mapping b/mappings/net/minecraft/client/sortme/ClientCommandSource.mapping index ca7cda3c14..5cb8c6fd0b 100644 --- a/mappings/net/minecraft/client/sortme/ClientCommandSource.mapping +++ b/mappings/net/minecraft/client/sortme/ClientCommandSource.mapping @@ -1,6 +1,8 @@ CLASS czi net/minecraft/client/sortme/ClientCommandSource FIELD a networkHandler Lczh; - FIELD b game Lcnv; + FIELD b client Lcnv; + METHOD (Lczh;Lcnv;)V + ARG 2 client METHOD m getTeamNames ()Ljava/util/Collection; METHOD n getSoundIds ()Ljava/util/Collection; METHOD o getRecipeIds ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/client/toast/ToastManager.mapping b/mappings/net/minecraft/client/toast/ToastManager.mapping index cd3b6d4be6..dd7cae446c 100644 --- a/mappings/net/minecraft/client/toast/ToastManager.mapping +++ b/mappings/net/minecraft/client/toast/ToastManager.mapping @@ -5,9 +5,11 @@ CLASS cqb net/minecraft/client/toast/ToastManager ARG 1 instance METHOD a getInstance ()Lcqa; METHOD a draw (II)Z - FIELD a game Lcnv; + FIELD a client Lcnv; FIELD f visibleEntries [Lcqb$a; FIELD g toastQueue Ljava/util/Deque; + METHOD (Lcnv;)V + ARG 1 client METHOD a draw ()V METHOD a add (Lcqa;)V METHOD b clear ()V diff --git a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping index 79ef365a85..3d2b91a008 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping @@ -1,6 +1,8 @@ CLASS dpa net/minecraft/client/tutorial/TutorialManager - FIELD a game Lcnv; + FIELD a client Lcnv; FIELD b currentHandler Ldpb; + METHOD (Lcnv;)V + ARG 1 client METHOD a onInventoryOpened ()V METHOD a onSlotUpdate (Lavs;)V METHOD a onBlockAttacked (Lczk;Let;Lboj;F)V @@ -9,5 +11,5 @@ CLASS dpa net/minecraft/client/tutorial/TutorialManager METHOD b destroyHandler ()V METHOD c createHandler ()V METHOD d tick ()V - METHOD e getGame ()Lcnv; + METHOD e getClient ()Lcnv; METHOD f getGameMode ()Lban; diff --git a/mappings/net/minecraft/client/util/EnchantingPhrases.mapping b/mappings/net/minecraft/client/util/EnchantingPhrases.mapping index c9e0e4e9e4..9f7a725110 100644 --- a/mappings/net/minecraft/client/util/EnchantingPhrases.mapping +++ b/mappings/net/minecraft/client/util/EnchantingPhrases.mapping @@ -1,6 +1,6 @@ CLASS cti net/minecraft/client/util/EnchantingPhrases FIELD a INSTANCE Lcti; - FIELD b rand Ljava/util/Random; + FIELD b random Ljava/util/Random; FIELD c phrases [Ljava/lang/String; METHOD a getInstance ()Lcti; METHOD a setSeed (J)V diff --git a/mappings/net/minecraft/client/util/Keyboard.mapping b/mappings/net/minecraft/client/util/Keyboard.mapping index 10e77334c8..6aedb44427 100644 --- a/mappings/net/minecraft/client/util/Keyboard.mapping +++ b/mappings/net/minecraft/client/util/Keyboard.mapping @@ -1,7 +1,9 @@ CLASS cnu net/minecraft/client/util/Keyboard - FIELD a game Lcnv; + FIELD a client Lcnv; FIELD b repeatEvents Z FIELD c clipboard Lcme; + METHOD (Lcnv;)V + ARG 1 client METHOD a getClipboard ()Ljava/lang/String; METHOD a setup (J)V METHOD a onChar (JII)V diff --git a/mappings/net/minecraft/client/util/Mouse.mapping b/mappings/net/minecraft/client/util/Mouse.mapping index ef956a6807..5642e0bfaf 100644 --- a/mappings/net/minecraft/client/util/Mouse.mapping +++ b/mappings/net/minecraft/client/util/Mouse.mapping @@ -1,5 +1,7 @@ CLASS cnw net/minecraft/client/util/Mouse - FIELD a game Lcnv; + FIELD a client Lcnv; + METHOD (Lcnv;)V + ARG 1 client METHOD a setup (J)V METHOD a onMouseScroll (JDD)V ARG 1 window diff --git a/mappings/net/minecraft/client/world/ClientChunkProvider.mapping b/mappings/net/minecraft/client/world/ClientChunkProvider.mapping index 257f72e5c7..4737ccb052 100644 --- a/mappings/net/minecraft/client/world/ClientChunkProvider.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkProvider.mapping @@ -1,6 +1,6 @@ CLASS czf net/minecraft/client/world/ClientChunkProvider FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b game Lcnv; + FIELD b client Lcnv; FIELD c emptyChunk Lbqi; FIELD d lightingProvider Lcdh; FIELD i world Lbac; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index faf70bf8eb..5b37975762 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -2,7 +2,7 @@ CLASS czk net/minecraft/client/world/ClientWorld FIELD E ticksSinceLightingClient I FIELD F scoreboard Lclp; FIELD a netHandler Lczh; - FIELD d game Lcnv; + FIELD d client Lcnv; METHOD (Lczh;Lbav;Lbrc;Laez;Laek;)V ARG 1 netHandler ARG 2 levelInfo @@ -22,7 +22,7 @@ CLASS czk net/minecraft/client/world/ClientWorld ARG 2 yCenter ARG 3 zCenter ARG 4 radius - ARG 5 rand + ARG 5 random ARG 6 spawnBarrierParticles METHOD a spawnEntity (Lagi;)Z METHOD a playSound (Laqj;DDDLxf;Lxh;FF)V diff --git a/mappings/net/minecraft/container/EnchantingTableContainer.mapping b/mappings/net/minecraft/container/EnchantingTableContainer.mapping index 36d4d72ec6..37b46e3d33 100644 --- a/mappings/net/minecraft/container/EnchantingTableContainer.mapping +++ b/mappings/net/minecraft/container/EnchantingTableContainer.mapping @@ -16,7 +16,7 @@ CLASS asn net/minecraft/container/EnchantingTableContainer FIELD i enchantmentLevels [I FIELD j world Lbaq; FIELD k pos Let; - FIELD l rand Ljava/util/Random; + FIELD l random Ljava/util/Random; METHOD (Laqi;Lbaq;)V ARG 1 playerInv METHOD (Laqi;Lbaq;Let;)V diff --git a/mappings/net/minecraft/datafixers/fixes/EntityZombieVillagerTypeFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntityZombieVillagerTypeFix.mapping index b370b3fc7a..c46375edd1 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityZombieVillagerTypeFix.mapping +++ b/mappings/net/minecraft/datafixers/fixes/EntityZombieVillagerTypeFix.mapping @@ -1,4 +1,4 @@ CLASS aax net/minecraft/datafixers/fixes/EntityZombieVillagerTypeFix - FIELD a rand Ljava/util/Random; + FIELD a RANDOM Ljava/util/Random; METHOD a clampType (I)I METHOD a transform (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 275106b70c..077c893646 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -18,10 +18,12 @@ CLASS ayv net/minecraft/enchantment/EnchantmentHelper ARG 1 info METHOD a set (Ljava/util/Map;Lavs;)V METHOD a geExperienceLevel (Ljava/util/Random;IILavs;)I - ARG 0 rand + ARG 0 random ARG 1 num ARG 2 enchantmentPower ARG 3 rstack + METHOD a (Ljava/util/Random;Lavs;IZ)Lavs; + ARG 0 random METHOD b getKnockback (Lagr;)I ARG 0 entity METHOD b getLuckOfTheSea (Lavs;)I @@ -30,7 +32,7 @@ CLASS ayv net/minecraft/enchantment/EnchantmentHelper ARG 0 enchantment ARG 1 entity METHOD b getEnchantmentList (Ljava/util/Random;Lavs;IZ)Ljava/util/List; - ARG 0 rand + ARG 0 random ARG 1 stack METHOD c getFireAspect (Lagr;)I ARG 0 entity diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 2681988c3c..2662c9c604 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -9,7 +9,7 @@ CLASS agi net/minecraft/entity/Entity FIELD N prevRenderZ D FIELD O stepHeight F FIELD P noClip Z - FIELD R rand Ljava/util/Random; + FIELD R random Ljava/util/Random; FIELD S age I FIELD T insideWater Z FIELD Y fireImmune Z diff --git a/mappings/net/minecraft/entity/tracker/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping similarity index 94% rename from mappings/net/minecraft/entity/tracker/DataTracker.mapping rename to mappings/net/minecraft/entity/data/DataTracker.mapping index 769b36831a..c0933b274c 100644 --- a/mappings/net/minecraft/entity/tracker/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -1,4 +1,4 @@ -CLASS pq net/minecraft/entity/tracker/DataTracker +CLASS pq net/minecraft/entity/data/DataTracker CLASS pq$a Entry FIELD b value Ljava/lang/Object; FIELD c dirty Z diff --git a/mappings/net/minecraft/entity/tracker/TrackedData.mapping b/mappings/net/minecraft/entity/data/TrackedData.mapping similarity index 70% rename from mappings/net/minecraft/entity/tracker/TrackedData.mapping rename to mappings/net/minecraft/entity/data/TrackedData.mapping index 2bf4020c6c..5dd4f47c0e 100644 --- a/mappings/net/minecraft/entity/tracker/TrackedData.mapping +++ b/mappings/net/minecraft/entity/data/TrackedData.mapping @@ -1,4 +1,4 @@ -CLASS pn net/minecraft/entity/tracker/TrackedData +CLASS pn net/minecraft/entity/data/TrackedData FIELD a id I FIELD b dataType Lpo; METHOD (ILpo;)V diff --git a/mappings/net/minecraft/entity/tracker/TrackedDataHandler.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping similarity index 73% rename from mappings/net/minecraft/entity/tracker/TrackedDataHandler.mapping rename to mappings/net/minecraft/entity/data/TrackedDataHandler.mapping index 3e2a0b8ffa..de545b0fb7 100644 --- a/mappings/net/minecraft/entity/tracker/TrackedDataHandler.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping @@ -1,4 +1,4 @@ -CLASS po net/minecraft/entity/tracker/TrackedDataHandler +CLASS po net/minecraft/entity/data/TrackedDataHandler METHOD a create (I)Lpn; METHOD a read (Liq;)Ljava/lang/Object; METHOD a write (Liq;Ljava/lang/Object;)V diff --git a/mappings/net/minecraft/entity/tracker/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping similarity index 99% rename from mappings/net/minecraft/entity/tracker/TrackedDataHandlerRegistry.mapping rename to mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 081c4f702b..ec111813ce 100644 --- a/mappings/net/minecraft/entity/tracker/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -1,4 +1,4 @@ -CLASS pp net/minecraft/entity/tracker/TrackedDataHandlerRegistry +CLASS pp net/minecraft/entity/data/TrackedDataHandlerRegistry CLASS pp$1 METHOD a create (I)Lpn; ARG 0 id diff --git a/mappings/net/minecraft/entity/player/PlayerAbilities.mapping b/mappings/net/minecraft/entity/player/PlayerAbilities.mapping index 03e15f64b3..e039817ba3 100644 --- a/mappings/net/minecraft/entity/player/PlayerAbilities.mapping +++ b/mappings/net/minecraft/entity/player/PlayerAbilities.mapping @@ -4,9 +4,13 @@ CLASS aqh net/minecraft/entity/player/PlayerAbilities FIELD c allowFlying Z FIELD d creativeMode Z FIELD e allowModifyWorld Z + FIELD f flySpeed D FIELD g walkSpeed F METHOD a getFlySpeed ()F + METHOD a setFlySpeed (D)V + ARG 1 flySpeed METHOD a setWalkSpeed (F)V + ARG 1 walkSpeed METHOD a serialize (Lhp;)V METHOD b getWalkSpeed ()F METHOD b deserialize (Lhp;)V diff --git a/mappings/net/minecraft/entity/tracker/EntityTracker.mapping b/mappings/net/minecraft/entity/tracker/EntityTracker.mapping new file mode 100644 index 0000000000..c7c7838445 --- /dev/null +++ b/mappings/net/minecraft/entity/tracker/EntityTracker.mapping @@ -0,0 +1,18 @@ +CLASS ue net/minecraft/entity/tracker/EntityTracker + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b world Luj; + METHOD (Luj;)V + ARG 1 world + METHOD a toFixedPoint (D)J + METHOD a track (Lagi;)V + ARG 1 entity + METHOD a (Lagi;DDD)V + ARG 0 entity + ARG 1 x + ARG 3 y + ARG 5 z + METHOD a track (Lagi;II)V + METHOD a track (Lagi;IIZ)V + ARG 2 trackingRange + ARG 3 tickInterval + METHOD b untrack (Lagi;)V diff --git a/mappings/uq.mapping b/mappings/net/minecraft/entity/tracker/TrackedEntity.mapping similarity index 84% rename from mappings/uq.mapping rename to mappings/net/minecraft/entity/tracker/TrackedEntity.mapping index 26cd5e49a5..beca9da4b6 100644 --- a/mappings/uq.mapping +++ b/mappings/net/minecraft/entity/tracker/TrackedEntity.mapping @@ -1,4 +1,4 @@ -CLASS uq +CLASS uq net/minecraft/entity/tracker/TrackedEntity FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d entity Lagi; FIELD e trackingRange I diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index a72e0fcdc1..034bb4d0b9 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -31,7 +31,7 @@ CLASS avn net/minecraft/item/Item FIELD f BLOCK_ITEM_MAP Ljava/util/Map; FIELD g MODIFIER_DAMAGE Ljava/util/UUID; FIELD h MODIFIER_SWING_SPEED Ljava/util/UUID; - FIELD i rand Ljava/util/Random; + FIELD i random Ljava/util/Random; FIELD j creativeTab Lauj; FIELD k PROPERTIES Ljava/util/Map; FIELD l rarity Lawf; diff --git a/mappings/net/minecraft/predicate/DamagePredicate.mapping b/mappings/net/minecraft/predicate/DamagePredicate.mapping new file mode 100644 index 0000000000..c88cca06b5 --- /dev/null +++ b/mappings/net/minecraft/predicate/DamagePredicate.mapping @@ -0,0 +1,28 @@ +CLASS ai net/minecraft/predicate/DamagePredicate + CLASS ai$a Builder + FIELD a dealt Lbf$c; + FIELD b taken Lbf$c; + FIELD c sourceEntity Las; + FIELD d blocked Ljava/lang/Boolean; + FIELD e type Laj; + METHOD a create ()Lai$a; + METHOD a type (Laj$a;)Lai$a; + ARG 1 type + METHOD a blocked (Ljava/lang/Boolean;)Lai$a; + ARG 1 blocked + METHOD b build ()Lai; + FIELD a ANY Lai; + FIELD b dealt Lbf$c; + FIELD c taken Lbf$c; + FIELD d sourceEntity Las; + FIELD e blocked Ljava/lang/Boolean; + FIELD f type Laj; + METHOD (Lbf$c;Lbf$c;Las;Ljava/lang/Boolean;Laj;)V + ARG 1 dealt + ARG 2 taken + ARG 3 sourceEntity + ARG 4 blocked + ARG 5 type + METHOD a serialize ()Lcom/google/gson/JsonElement; + METHOD a deserialize (Lcom/google/gson/JsonElement;)Lai; + METHOD a test (Lul;Lafr;FFZ)Z diff --git a/mappings/net/minecraft/predicate/entity/DamagePredicate.mapping b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping similarity index 95% rename from mappings/net/minecraft/predicate/entity/DamagePredicate.mapping rename to mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping index 68606fd752..a3ca0ad6db 100644 --- a/mappings/net/minecraft/predicate/entity/DamagePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping @@ -1,4 +1,4 @@ -CLASS aj net/minecraft/predicate/entity/DamagePredicate +CLASS aj net/minecraft/predicate/entity/DamageSourcePredicate CLASS aj$a Builder FIELD a isProjectile Ljava/lang/Boolean; FIELD b isExplosion Ljava/lang/Boolean; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 9e9ae366e9..d9f45309f7 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -42,7 +42,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD l profiler Laeg; FIELD m networkIO Luy; FIELD n metadata Lpi; - FIELD o rand Ljava/util/Random; + FIELD o random Ljava/util/Random; FIELD q serverIp Ljava/lang/String; FIELD r serverPort I FIELD s worlds Ljava/util/Map; diff --git a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping similarity index 96% rename from mappings/net/minecraft/server/config/ServerConfigurationManager.mapping rename to mappings/net/minecraft/server/PlayerManager.mapping index 1ae1d1902d..cdba386ebd 100644 --- a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -1,4 +1,4 @@ -CLASS wm net/minecraft/server/config/ServerConfigurationManager +CLASS wm net/minecraft/server/PlayerManager CLASS wm$1 METHOD a (Lbpu;D)V ARG 0 border @@ -43,6 +43,8 @@ CLASS wm net/minecraft/server/config/ServerConfigurationManager FIELD t gameMode Lban; FIELD u cheatsAllowed Z FIELD v latencyUpdateTimer I + METHOD (Lnet/minecraft/server/MinecraftServer;I)V + ARG 1 server METHOD a reloadWhitelist ()V METHOD a setViewDistance (I)V METHOD a sendToAround (Laqj;DDDDLbrc;Ljo;)V diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping b/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping similarity index 86% rename from mappings/net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping rename to mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping index 317e54edb1..235bb2b7a1 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping @@ -1,4 +1,6 @@ -CLASS tm net/minecraft/server/dedicated/DedicatedServerConfigurationManager +CLASS tm net/minecraft/server/dedicated/DedicatedPlayerManager + METHOD (Ltn;)V + ARG 1 server METHOD A loadUserBanList ()V METHOD B loadOpList ()V METHOD C saveOpList ()V diff --git a/mappings/net/minecraft/server/IntegratedServerConfigurationManager.mapping b/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping similarity index 71% rename from mappings/net/minecraft/server/IntegratedServerConfigurationManager.mapping rename to mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping index dba9d87181..6afc071bac 100644 --- a/mappings/net/minecraft/server/IntegratedServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping @@ -1,4 +1,4 @@ -CLASS dof net/minecraft/server/IntegratedServerConfigurationManager +CLASS dof net/minecraft/server/integrated/IntegratedPlayerManager FIELD f userData Lhp; METHOD b getServer ()Ldog; METHOD b savePlayerData (Lul;)V diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping similarity index 92% rename from mappings/net/minecraft/server/IntegratedServer.mapping rename to mappings/net/minecraft/server/integrated/IntegratedServer.mapping index 6d6bddafd1..616c12051c 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -1,11 +1,11 @@ -CLASS dog net/minecraft/server/IntegratedServer +CLASS dog net/minecraft/server/integrated/IntegratedServer FIELD g LOGGER Lorg/apache/logging/log4j/Logger; - FIELD h game Lcnv; + FIELD h client Lcnv; FIELD i levelInfo Lbav; FIELD k lanPort I FIELD l lanPinger Ldoj; METHOD (Lcnv;Ljava/lang/String;Ljava/lang/String;Lbav;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lwi;)V - ARG 1 game + ARG 1 client ARG 2 levelName ARG 3 displayName ARG 4 levelInfo diff --git a/mappings/net/minecraft/sortme/structures/DesertTempleGenerator.mapping b/mappings/net/minecraft/sortme/structures/DesertTempleGenerator.mapping index be73f5b104..7306d3bda3 100644 --- a/mappings/net/minecraft/sortme/structures/DesertTempleGenerator.mapping +++ b/mappings/net/minecraft/sortme/structures/DesertTempleGenerator.mapping @@ -1,2 +1,4 @@ CLASS cai net/minecraft/sortme/structures/DesertTempleGenerator + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V diff --git a/mappings/net/minecraft/sortme/structures/IglooGenerator.mapping b/mappings/net/minecraft/sortme/structures/IglooGenerator.mapping index dc4db762c3..2c85e5a165 100644 --- a/mappings/net/minecraft/sortme/structures/IglooGenerator.mapping +++ b/mappings/net/minecraft/sortme/structures/IglooGenerator.mapping @@ -1,3 +1,5 @@ CLASS cak net/minecraft/sortme/structures/IglooGenerator CLASS cak$a + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V diff --git a/mappings/net/minecraft/sortme/structures/JungleTempleGenerator.mapping b/mappings/net/minecraft/sortme/structures/JungleTempleGenerator.mapping index e96faedb4c..f257c5a246 100644 --- a/mappings/net/minecraft/sortme/structures/JungleTempleGenerator.mapping +++ b/mappings/net/minecraft/sortme/structures/JungleTempleGenerator.mapping @@ -1,6 +1,8 @@ CLASS cal net/minecraft/sortme/structures/JungleTempleGenerator CLASS cal$a METHOD a (Ljava/util/Random;IIIZ)V - ARG 1 rand + ARG 1 random ARG 2 x + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V diff --git a/mappings/net/minecraft/sortme/structures/MineshaftGenerator.mapping b/mappings/net/minecraft/sortme/structures/MineshaftGenerator.mapping index d69efc98e0..332e74252c 100644 --- a/mappings/net/minecraft/sortme/structures/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/sortme/structures/MineshaftGenerator.mapping @@ -1,9 +1,17 @@ CLASS can net/minecraft/sortme/structures/MineshaftGenerator CLASS can$a MineshaftCorridor METHOD a (Lbar;Lcag;Ljava/util/Random;IIILpy;)Z - ARG 3 rand + ARG 3 random + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V CLASS can$b MineshaftCrossing + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V METHOD a (Ljava/util/List;Ljava/util/Random;IIILey;)Lcag; ARG 5 facing @@ -11,10 +19,24 @@ CLASS can net/minecraft/sortme/structures/MineshaftGenerator FIELD a mineshaftType Lbvf$b; METHOD a toNbt (Lhp;)V CLASS can$d MineshaftRoom + METHOD (ILjava/util/Random;IILbvf$b;)V + ARG 2 random METHOD a translate (III)V ARG 1 x ARG 2 y + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V CLASS can$e MineshaftStairs + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random + METHOD a (Ljava/util/List;Ljava/util/Random;IIILey;)Lcag; + ARG 1 random METHOD a (Ljava/util/List;Ljava/util/Random;IIILey;ILbvf$b;)Lcan$c; - ARG 1 rand + ARG 1 random + METHOD b (Lcba;Ljava/util/List;Ljava/util/Random;IIILey;I)Lcan$c; + ARG 2 random diff --git a/mappings/net/minecraft/sortme/structures/NetherFortressGenerator.mapping b/mappings/net/minecraft/sortme/structures/NetherFortressGenerator.mapping index 6bee9d0a13..dc2aab03dd 100644 --- a/mappings/net/minecraft/sortme/structures/NetherFortressGenerator.mapping +++ b/mappings/net/minecraft/sortme/structures/NetherFortressGenerator.mapping @@ -1,11 +1,73 @@ CLASS cao net/minecraft/sortme/structures/NetherFortressGenerator + CLASS cao$a + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random CLASS cao$b + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V + CLASS cao$c + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random + CLASS cao$d + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random + CLASS cao$e + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random + CLASS cao$f + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random + CLASS cao$g + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random CLASS cao$h + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V + CLASS cao$i + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random CLASS cao$j + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V + CLASS cao$k + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random CLASS cao$l + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V CLASS cao$m METHOD a toNbt (Lhp;)V + CLASS cao$o + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random + CLASS cao$p + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random diff --git a/mappings/net/minecraft/sortme/structures/OceanTempleGenerator.mapping b/mappings/net/minecraft/sortme/structures/OceanTempleGenerator.mapping index 76ea0800b2..c52713fc4d 100644 --- a/mappings/net/minecraft/sortme/structures/OceanTempleGenerator.mapping +++ b/mappings/net/minecraft/sortme/structures/OceanTempleGenerator.mapping @@ -1,3 +1,5 @@ CLASS car net/minecraft/sortme/structures/OceanTempleGenerator CLASS car$a + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V diff --git a/mappings/net/minecraft/sortme/structures/ShipwreckGenerator.mapping b/mappings/net/minecraft/sortme/structures/ShipwreckGenerator.mapping index d093ee6f04..3896377c7c 100644 --- a/mappings/net/minecraft/sortme/structures/ShipwreckGenerator.mapping +++ b/mappings/net/minecraft/sortme/structures/ShipwreckGenerator.mapping @@ -1,3 +1,5 @@ CLASS cav net/minecraft/sortme/structures/ShipwreckGenerator CLASS cav$a + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V diff --git a/mappings/net/minecraft/sortme/structures/StrongholdGenerator.mapping b/mappings/net/minecraft/sortme/structures/StrongholdGenerator.mapping index 261d29fa57..8e78a609dd 100644 --- a/mappings/net/minecraft/sortme/structures/StrongholdGenerator.mapping +++ b/mappings/net/minecraft/sortme/structures/StrongholdGenerator.mapping @@ -1,23 +1,71 @@ CLASS caw net/minecraft/sortme/structures/StrongholdGenerator CLASS caw$a + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V CLASS caw$b + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V CLASS caw$c + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V + CLASS caw$d + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random CLASS caw$e + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V CLASS caw$g + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V + CLASS caw$h + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random + CLASS caw$i + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random CLASS caw$j + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V CLASS caw$k METHOD a (Ljava/util/Random;IIIZ)V - ARG 1 rand + ARG 1 random ARG 2 x CLASS caw$l + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V CLASS caw$n + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V + CLASS caw$o + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random CLASS caw$p METHOD a toNbt (Lhp;)V diff --git a/mappings/net/minecraft/sortme/structures/SwampHutGenerator.mapping b/mappings/net/minecraft/sortme/structures/SwampHutGenerator.mapping index 4e6a6c926b..9f30fcb56a 100644 --- a/mappings/net/minecraft/sortme/structures/SwampHutGenerator.mapping +++ b/mappings/net/minecraft/sortme/structures/SwampHutGenerator.mapping @@ -1,2 +1,4 @@ CLASS cbc net/minecraft/sortme/structures/SwampHutGenerator + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V diff --git a/mappings/net/minecraft/sortme/structures/VillageGenerator.mapping b/mappings/net/minecraft/sortme/structures/VillageGenerator.mapping index dd0a7fa6e1..9e2063deb8 100644 --- a/mappings/net/minecraft/sortme/structures/VillageGenerator.mapping +++ b/mappings/net/minecraft/sortme/structures/VillageGenerator.mapping @@ -1,16 +1,45 @@ CLASS cbe net/minecraft/sortme/structures/VillageGenerator + CLASS cbe$a + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random CLASS cbe$b + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V CLASS cbe$c + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V + CLASS cbe$d + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + CLASS cbe$f + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random CLASS cbe$g + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V CLASS cbe$h + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V + CLASS cbe$i + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random CLASS cbe$j + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random METHOD a toNbt (Lhp;)V CLASS cbe$l + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random METHOD a toNbt (Lhp;)V + CLASS cbe$m + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random CLASS cbe$n Type FIELD a OAK Lcbe$n; FIELD b SANDSTONE Lcbe$n; @@ -37,3 +66,8 @@ CLASS cbe net/minecraft/sortme/structures/VillageGenerator ARG 3 x ARG 4 y ARG 5 z + CLASS cbe$p + METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z + ARG 2 random + METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V + ARG 3 random diff --git a/mappings/net/minecraft/util/WeightedPicker.mapping b/mappings/net/minecraft/util/WeightedPicker.mapping index 3caffef08c..8f3e6addf1 100644 --- a/mappings/net/minecraft/util/WeightedPicker.mapping +++ b/mappings/net/minecraft/util/WeightedPicker.mapping @@ -9,9 +9,9 @@ CLASS yw net/minecraft/util/WeightedPicker ARG 0 list ARG 1 pos METHOD a getRandom (Ljava/util/Random;Ljava/util/List;)Lyw$a; - ARG 0 rand + ARG 0 random ARG 1 list METHOD a getRandom (Ljava/util/Random;Ljava/util/List;I)Lyw$a; - ARG 0 rand + ARG 0 random ARG 1 list ARG 2 weightSum diff --git a/mappings/net/minecraft/util/math/Facing.mapping b/mappings/net/minecraft/util/math/Facing.mapping index 9d99766cbe..f837e90e6d 100644 --- a/mappings/net/minecraft/util/math/Facing.mapping +++ b/mappings/net/minecraft/util/math/Facing.mapping @@ -53,6 +53,8 @@ CLASS ey net/minecraft/util/math/Facing ARG 0 facing METHOD a fromName (Ljava/lang/String;)Ley$a; ARG 0 name + METHOD a (Ljava/util/Random;)Ley$a; + ARG 0 random METHOD b isVertical ()Z METHOD c isHorizontal ()Z METHOD d ()Ley$c; @@ -72,6 +74,7 @@ CLASS ey net/minecraft/util/math/Facing ARG 0 facing METHOD a random (Ljava/util/Random;)Ley; ARG 0 rand + ARG 1 random FIELD a DOWN Ley; FIELD b UP Ley; FIELD c NORTH Ley; @@ -118,7 +121,7 @@ CLASS ey net/minecraft/util/math/Facing METHOD a byName (Ljava/lang/String;)Ley; ARG 0 name METHOD a random (Ljava/util/Random;)Ley; - ARG 0 rand + ARG 0 random METHOD b getHorizontal ()I METHOD b fromHorizontal (I)Ley; ARG 0 value diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 3b593d4aca..6965ab0fb0 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -1,7 +1,7 @@ CLASS yp net/minecraft/util/math/MathHelper FIELD a SQUARE_ROOT_OF_TWO F FIELD b sinTable [F - FIELD c rand Ljava/util/Random; + FIELD c RANDOM Ljava/util/Random; FIELD d MULTIPLY_DE_BRUJIN_BIT_POSITION [I FIELD e SMALLEST_FRACTION_FREE_DOUBLE D FIELD f asinTable [D @@ -40,16 +40,16 @@ CLASS yp net/minecraft/util/math/MathHelper ARG 1 fallback ARG 2 minimum METHOD a randomUuid (Ljava/util/Random;)Ljava/util/UUID; - ARG 0 rand + ARG 0 random METHOD a nextDouble (Ljava/util/Random;DD)D - ARG 0 rand + ARG 0 random ARG 1 min METHOD a nextFloat (Ljava/util/Random;FF)F - ARG 0 rand + ARG 0 random ARG 1 min ARG 2 max METHOD a nextInt (Ljava/util/Random;II)I - ARG 0 rand + ARG 0 random ARG 1 min ARG 2 max METHOD a average ([J)D diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 8bf73737c5..272f9eeff8 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -23,7 +23,7 @@ CLASS baq net/minecraft/world/World FIELD p rainGradient F FIELD q thunderGradientPrev F FIELD r thunderGradient F - FIELD s rand Ljava/util/Random; + FIELD s random Ljava/util/Random; FIELD t dimension Lbrb; FIELD u pathingCoordinator Laku; FIELD v listeners Ljava/util/List; diff --git a/mappings/bqd.mapping b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping similarity index 83% rename from mappings/bqd.mapping rename to mappings/net/minecraft/world/chunk/EmptyChunk.mapping index 25830e05f2..08b04d8ec4 100644 --- a/mappings/bqd.mapping +++ b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping @@ -1,4 +1,9 @@ -CLASS bqd +CLASS bqd net/minecraft/world/chunk/EmptyChunk + FIELD b BIOMES [Lbbp; + METHOD (Lbaq;II)V + ARG 1 world + ARG 2 x + ARG 3 z METHOD a addEntity (Lagi;)V METHOD a remove (Lagi;I)V ARG 1 entity diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index e89b4deb4e..d6bdfbc669 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -1,7 +1,7 @@ CLASS baj net/minecraft/world/explosion/Explosion FIELD a createFire Z FIELD b destroyBlocks Z - FIELD c rand Ljava/util/Random; + FIELD c random Ljava/util/Random; FIELD d world Lbaq; FIELD e x D FIELD f y D diff --git a/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping index ac1028c77d..5fb2bd82e7 100644 --- a/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping @@ -2,3 +2,4 @@ CLASS byf net/minecraft/world/gen/decorator/CarvingMaskDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/ChanceHeightmapDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ChanceHeightmapDecorator.mapping index 2ef14d99a0..d2699c3de8 100644 --- a/mappings/net/minecraft/world/gen/decorator/ChanceHeightmapDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ChanceHeightmapDecorator.mapping @@ -2,3 +2,4 @@ CLASS byg net/minecraft/world/gen/decorator/ChanceHeightmapDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/ChanceHeightmapDoubleDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ChanceHeightmapDoubleDecorator.mapping index 03695fd5d1..c4b1dfc147 100644 --- a/mappings/net/minecraft/world/gen/decorator/ChanceHeightmapDoubleDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ChanceHeightmapDoubleDecorator.mapping @@ -2,3 +2,4 @@ CLASS byh net/minecraft/world/gen/decorator/ChanceHeightmapDoubleDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/ChanceTopSolidHeightmapDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ChanceTopSolidHeightmapDecorator.mapping index cebebe68a7..175c9f6597 100644 --- a/mappings/net/minecraft/world/gen/decorator/ChanceTopSolidHeightmapDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ChanceTopSolidHeightmapDecorator.mapping @@ -2,3 +2,4 @@ CLASS byj net/minecraft/world/gen/decorator/ChanceTopSolidHeightmapDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/ChorusPlantDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ChorusPlantDecorator.mapping index ba9ba3e6b6..a0dba587ef 100644 --- a/mappings/net/minecraft/world/gen/decorator/ChorusPlantDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ChorusPlantDecorator.mapping @@ -2,3 +2,4 @@ CLASS byk net/minecraft/world/gen/decorator/ChorusPlantDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping index a5bca45145..a8be1bf098 100644 --- a/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping @@ -8,7 +8,7 @@ CLASS byl net/minecraft/world/gen/decorator/ConfiguredDecorator METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbsy;)Z ARG 1 world ARG 2 generator - ARG 3 rand + ARG 3 random ARG 4 pos METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbyl; ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/CountChanceHeightmapDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountChanceHeightmapDecorator.mapping index fe0f786305..8ad6e07760 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountChanceHeightmapDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountChanceHeightmapDecorator.mapping @@ -2,3 +2,4 @@ CLASS byn net/minecraft/world/gen/decorator/CountChanceHeightmapDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/CountChanceHeightmapDoubleDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountChanceHeightmapDoubleDecorator.mapping index 8b1965f7b0..ec9d8f8cf6 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountChanceHeightmapDoubleDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountChanceHeightmapDoubleDecorator.mapping @@ -2,3 +2,4 @@ CLASS byo net/minecraft/world/gen/decorator/CountChanceHeightmapDoubleDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/CountExtraHeightmapDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountExtraHeightmapDecorator.mapping index 5e020930a8..9bcbe499c4 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountExtraHeightmapDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountExtraHeightmapDecorator.mapping @@ -2,3 +2,4 @@ CLASS byw net/minecraft/world/gen/decorator/CountExtraHeightmapDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/CountHeight64Decorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountHeight64Decorator.mapping index 37e565e770..977f62f77b 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountHeight64Decorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountHeight64Decorator.mapping @@ -2,3 +2,4 @@ CLASS byr net/minecraft/world/gen/decorator/CountHeight64Decorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/CountHeightmap32Decorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountHeightmap32Decorator.mapping index c67a04db44..928306a184 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountHeightmap32Decorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountHeightmap32Decorator.mapping @@ -2,3 +2,4 @@ CLASS bys net/minecraft/world/gen/decorator/CountHeightmap32Decorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/CountHeightmapDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountHeightmapDecorator.mapping index ee61b18fd9..ccfe990c9f 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountHeightmapDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountHeightmapDecorator.mapping @@ -2,3 +2,4 @@ CLASS byt net/minecraft/world/gen/decorator/CountHeightmapDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/CountHeightmapDoubleDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountHeightmapDoubleDecorator.mapping index 01a18ce8c2..9548c290bd 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountHeightmapDoubleDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountHeightmapDoubleDecorator.mapping @@ -2,3 +2,4 @@ CLASS byq net/minecraft/world/gen/decorator/CountHeightmapDoubleDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/CountTopSolidDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountTopSolidDecorator.mapping index 0ade2ea188..a8862a1d65 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountTopSolidDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountTopSolidDecorator.mapping @@ -2,3 +2,4 @@ CLASS byu net/minecraft/world/gen/decorator/CountTopSolidDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/DarkOakTreeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/DarkOakTreeDecorator.mapping index ebb1b1207e..59dd6c3e86 100644 --- a/mappings/net/minecraft/world/gen/decorator/DarkOakTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/DarkOakTreeDecorator.mapping @@ -2,3 +2,4 @@ CLASS byx net/minecraft/world/gen/decorator/DarkOakTreeDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping index 80448064de..e5628ff00c 100644 --- a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping @@ -37,10 +37,12 @@ CLASS bzj net/minecraft/world/gen/decorator/Decorator FIELD x TOP_SOLID_HEIGHTMAP_NOISE_BIASED Lbzj; FIELD y CARVING_MASK Lbzj; FIELD z FOREST_ROCK Lbzj; + METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; + ARG 3 random METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbtk;Lbsy;)Z ARG 1 world ARG 2 generator - ARG 3 rand + ARG 3 random ARG 4 pos ARG 5 decoratorConfig METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbtk; diff --git a/mappings/net/minecraft/world/gen/decorator/DungeonsDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/DungeonsDecorator.mapping index 573fd7bb77..dca862a91a 100644 --- a/mappings/net/minecraft/world/gen/decorator/DungeonsDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/DungeonsDecorator.mapping @@ -2,3 +2,4 @@ CLASS bzq net/minecraft/world/gen/decorator/DungeonsDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/EndGatewayDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/EndGatewayDecorator.mapping index f8c881bd75..54fbc7fa5a 100644 --- a/mappings/net/minecraft/world/gen/decorator/EndGatewayDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/EndGatewayDecorator.mapping @@ -2,3 +2,4 @@ CLASS bzh net/minecraft/world/gen/decorator/EndGatewayDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/ForestRockDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ForestRockDecorator.mapping index 8ddde335b7..44dbf3ab18 100644 --- a/mappings/net/minecraft/world/gen/decorator/ForestRockDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ForestRockDecorator.mapping @@ -2,3 +2,4 @@ CLASS bzk net/minecraft/world/gen/decorator/ForestRockDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/HeightmapDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/HeightmapDecorator.mapping index 90528d0fd3..a4dcc5d09a 100644 --- a/mappings/net/minecraft/world/gen/decorator/HeightmapDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/HeightmapDecorator.mapping @@ -2,3 +2,4 @@ CLASS bzv net/minecraft/world/gen/decorator/HeightmapDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/HeightmapNoiseBiasedDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/HeightmapNoiseBiasedDecorator.mapping index a278d1e329..034d198c27 100644 --- a/mappings/net/minecraft/world/gen/decorator/HeightmapNoiseBiasedDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/HeightmapNoiseBiasedDecorator.mapping @@ -2,3 +2,4 @@ CLASS bzw net/minecraft/world/gen/decorator/HeightmapNoiseBiasedDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/HeightmapRangeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/HeightmapRangeDecorator.mapping index b48c689b60..b571107e34 100644 --- a/mappings/net/minecraft/world/gen/decorator/HeightmapRangeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/HeightmapRangeDecorator.mapping @@ -2,3 +2,4 @@ CLASS bzx net/minecraft/world/gen/decorator/HeightmapRangeDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/IcebergDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/IcebergDecorator.mapping index c3a739a7d8..3d5a35edfa 100644 --- a/mappings/net/minecraft/world/gen/decorator/IcebergDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/IcebergDecorator.mapping @@ -2,3 +2,4 @@ CLASS bzl net/minecraft/world/gen/decorator/IcebergDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/LakeLakeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/LakeLakeDecorator.mapping index 5ed0d8e538..c11ce4e699 100644 --- a/mappings/net/minecraft/world/gen/decorator/LakeLakeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/LakeLakeDecorator.mapping @@ -2,3 +2,4 @@ CLASS bzn net/minecraft/world/gen/decorator/LakeLakeDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/MagmaDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/MagmaDecorator.mapping index 79c4480160..35a1d43461 100644 --- a/mappings/net/minecraft/world/gen/decorator/MagmaDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/MagmaDecorator.mapping @@ -2,3 +2,4 @@ CLASS cac net/minecraft/world/gen/decorator/MagmaDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/NoiseHeightmap32Decorator.mapping b/mappings/net/minecraft/world/gen/decorator/NoiseHeightmap32Decorator.mapping index 875e5ac43a..7787fcb1ce 100644 --- a/mappings/net/minecraft/world/gen/decorator/NoiseHeightmap32Decorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/NoiseHeightmap32Decorator.mapping @@ -2,3 +2,4 @@ CLASS bzr net/minecraft/world/gen/decorator/NoiseHeightmap32Decorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/NoiseHeightmapDoubleDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/NoiseHeightmapDoubleDecorator.mapping index 2b928390f2..2a6d588cfe 100644 --- a/mappings/net/minecraft/world/gen/decorator/NoiseHeightmapDoubleDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/NoiseHeightmapDoubleDecorator.mapping @@ -2,3 +2,4 @@ CLASS bzs net/minecraft/world/gen/decorator/NoiseHeightmapDoubleDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/decorator/WaterLakeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/WaterLakeDecorator.mapping index b294c22ec5..1878a5d278 100644 --- a/mappings/net/minecraft/world/gen/decorator/WaterLakeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/WaterLakeDecorator.mapping @@ -2,3 +2,4 @@ CLASS bzo net/minecraft/world/gen/decorator/WaterLakeDecorator METHOD a (Lbar;Lbpx;Ljava/util/Random;Lbtk;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/BambooFeature.mapping b/mappings/net/minecraft/world/gen/feature/BambooFeature.mapping index e804c9030b..e94eb46c04 100644 --- a/mappings/net/minecraft/world/gen/feature/BambooFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BambooFeature.mapping @@ -1,4 +1,5 @@ CLASS bsl net/minecraft/world/gen/feature/BambooFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbvx;)Z diff --git a/mappings/net/minecraft/world/gen/feature/BlueIceFeature.mapping b/mappings/net/minecraft/world/gen/feature/BlueIceFeature.mapping index 952a2553e7..dd7a3caec2 100644 --- a/mappings/net/minecraft/world/gen/feature/BlueIceFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BlueIceFeature.mapping @@ -1,3 +1,4 @@ CLASS bsq net/minecraft/world/gen/feature/BlueIceFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/BonusChestFeature.mapping b/mappings/net/minecraft/world/gen/feature/BonusChestFeature.mapping index 80dbfcec2e..f0e1286b76 100644 --- a/mappings/net/minecraft/world/gen/feature/BonusChestFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BonusChestFeature.mapping @@ -1,3 +1,4 @@ CLASS bsr net/minecraft/world/gen/feature/BonusChestFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/BushFeature.mapping b/mappings/net/minecraft/world/gen/feature/BushFeature.mapping index 1115bf14b5..4dda03ad1f 100644 --- a/mappings/net/minecraft/world/gen/feature/BushFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BushFeature.mapping @@ -1,3 +1,4 @@ CLASS bsv net/minecraft/world/gen/feature/BushFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/CactusFeature.mapping b/mappings/net/minecraft/world/gen/feature/CactusFeature.mapping index d2394ad9df..d87f31ee36 100644 --- a/mappings/net/minecraft/world/gen/feature/CactusFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/CactusFeature.mapping @@ -1,3 +1,4 @@ CLASS bsw net/minecraft/world/gen/feature/CactusFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/ChorusPlantFeature.mapping b/mappings/net/minecraft/world/gen/feature/ChorusPlantFeature.mapping index 884499d478..c276b323c3 100644 --- a/mappings/net/minecraft/world/gen/feature/ChorusPlantFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ChorusPlantFeature.mapping @@ -1,3 +1,4 @@ CLASS bsx net/minecraft/world/gen/feature/ChorusPlantFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index f5fb3c6659..b33c055e60 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -8,7 +8,7 @@ CLASS bsy net/minecraft/world/gen/feature/ConfiguredFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;)Z ARG 1 world ARG 2 generator - ARG 3 rand + ARG 3 random METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbsy; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; diff --git a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping index bbc9e56c9e..0a9fae4d48 100644 --- a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping @@ -1,3 +1,4 @@ CLASS bta net/minecraft/world/gen/feature/CoralFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/DeadBushFeature.mapping b/mappings/net/minecraft/world/gen/feature/DeadBushFeature.mapping index e373505fc2..8b16cb0cac 100644 --- a/mappings/net/minecraft/world/gen/feature/DeadBushFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DeadBushFeature.mapping @@ -1,3 +1,4 @@ CLASS btf net/minecraft/world/gen/feature/DeadBushFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/DecoratedFeature.mapping b/mappings/net/minecraft/world/gen/feature/DecoratedFeature.mapping index d668d921bd..a9ee3cb4bd 100644 --- a/mappings/net/minecraft/world/gen/feature/DecoratedFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DecoratedFeature.mapping @@ -1,3 +1,4 @@ CLASS btg net/minecraft/world/gen/feature/DecoratedFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/DesertWellFeature.mapping b/mappings/net/minecraft/world/gen/feature/DesertWellFeature.mapping index 667f28d568..7a10206d47 100644 --- a/mappings/net/minecraft/world/gen/feature/DesertWellFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DesertWellFeature.mapping @@ -1,3 +1,4 @@ CLASS btp net/minecraft/world/gen/feature/DesertWellFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping b/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping index a34b7b72b8..eb51d000b3 100644 --- a/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping @@ -1,3 +1,4 @@ CLASS btr net/minecraft/world/gen/feature/DiskFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/DoublePlantFeature.mapping b/mappings/net/minecraft/world/gen/feature/DoublePlantFeature.mapping index f33a9a4e80..a8fab0de0c 100644 --- a/mappings/net/minecraft/world/gen/feature/DoublePlantFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DoublePlantFeature.mapping @@ -1,3 +1,4 @@ CLASS btt net/minecraft/world/gen/feature/DoublePlantFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/DungeonFeature.mapping b/mappings/net/minecraft/world/gen/feature/DungeonFeature.mapping index e7d5c6a3fe..6b80418de6 100644 --- a/mappings/net/minecraft/world/gen/feature/DungeonFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DungeonFeature.mapping @@ -1,3 +1,4 @@ CLASS bvg net/minecraft/world/gen/feature/DungeonFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/EmeraldOre.mapping b/mappings/net/minecraft/world/gen/feature/EmeraldOre.mapping index c18029502c..6ef87cf069 100644 --- a/mappings/net/minecraft/world/gen/feature/EmeraldOre.mapping +++ b/mappings/net/minecraft/world/gen/feature/EmeraldOre.mapping @@ -1,3 +1,4 @@ CLASS bwi net/minecraft/world/gen/feature/EmeraldOre METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/EndGatewayFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndGatewayFeature.mapping index 5ebcebac33..9e93c3656e 100644 --- a/mappings/net/minecraft/world/gen/feature/EndGatewayFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndGatewayFeature.mapping @@ -1,3 +1,4 @@ CLASS btw net/minecraft/world/gen/feature/EndGatewayFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/EndIslandFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndIslandFeature.mapping index 613d03fc82..ab6806e4a4 100644 --- a/mappings/net/minecraft/world/gen/feature/EndIslandFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndIslandFeature.mapping @@ -1,3 +1,4 @@ CLASS btx net/minecraft/world/gen/feature/EndIslandFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/EndPillarFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndPillarFeature.mapping index 7b72c22b9d..758b6115cc 100644 --- a/mappings/net/minecraft/world/gen/feature/EndPillarFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndPillarFeature.mapping @@ -22,3 +22,4 @@ CLASS bww net/minecraft/world/gen/feature/EndPillarFeature METHOD f getBoundingBox ()Lckl; METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index 96e3d839f7..ed7eb913aa 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -86,5 +86,6 @@ CLASS btz net/minecraft/world/gen/feature/Feature FIELD y SAVANNA_TREE Lbtz; FIELD z SPRUCE_TREE Lbtz; METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z + ARG 3 random METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbua; METHOD a register (Ljava/lang/String;Lbtz;)Lbtz; diff --git a/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping b/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping index 852ba50797..79824ad6f0 100644 --- a/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping @@ -1,3 +1,4 @@ CLASS buc net/minecraft/world/gen/feature/FlowerFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/ForestRockFeature.mapping b/mappings/net/minecraft/world/gen/feature/ForestRockFeature.mapping index 29bd4d424d..136c036040 100644 --- a/mappings/net/minecraft/world/gen/feature/ForestRockFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ForestRockFeature.mapping @@ -1,3 +1,4 @@ CLASS bsp net/minecraft/world/gen/feature/ForestRockFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping b/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping index 107c6f2b75..f887d60b63 100644 --- a/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping @@ -1,3 +1,4 @@ CLASS bue net/minecraft/world/gen/feature/FossilFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/FreezeTopLayerFeature.mapping b/mappings/net/minecraft/world/gen/feature/FreezeTopLayerFeature.mapping index 8fd8179ecc..d2624ab6c0 100644 --- a/mappings/net/minecraft/world/gen/feature/FreezeTopLayerFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/FreezeTopLayerFeature.mapping @@ -1,3 +1,4 @@ CLASS bwu net/minecraft/world/gen/feature/FreezeTopLayerFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/GlowstoneBlobFeature.mapping b/mappings/net/minecraft/world/gen/feature/GlowstoneBlobFeature.mapping index cde792298d..22bf7a006b 100644 --- a/mappings/net/minecraft/world/gen/feature/GlowstoneBlobFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/GlowstoneBlobFeature.mapping @@ -1,3 +1,4 @@ CLASS bug net/minecraft/world/gen/feature/GlowstoneBlobFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/GrassFeature.mapping b/mappings/net/minecraft/world/gen/feature/GrassFeature.mapping index dc78b1b1ce..bb0c9388e0 100644 --- a/mappings/net/minecraft/world/gen/feature/GrassFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/GrassFeature.mapping @@ -1,3 +1,4 @@ CLASS bui net/minecraft/world/gen/feature/GrassFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/HugeBrownMushroomFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeBrownMushroomFeature.mapping index cbf1fa1b43..7c190a04d9 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeBrownMushroomFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeBrownMushroomFeature.mapping @@ -1,3 +1,4 @@ CLASS bun net/minecraft/world/gen/feature/HugeBrownMushroomFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/HugeRedMushroomFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeRedMushroomFeature.mapping index 7e289a1268..1c3c795b93 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeRedMushroomFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeRedMushroomFeature.mapping @@ -1,3 +1,4 @@ CLASS buo net/minecraft/world/gen/feature/HugeRedMushroomFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/IcePatchFeature.mapping b/mappings/net/minecraft/world/gen/feature/IcePatchFeature.mapping index 5f0252cc95..3a0b8a7486 100644 --- a/mappings/net/minecraft/world/gen/feature/IcePatchFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/IcePatchFeature.mapping @@ -1,3 +1,4 @@ CLASS bup net/minecraft/world/gen/feature/IcePatchFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/IceSpikeFeature.mapping b/mappings/net/minecraft/world/gen/feature/IceSpikeFeature.mapping index a29dee5c83..06dbbcf1ce 100644 --- a/mappings/net/minecraft/world/gen/feature/IceSpikeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/IceSpikeFeature.mapping @@ -1,3 +1,4 @@ CLASS buq net/minecraft/world/gen/feature/IceSpikeFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping b/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping index e1758fb019..32afd61973 100644 --- a/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping @@ -1,3 +1,4 @@ CLASS bus net/minecraft/world/gen/feature/IcebergFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/JungleGrassFeature.mapping b/mappings/net/minecraft/world/gen/feature/JungleGrassFeature.mapping index 2b01edfa46..4e93401a85 100644 --- a/mappings/net/minecraft/world/gen/feature/JungleGrassFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/JungleGrassFeature.mapping @@ -1,3 +1,4 @@ CLASS buu net/minecraft/world/gen/feature/JungleGrassFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/KelpFeature.mapping b/mappings/net/minecraft/world/gen/feature/KelpFeature.mapping index 34c2e799cd..560df7b64f 100644 --- a/mappings/net/minecraft/world/gen/feature/KelpFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/KelpFeature.mapping @@ -1,3 +1,4 @@ CLASS bux net/minecraft/world/gen/feature/KelpFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/LakeFeature.mapping b/mappings/net/minecraft/world/gen/feature/LakeFeature.mapping index 8803749eaf..62adaa97a7 100644 --- a/mappings/net/minecraft/world/gen/feature/LakeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/LakeFeature.mapping @@ -1,3 +1,4 @@ CLASS buz net/minecraft/world/gen/feature/LakeFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/MelonFeature.mapping b/mappings/net/minecraft/world/gen/feature/MelonFeature.mapping index 81e17b6fbc..4bca346679 100644 --- a/mappings/net/minecraft/world/gen/feature/MelonFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MelonFeature.mapping @@ -1,3 +1,4 @@ CLASS bvd net/minecraft/world/gen/feature/MelonFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/NetherFireFeature.mapping b/mappings/net/minecraft/world/gen/feature/NetherFireFeature.mapping index bd09e94bfb..418bbc3da3 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherFireFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherFireFeature.mapping @@ -1,3 +1,4 @@ CLASS bul net/minecraft/world/gen/feature/NetherFireFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/NetherSpringFeature.mapping b/mappings/net/minecraft/world/gen/feature/NetherSpringFeature.mapping index 5c61d3d5f2..a6d1ccc19b 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherSpringFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherSpringFeature.mapping @@ -1,3 +1,4 @@ CLASS bvi net/minecraft/world/gen/feature/NetherSpringFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/OreFeature.mapping b/mappings/net/minecraft/world/gen/feature/OreFeature.mapping index 0932530970..081b59e2b8 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeature.mapping @@ -1,3 +1,4 @@ CLASS bvr net/minecraft/world/gen/feature/OreFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/PumpkinFeature.mapping b/mappings/net/minecraft/world/gen/feature/PumpkinFeature.mapping index cdc36ba8d6..51fdc51bf5 100644 --- a/mappings/net/minecraft/world/gen/feature/PumpkinFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/PumpkinFeature.mapping @@ -1,3 +1,4 @@ CLASS bvy net/minecraft/world/gen/feature/PumpkinFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/RandomBooleanFeature.mapping b/mappings/net/minecraft/world/gen/feature/RandomBooleanFeature.mapping index 8ac46657db..69684fc93f 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomBooleanFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomBooleanFeature.mapping @@ -1,3 +1,4 @@ CLASS bwa net/minecraft/world/gen/feature/RandomBooleanFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeature.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeature.mapping index e735fffb3f..ca8ba3f6fe 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeature.mapping @@ -1,3 +1,4 @@ CLASS bwf net/minecraft/world/gen/feature/RandomFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping index 4bf171f474..c05a1f1a9f 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping @@ -10,7 +10,7 @@ CLASS bxn net/minecraft/world/gen/feature/RandomFeatureEntry ARG 2 dynamic METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;)Z ARG 1 world - ARG 3 rand + ARG 3 random METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbxn; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; diff --git a/mappings/net/minecraft/world/gen/feature/RandomRandomFeature.mapping b/mappings/net/minecraft/world/gen/feature/RandomRandomFeature.mapping index c7eff8c7c1..9f3731d559 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomRandomFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomRandomFeature.mapping @@ -1,3 +1,4 @@ CLASS bwc net/minecraft/world/gen/feature/RandomRandomFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/ReedFeature.mapping b/mappings/net/minecraft/world/gen/feature/ReedFeature.mapping index fc697ae8c6..3c86d64f51 100644 --- a/mappings/net/minecraft/world/gen/feature/ReedFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ReedFeature.mapping @@ -1,3 +1,4 @@ CLASS bwg net/minecraft/world/gen/feature/ReedFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/SeaPickleFeature.mapping b/mappings/net/minecraft/world/gen/feature/SeaPickleFeature.mapping index 58ef71ebb9..4056065525 100644 --- a/mappings/net/minecraft/world/gen/feature/SeaPickleFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SeaPickleFeature.mapping @@ -1,3 +1,4 @@ CLASS bwk net/minecraft/world/gen/feature/SeaPickleFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/SeagrassFeature.mapping b/mappings/net/minecraft/world/gen/feature/SeagrassFeature.mapping index cbc9ab77b5..eff1d80790 100644 --- a/mappings/net/minecraft/world/gen/feature/SeagrassFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SeagrassFeature.mapping @@ -1,3 +1,4 @@ CLASS bwl net/minecraft/world/gen/feature/SeagrassFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/SimpleBlockFeature.mapping b/mappings/net/minecraft/world/gen/feature/SimpleBlockFeature.mapping index c78165b1cd..7f5443d65f 100644 --- a/mappings/net/minecraft/world/gen/feature/SimpleBlockFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SimpleBlockFeature.mapping @@ -1,3 +1,4 @@ CLASS bwq net/minecraft/world/gen/feature/SimpleBlockFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/SimpleRandomFeature.mapping b/mappings/net/minecraft/world/gen/feature/SimpleRandomFeature.mapping index 2a496fa654..98e5fd25d3 100644 --- a/mappings/net/minecraft/world/gen/feature/SimpleRandomFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SimpleRandomFeature.mapping @@ -1,3 +1,4 @@ CLASS bws net/minecraft/world/gen/feature/SimpleRandomFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/SpringFeature.mapping b/mappings/net/minecraft/world/gen/feature/SpringFeature.mapping index d557ad4ba1..00eaea9c0a 100644 --- a/mappings/net/minecraft/world/gen/feature/SpringFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SpringFeature.mapping @@ -1,3 +1,4 @@ CLASS bwy net/minecraft/world/gen/feature/SpringFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index b5b43215c1..cb2d84a6e4 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -1,4 +1,5 @@ CLASS bxb net/minecraft/world/gen/feature/StructureFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random METHOD b getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/TaigaGrassFeature.mapping b/mappings/net/minecraft/world/gen/feature/TaigaGrassFeature.mapping index 2178a6849f..336ee07ee8 100644 --- a/mappings/net/minecraft/world/gen/feature/TaigaGrassFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TaigaGrassFeature.mapping @@ -1,3 +1,4 @@ CLASS bxg net/minecraft/world/gen/feature/TaigaGrassFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index 7e7933876c..7234dad10f 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -1,3 +1,4 @@ CLASS bsk net/minecraft/world/gen/feature/TreeFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/VinesFeature.mapping b/mappings/net/minecraft/world/gen/feature/VinesFeature.mapping index f5df6762ee..880b73ca8e 100644 --- a/mappings/net/minecraft/world/gen/feature/VinesFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/VinesFeature.mapping @@ -1,3 +1,4 @@ CLASS bxk net/minecraft/world/gen/feature/VinesFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/VoidStartPlatformFeature.mapping b/mappings/net/minecraft/world/gen/feature/VoidStartPlatformFeature.mapping index e633484bd4..fcffb74c20 100644 --- a/mappings/net/minecraft/world/gen/feature/VoidStartPlatformFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/VoidStartPlatformFeature.mapping @@ -1,3 +1,4 @@ CLASS bxl net/minecraft/world/gen/feature/VoidStartPlatformFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/WaterlilyFeature.mapping b/mappings/net/minecraft/world/gen/feature/WaterlilyFeature.mapping index d77dd77795..b1ff2817c5 100644 --- a/mappings/net/minecraft/world/gen/feature/WaterlilyFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/WaterlilyFeature.mapping @@ -1,3 +1,4 @@ CLASS bxm net/minecraft/world/gen/feature/WaterlilyFeature METHOD a generate (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 1 world + ARG 3 random diff --git a/mappings/ue.mapping b/mappings/ue.mapping deleted file mode 100644 index 80e663a6b3..0000000000 --- a/mappings/ue.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS ue - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - METHOD a toFixedPoint (D)J - METHOD a (Lagi;IIZ)V - ARG 2 trackingRange - ARG 3 tickInterval