From 7a03d43146f9e88099fc31a4bd4b27dcff4fe287 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Thu, 29 Nov 2018 20:07:58 +0000 Subject: [PATCH] A random assortment of things (#213) * Add RecipeSerializers mappings * Add class mappings for several items * Add several BlockSoundGroups * Add World.getDimension and World.playRecord * Add a couple of methods to bounding boxes * A couple of minor mappings for servers * Some mappings for TextComponent (de)serialization * A very minor mapping for Polar2f I'm really unsure about this name, so comments welcome! * A few mappings for chat * Basic fluid mappings * Waterlogged -> Waterloggable, removeChatMessage -> removeMessage * Polar2f -> Vec2f, setPlayingOverlay -> setRecordPlayingOverlay --- mappings/net/minecraft/block/Block.mapping | 1 + mappings/net/minecraft/block/BlockState.mapping | 1 + .../minecraft/block/BubbleColumnBlock.mapping | 1 + mappings/net/minecraft/block/ChestBlock.mapping | 1 + .../net/minecraft/block/ConduitBlock.mapping | 1 + .../minecraft/block/CoralParentBlock.mapping | 1 + .../net/minecraft/block/EnderChestBlock.mapping | 1 + mappings/net/minecraft/block/FluidBlock.mapping | 1 + .../block/HorizontalConnectedBlock.mapping | 1 + mappings/net/minecraft/block/KelpBlock.mapping | 1 + .../net/minecraft/block/KelpPlantBlock.mapping | 1 + .../net/minecraft/block/LadderBlock.mapping | 1 + .../minecraft/block/ScaffoldingBlock.mapping | 1 + .../net/minecraft/block/SeaPickleBlock.mapping | 1 + .../net/minecraft/block/SeagrassBlock.mapping | 1 + mappings/net/minecraft/block/SignBlock.mapping | 1 + mappings/net/minecraft/block/SlabBlock.mapping | 1 + .../net/minecraft/block/StairsBlock.mapping | 1 + .../minecraft/block/TallSeagrassBlock.mapping | 1 + .../net/minecraft/block/TrapdoorBlock.mapping | 1 + .../net/minecraft/block/Waterloggable.mapping | 1 + .../minecraft/client/gui/hud/ChatHud.mapping | 2 ++ .../client/gui/hud/ChatHudLine.mapping | 7 +++++++ .../minecraft/client/gui/hud/InGameHud.mapping | 9 +++++++++ .../minecraft/client/gui/ingame/ChatGui.mapping | 1 + .../minecraft/client/render/Renderer.mapping | 1 + .../ai/pathing/PathingCoordinator.mapping | 1 + mappings/net/minecraft/fluid/BaseFluid.mapping | 1 + mappings/net/minecraft/fluid/EmptyFluid.mapping | 1 + mappings/net/minecraft/fluid/Fluid.mapping | 4 ++++ mappings/net/minecraft/fluid/LavaFluid.mapping | 3 +++ mappings/net/minecraft/fluid/WaterFluid.mapping | 1 + mappings/net/minecraft/item/DyeItem.mapping | 4 ++++ .../minecraft/item/FishBucketItem.mapping} | 2 +- .../net/minecraft/item/ItemFrameItem.mapping | 1 + .../net/minecraft/item/block/BedItem.mapping | 1 + .../item/block/CommandBlockItem.mapping | 1 + .../net/minecraft/item/block/DoorItem.mapping | 1 + .../item/block/ScaffoldingItem.mapping | 1 + .../minecraft/recipe/RecipeSerializers.mapping | 17 +++++++++++++++++ .../minecraft/server/MinecraftServer.mapping | 1 + .../config/ServerConfigurationManager.mapping | 8 ++++++++ .../dedicated/MinecraftDedicatedServer.mapping | 1 + .../server/world/ServerWorldListener.mapping | 1 + .../net/minecraft/sound/BlockSoundGroup.mapping | 6 ++++++ .../net/minecraft/text/TextComponent.mapping | 6 +++++- .../net/minecraft/util/math/BoundingBox.mapping | 4 ++++ .../net/minecraft/util/math/Polar2f.mapping | 5 ----- mappings/net/minecraft/util/math/Vec2f.mapping | 8 ++++++++ mappings/net/minecraft/world/IWorld.mapping | 1 + .../net/minecraft/world/ViewableWorld.mapping | 1 + mappings/net/minecraft/world/World.mapping | 5 +++++ .../net/minecraft/world/WorldListener.mapping | 1 + mappings/up.mapping | 2 ++ 54 files changed, 123 insertions(+), 7 deletions(-) create mode 100644 mappings/net/minecraft/block/Waterloggable.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping rename mappings/{ava.mapping => net/minecraft/item/FishBucketItem.mapping} (70%) create mode 100644 mappings/net/minecraft/item/ItemFrameItem.mapping create mode 100644 mappings/net/minecraft/item/block/BedItem.mapping create mode 100644 mappings/net/minecraft/item/block/CommandBlockItem.mapping create mode 100644 mappings/net/minecraft/item/block/DoorItem.mapping create mode 100644 mappings/net/minecraft/item/block/ScaffoldingItem.mapping delete mode 100644 mappings/net/minecraft/util/math/Polar2f.mapping create mode 100644 mappings/net/minecraft/util/math/Vec2f.mapping diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index f4d315ce49..cc399c8c10 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -209,6 +209,7 @@ CLASS bfo net/minecraft/block/Block METHOD d isSimpleFullBlock (Lboh;Lazz;Let;)Z METHOD e isFullBoundsCubeForCulling (Lboh;)Z METHOD e getMapColor (Lboh;Lazz;Let;)Lcde; + METHOD f getFluidState (Lboh;)Lccz; METHOD g hasBlockEntity ()Z METHOD g emitsRedstonePower (Lboh;)Z METHOD g canSuffocate (Lboh;Lazz;Let;)Z diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 17d40e5757..51101cb1e9 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -55,6 +55,7 @@ CLASS boh net/minecraft/block/BlockState METHOD m getPistonBehavior ()Lcdf; METHOD n isFullBoundsCubeForCulling ()Z METHOD n getRayTraceShape (Lazz;Let;)Lcks; + METHOD o getFluidState ()Lccz; METHOD p hasRandomTicks ()Z METHOD p getOffsetPos (Lazz;Let;)Lcjy; METHOD q getSoundGroup ()Lbkp; diff --git a/mappings/net/minecraft/block/BubbleColumnBlock.mapping b/mappings/net/minecraft/block/BubbleColumnBlock.mapping index f6971ebb4d..5434817e47 100644 --- a/mappings/net/minecraft/block/BubbleColumnBlock.mapping +++ b/mappings/net/minecraft/block/BubbleColumnBlock.mapping @@ -24,4 +24,5 @@ CLASS bfs net/minecraft/block/BubbleColumnBlock ARG 2 world ARG 3 pos METHOD c getRenderLayer ()Lbaa; + METHOD f getFluidState (Lboh;)Lccz; METHOD i canCollideWith ()Z diff --git a/mappings/net/minecraft/block/ChestBlock.mapping b/mappings/net/minecraft/block/ChestBlock.mapping index fc23632121..242976f517 100644 --- a/mappings/net/minecraft/block/ChestBlock.mapping +++ b/mappings/net/minecraft/block/ChestBlock.mapping @@ -47,4 +47,5 @@ CLASS bgc net/minecraft/block/ChestBlock METHOD b getComparatorOutput (Lboh;Lban;Let;)I ARG 1 state ARG 2 world + METHOD f getFluidState (Lboh;)Lccz; METHOD o hasComparatorOutput (Lboh;)Z diff --git a/mappings/net/minecraft/block/ConduitBlock.mapping b/mappings/net/minecraft/block/ConduitBlock.mapping index 6ec3efb584..2190f4c00e 100644 --- a/mappings/net/minecraft/block/ConduitBlock.mapping +++ b/mappings/net/minecraft/block/ConduitBlock.mapping @@ -18,3 +18,4 @@ CLASS bgj net/minecraft/block/ConduitBlock METHOD a appendProperties (Lboi$a;)V METHOD b getRenderType (Lboh;)Lbju; METHOD c getRenderLayer ()Lbaa; + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/CoralParentBlock.mapping b/mappings/net/minecraft/block/CoralParentBlock.mapping index 8d00823753..ab6b6fdc8f 100644 --- a/mappings/net/minecraft/block/CoralParentBlock.mapping +++ b/mappings/net/minecraft/block/CoralParentBlock.mapping @@ -11,3 +11,4 @@ CLASS bfe net/minecraft/block/CoralParentBlock ARG 1 state METHOD a appendProperties (Lboi$a;)V METHOD c getRenderLayer ()Lbaa; + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/EnderChestBlock.mapping b/mappings/net/minecraft/block/EnderChestBlock.mapping index 5bd7cdc6ac..1611a0cc99 100644 --- a/mappings/net/minecraft/block/EnderChestBlock.mapping +++ b/mappings/net/minecraft/block/EnderChestBlock.mapping @@ -31,3 +31,4 @@ CLASS bhg net/minecraft/block/EnderChestBlock ARG 1 state ARG 2 world ARG 3 pos + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/FluidBlock.mapping b/mappings/net/minecraft/block/FluidBlock.mapping index 75603b3d90..61cbae37bc 100644 --- a/mappings/net/minecraft/block/FluidBlock.mapping +++ b/mappings/net/minecraft/block/FluidBlock.mapping @@ -27,3 +27,4 @@ CLASS bir net/minecraft/block/FluidBlock ARG 1 world ARG 2 state ARG 3 pos + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping b/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping index 41af673e15..35f74e1af9 100644 --- a/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping +++ b/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping @@ -17,3 +17,4 @@ CLASS bgq net/minecraft/block/HorizontalConnectedBlock ARG 1 state METHOD a applyRotation (Lboh;Lbjx;)Lboh; ARG 1 state + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/KelpBlock.mapping b/mappings/net/minecraft/block/KelpBlock.mapping index 59f0748d54..0a15308348 100644 --- a/mappings/net/minecraft/block/KelpBlock.mapping +++ b/mappings/net/minecraft/block/KelpBlock.mapping @@ -14,3 +14,4 @@ CLASS bij net/minecraft/block/KelpBlock ARG 1 state METHOD a appendProperties (Lboi$a;)V METHOD c getRenderLayer ()Lbaa; + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/KelpPlantBlock.mapping b/mappings/net/minecraft/block/KelpPlantBlock.mapping index ea00095809..6b530bb015 100644 --- a/mappings/net/minecraft/block/KelpPlantBlock.mapping +++ b/mappings/net/minecraft/block/KelpPlantBlock.mapping @@ -8,3 +8,4 @@ CLASS bik net/minecraft/block/KelpPlantBlock METHOD a getRenderingState (Lboh;Ley;Lboh;Lbao;Let;Let;)Lboh; ARG 1 state METHOD c getRenderLayer ()Lbaa; + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/LadderBlock.mapping b/mappings/net/minecraft/block/LadderBlock.mapping index c65817e956..ff87df5afe 100644 --- a/mappings/net/minecraft/block/LadderBlock.mapping +++ b/mappings/net/minecraft/block/LadderBlock.mapping @@ -14,3 +14,4 @@ CLASS bil net/minecraft/block/LadderBlock ARG 1 state METHOD a appendProperties (Lboi$a;)V METHOD c getRenderLayer ()Lbaa; + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/ScaffoldingBlock.mapping b/mappings/net/minecraft/block/ScaffoldingBlock.mapping index c80a1c32b5..40a465f822 100644 --- a/mappings/net/minecraft/block/ScaffoldingBlock.mapping +++ b/mappings/net/minecraft/block/ScaffoldingBlock.mapping @@ -19,3 +19,4 @@ CLASS bka net/minecraft/block/ScaffoldingBlock ARG 1 state METHOD a appendProperties (Lboi$a;)V METHOD c getRenderLayer ()Lbaa; + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/SeaPickleBlock.mapping b/mappings/net/minecraft/block/SeaPickleBlock.mapping index 91a6e3e5b1..be08331b44 100644 --- a/mappings/net/minecraft/block/SeaPickleBlock.mapping +++ b/mappings/net/minecraft/block/SeaPickleBlock.mapping @@ -23,4 +23,5 @@ CLASS bkb net/minecraft/block/SeaPickleBlock METHOD b canPlantOnTop (Lboh;Lazz;Let;)Z ARG 1 floor ARG 2 view + METHOD f getFluidState (Lboh;)Lccz; METHOD k getLuminance (Lboh;)I diff --git a/mappings/net/minecraft/block/SeagrassBlock.mapping b/mappings/net/minecraft/block/SeagrassBlock.mapping index 5ea4542350..886c6175aa 100644 --- a/mappings/net/minecraft/block/SeagrassBlock.mapping +++ b/mappings/net/minecraft/block/SeagrassBlock.mapping @@ -20,3 +20,4 @@ CLASS bkc net/minecraft/block/SeagrassBlock METHOD b canPlantOnTop (Lboh;Lazz;Let;)Z ARG 1 floor ARG 2 view + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/SignBlock.mapping b/mappings/net/minecraft/block/SignBlock.mapping index 3fea07e66c..ea1fc8184b 100644 --- a/mappings/net/minecraft/block/SignBlock.mapping +++ b/mappings/net/minecraft/block/SignBlock.mapping @@ -17,3 +17,4 @@ CLASS bkf net/minecraft/block/SignBlock ARG 8 hitY METHOD a getRenderingState (Lboh;Ley;Lboh;Lbao;Let;Let;)Lboh; ARG 1 state + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/SlabBlock.mapping b/mappings/net/minecraft/block/SlabBlock.mapping index c112393565..b9fe973366 100644 --- a/mappings/net/minecraft/block/SlabBlock.mapping +++ b/mappings/net/minecraft/block/SlabBlock.mapping @@ -10,4 +10,5 @@ CLASS bki net/minecraft/block/SlabBlock METHOD a getRenderingState (Lboh;Ley;Lboh;Lbao;Let;Let;)Lboh; ARG 1 state METHOD a appendProperties (Lboi$a;)V + METHOD f getFluidState (Lboh;)Lccz; METHOD i hasSolidTopSurface (Lboh;Lazz;Let;)Z diff --git a/mappings/net/minecraft/block/StairsBlock.mapping b/mappings/net/minecraft/block/StairsBlock.mapping index 09ccaa6ad3..02ae08b46d 100644 --- a/mappings/net/minecraft/block/StairsBlock.mapping +++ b/mappings/net/minecraft/block/StairsBlock.mapping @@ -59,6 +59,7 @@ CLASS bkv net/minecraft/block/StairsBlock ARG 3 pos METHOD c getRenderLayer ()Lbaa; METHOD c canCollideWith (Lboh;)Z + METHOD f getFluidState (Lboh;)Lccz; METHOD i canCollideWith ()Z METHOD i hasSolidTopSurface (Lboh;Lazz;Let;)Z METHOD k getBlastResistance ()F diff --git a/mappings/net/minecraft/block/TallSeagrassBlock.mapping b/mappings/net/minecraft/block/TallSeagrassBlock.mapping index 806a3986b9..aac9c786ab 100644 --- a/mappings/net/minecraft/block/TallSeagrassBlock.mapping +++ b/mappings/net/minecraft/block/TallSeagrassBlock.mapping @@ -11,3 +11,4 @@ CLASS blg net/minecraft/block/TallSeagrassBlock METHOD b canPlantOnTop (Lboh;Lazz;Let;)Z ARG 1 floor ARG 2 view + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/TrapdoorBlock.mapping b/mappings/net/minecraft/block/TrapdoorBlock.mapping index bedaf3d94d..709e66488a 100644 --- a/mappings/net/minecraft/block/TrapdoorBlock.mapping +++ b/mappings/net/minecraft/block/TrapdoorBlock.mapping @@ -25,3 +25,4 @@ CLASS blj net/minecraft/block/TrapdoorBlock ARG 1 state METHOD a appendProperties (Lboi$a;)V METHOD c getRenderLayer ()Lbaa; + METHOD f getFluidState (Lboh;)Lccz; diff --git a/mappings/net/minecraft/block/Waterloggable.mapping b/mappings/net/minecraft/block/Waterloggable.mapping new file mode 100644 index 0000000000..f5be91b3e2 --- /dev/null +++ b/mappings/net/minecraft/block/Waterloggable.mapping @@ -0,0 +1 @@ +CLASS bkg net/minecraft/block/Waterloggable diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index c06e4f4bc3..d609a1df1e 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -5,7 +5,9 @@ CLASS cob net/minecraft/client/gui/hud/ChatHud METHOD a addMessage (Lja;)V METHOD a addMessage (Lja;I)V ARG 1 message + METHOD a addMessage (Lja;IIZ)V METHOD a clear (Z)V + METHOD b removeMessage (I)V METHOD d isChatFocused ()Z METHOD e getWidth ()I METHOD f getHeight ()I diff --git a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping new file mode 100644 index 0000000000..a6f7cbd693 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping @@ -0,0 +1,7 @@ +CLASS cmz net/minecraft/client/gui/hud/ChatHudLine + FIELD a tickCreated I + FIELD b contents Lja; + FIELD c id I + METHOD a getContents ()Lja; + METHOD b getTickCreated ()I + METHOD c getId ()I diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index ef10414492..798bd8c61b 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -9,6 +9,10 @@ CLASS cnr net/minecraft/client/gui/hud/InGameHud FIELD j game Lcnd; FIELD k itemRenderer Ldgt; FIELD l hudChat Lcob; + FIELD m ticks I + FIELD n overlayMessage Ljava/lang/String; + FIELD o overlayRemaining I + FIELD p overlayTinted Z FIELD r currentStack Lavo; FIELD s hudDebug Lcod; FIELD t hudSubtitles Lcov; @@ -17,8 +21,13 @@ CLASS cnr net/minecraft/client/gui/hud/InGameHud FIELD w hudBossBar Lcnz; METHOD a draw (F)V METHOD a addChatMessage (Liy;Lja;)V + METHOD a setOverlayMessage (Lja;Z)V + METHOD a setRecordPlayingOverlay (Ljava/lang/String;)V + METHOD a setOverlayMessage (Ljava/lang/String;Z)V METHOD d renderDemoTimer ()V + METHOD e tick ()V METHOD f getHudChat ()Lcob; + METHOD g getTicks ()I METHOD h getFontRenderer ()Lcnq; METHOD i getSpectatorWidget ()Lcpc; METHOD j getScoreboardWidget ()Lcor; diff --git a/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping b/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping index dd2bb6f6b1..d0155320f6 100644 --- a/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping @@ -1,4 +1,5 @@ CLASS cql net/minecraft/client/gui/ingame/ChatGui + CLASS cql$a FIELD a chatField Lcoe; METHOD a draw (IIF)V ARG 1 mouseX diff --git a/mappings/net/minecraft/client/render/Renderer.mapping b/mappings/net/minecraft/client/render/Renderer.mapping index 1def0a059f..2ac61dde00 100644 --- a/mappings/net/minecraft/client/render/Renderer.mapping +++ b/mappings/net/minecraft/client/render/Renderer.mapping @@ -62,6 +62,7 @@ CLASS dbm net/minecraft/client/render/Renderer ARG 7 z METHOD a addParticle (Lft;ZZDDDDDD)V METHOD a onResourceReload (Lwa;)V + METHOD a playRecord (Lxd;Let;)V METHOD b onBlockBreakingStage (ILet;I)V ARG 1 entityId ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/pathing/PathingCoordinator.mapping b/mappings/net/minecraft/entity/ai/pathing/PathingCoordinator.mapping index 5c07c0c6ce..fa264440f1 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathingCoordinator.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathingCoordinator.mapping @@ -25,6 +25,7 @@ CLASS akr net/minecraft/entity/ai/pathing/PathingCoordinator ARG 5 y ARG 7 z METHOD a addParticle (Lft;ZZDDDDDD)V + METHOD a playRecord (Lxd;Let;)V METHOD b onBlockBreakingStage (ILet;I)V ARG 1 entityId ARG 2 pos diff --git a/mappings/net/minecraft/fluid/BaseFluid.mapping b/mappings/net/minecraft/fluid/BaseFluid.mapping index d44c6047da..924d9aca03 100644 --- a/mappings/net/minecraft/fluid/BaseFluid.mapping +++ b/mappings/net/minecraft/fluid/BaseFluid.mapping @@ -1,3 +1,4 @@ CLASS ccx net/minecraft/fluid/BaseFluid + METHOD a appendProperties (Lboi$a;)V METHOD e getFlowing ()Lccy; METHOD f getStill ()Lccy; diff --git a/mappings/net/minecraft/fluid/EmptyFluid.mapping b/mappings/net/minecraft/fluid/EmptyFluid.mapping index 9048871327..8a431f4907 100644 --- a/mappings/net/minecraft/fluid/EmptyFluid.mapping +++ b/mappings/net/minecraft/fluid/EmptyFluid.mapping @@ -2,4 +2,5 @@ CLASS ccw net/minecraft/fluid/EmptyFluid METHOD a getRenderLayer ()Lbaa; METHOD b getBucketItem ()Lavj; METHOD b toBlockState (Lccz;)Lboh; + METHOD c isEmpty ()Z METHOD d getBlastResistance ()F diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 9e7b968567..b6395c658c 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -3,11 +3,15 @@ CLASS ccy net/minecraft/fluid/Fluid FIELD c STATE_IDS Lfc; FIELD d stateFactory Lboi; METHOD a getRenderLayer ()Lbaa; + METHOD a appendProperties (Lboi$a;)V METHOD a matchesType (Lccy;)Z METHOD a matches (Lxv;)Z METHOD b getBucketItem ()Lavj; + METHOD b onRandomTick (Lban;Let;Lccz;Ljava/util/Random;)V METHOD b toBlockState (Lccz;)Lboh; + METHOD c isEmpty ()Z METHOD d getBlastResistance ()F METHOD f setDefaultState (Lccz;)V METHOD h getStateFactory ()Lboi; METHOD i getDefaultState ()Lccz; + METHOD k hasRandomTicks ()Z diff --git a/mappings/net/minecraft/fluid/LavaFluid.mapping b/mappings/net/minecraft/fluid/LavaFluid.mapping index 7266195fcf..6cd5795ced 100644 --- a/mappings/net/minecraft/fluid/LavaFluid.mapping +++ b/mappings/net/minecraft/fluid/LavaFluid.mapping @@ -1,10 +1,13 @@ CLASS cdc net/minecraft/fluid/LavaFluid CLASS cdc$a Flowing + METHOD a appendProperties (Lboi$a;)V CLASS cdc$b Still METHOD a getRenderLayer ()Lbaa; METHOD a matchesType (Lccy;)Z METHOD b getBucketItem ()Lavj; + METHOD b onRandomTick (Lban;Let;Lccz;Ljava/util/Random;)V METHOD b toBlockState (Lccz;)Lboh; METHOD d getBlastResistance ()F METHOD e getFlowing ()Lccy; METHOD f getStill ()Lccy; + METHOD k hasRandomTicks ()Z diff --git a/mappings/net/minecraft/fluid/WaterFluid.mapping b/mappings/net/minecraft/fluid/WaterFluid.mapping index 1f59130665..d0696714fd 100644 --- a/mappings/net/minecraft/fluid/WaterFluid.mapping +++ b/mappings/net/minecraft/fluid/WaterFluid.mapping @@ -1,5 +1,6 @@ CLASS cdg net/minecraft/fluid/WaterFluid CLASS cdg$a Flowing + METHOD a appendProperties (Lboi$a;)V CLASS cdg$b Still METHOD a getRenderLayer ()Lbaa; METHOD a matchesType (Lccy;)Z diff --git a/mappings/net/minecraft/item/DyeItem.mapping b/mappings/net/minecraft/item/DyeItem.mapping index 9ecd9fa7c2..123e066e2e 100644 --- a/mappings/net/minecraft/item/DyeItem.mapping +++ b/mappings/net/minecraft/item/DyeItem.mapping @@ -1,5 +1,9 @@ CLASS aul net/minecraft/item/DyeItem + FIELD a dyes Ljava/util/Map; + FIELD b color Lauk; + METHOD a fromColor (Lauk;)Laul; METHOD a interactWithEntity (Lavo;Laqg;Lago;Laey;)Z ARG 1 stack ARG 2 player ARG 3 target + METHOD d getColor ()Lauk; diff --git a/mappings/ava.mapping b/mappings/net/minecraft/item/FishBucketItem.mapping similarity index 70% rename from mappings/ava.mapping rename to mappings/net/minecraft/item/FishBucketItem.mapping index d91dbff0f2..2006ab2712 100644 --- a/mappings/ava.mapping +++ b/mappings/net/minecraft/item/FishBucketItem.mapping @@ -1,4 +1,4 @@ -CLASS ava +CLASS ava net/minecraft/item/FishBucketItem METHOD a addInformation (Lavo;Lban;Ljava/util/List;Lawy;)V ARG 1 stack ARG 2 world diff --git a/mappings/net/minecraft/item/ItemFrameItem.mapping b/mappings/net/minecraft/item/ItemFrameItem.mapping new file mode 100644 index 0000000000..bbe33671e3 --- /dev/null +++ b/mappings/net/minecraft/item/ItemFrameItem.mapping @@ -0,0 +1 @@ +CLASS avl net/minecraft/item/ItemFrameItem diff --git a/mappings/net/minecraft/item/block/BedItem.mapping b/mappings/net/minecraft/item/block/BedItem.mapping new file mode 100644 index 0000000000..8dd2a8c07d --- /dev/null +++ b/mappings/net/minecraft/item/block/BedItem.mapping @@ -0,0 +1 @@ +CLASS atq net/minecraft/item/block/BedItem diff --git a/mappings/net/minecraft/item/block/CommandBlockItem.mapping b/mappings/net/minecraft/item/block/CommandBlockItem.mapping new file mode 100644 index 0000000000..351775278b --- /dev/null +++ b/mappings/net/minecraft/item/block/CommandBlockItem.mapping @@ -0,0 +1 @@ +CLASS avf net/minecraft/item/block/CommandBlockItem diff --git a/mappings/net/minecraft/item/block/DoorItem.mapping b/mappings/net/minecraft/item/block/DoorItem.mapping new file mode 100644 index 0000000000..e3c92204f4 --- /dev/null +++ b/mappings/net/minecraft/item/block/DoorItem.mapping @@ -0,0 +1 @@ +CLASS auj net/minecraft/item/block/DoorItem diff --git a/mappings/net/minecraft/item/block/ScaffoldingItem.mapping b/mappings/net/minecraft/item/block/ScaffoldingItem.mapping new file mode 100644 index 0000000000..03bdad6ea5 --- /dev/null +++ b/mappings/net/minecraft/item/block/ScaffoldingItem.mapping @@ -0,0 +1 @@ +CLASS awe net/minecraft/item/block/ScaffoldingItem diff --git a/mappings/net/minecraft/recipe/RecipeSerializers.mapping b/mappings/net/minecraft/recipe/RecipeSerializers.mapping index acfe2a01f3..28ca130542 100644 --- a/mappings/net/minecraft/recipe/RecipeSerializers.mapping +++ b/mappings/net/minecraft/recipe/RecipeSerializers.mapping @@ -15,6 +15,23 @@ CLASS axx net/minecraft/recipe/RecipeSerializers METHOD a read (Lpy;Liq;)Laxu; ARG 0 id ARG 1 buf + FIELD a SHAPED Laxw; + FIELD b SHAPELESS Laxw; + FIELD c ARMOR_DYE Laxx$a; + FIELD d BOOK_CLONING Laxx$a; + FIELD e MAP_CLONING Laxx$a; + FIELD f MAP_EXTEND Laxx$a; + FIELD g FIREWORK_ROCKET Laxx$a; + FIELD h FIREWORK_STAR Laxx$a; + FIELD i FIREWORK_STAR_FADE Laxx$a; + FIELD j REPAIR_ITEM Laxx$a; + FIELD k TIPPED_ARROW Laxx$a; + FIELD l BANNER_DUPLICATE Laxx$a; + FIELD m SHIELD_DECORATION Laxx$a; + FIELD n SHULKER_BOX Laxx$a; + FIELD o SUSPICIOUS_STEW Laxx$a; + FIELD p SMELTING Laxw; + FIELD q serializers Ljava/util/Map; METHOD a toPacket (Laxu;Liq;)V METHOD a register (Laxw;)Laxw; METHOD a fromPacket (Liq;)Laxu; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 73e17cf8c8..2d5beade90 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -83,6 +83,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD a addSnooperInfo (Lafi;)V METHOD a setCrashReport (Lb;)V METHOD a setDefaultGameMode (Lbak;)V + METHOD a isSpawnProtected (Lban;Let;Laqg;)Z METHOD a getWorld (Lbra;)Luh; METHOD a reloadDataPacks (Lcgd;)V METHOD a getPermissionLevel (Lcom/mojang/authlib/GameProfile;)I diff --git a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping index aa7402b322..dcf6e588d7 100644 --- a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping @@ -45,6 +45,11 @@ CLASS wk net/minecraft/server/config/ServerConfigurationManager FIELD v latencyUpdateTimer I METHOD a reloadWhitelist ()V METHOD a setViewDistance (I)V + METHOD a sendToAround (Laqg;DDDDLbra;Ljo;)V + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 radius METHOD a sendToTeam (Laqg;Lja;)V ARG 1 source METHOD a setGameMode (Lbak;)V @@ -53,6 +58,8 @@ CLASS wk net/minecraft/server/config/ServerConfigurationManager ARG 1 connection METHOD a sendToAll (Lja;)V METHOD a broadcastChatMessage (Lja;Z)V + METHOD a getPlayer (Ljava/lang/String;)Luj; + METHOD a getPlayer (Ljava/util/UUID;)Luj; METHOD a sendToAll (Ljo;)V METHOD a sendToDimension (Ljo;Lbra;)V ARG 1 packet @@ -71,6 +78,7 @@ CLASS wk net/minecraft/server/config/ServerConfigurationManager METHOD g getUserBanList ()Lwp; METHOD h getIpBanList ()Lwh; METHOD h isOperator (Lcom/mojang/authlib/GameProfile;)Z + METHOD h getAdvancementManager (Luj;)Lqi; METHOD i saveAllPlayerData ()V METHOD j getWhitelist ()Lwr; METHOD k getWhitelistedNames ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index 0e3c6b860c..7c8b3a5b7d 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -13,6 +13,7 @@ CLASS to net/minecraft/server/dedicated/MinecraftDedicatedServer METHOD X isUsingNativeTransport ()Z METHOD a addSnooperInfo (Lafi;)V METHOD a setDefaultGameMode (Lbak;)V + METHOD a isSpawnProtected (Lban;Let;Laqg;)Z METHOD a getInteger (Ljava/lang/String;I)I ARG 1 key METHOD a put (Ljava/lang/String;Ljava/lang/Object;)V diff --git a/mappings/net/minecraft/server/world/ServerWorldListener.mapping b/mappings/net/minecraft/server/world/ServerWorldListener.mapping index adb4a13081..0c622ffd52 100644 --- a/mappings/net/minecraft/server/world/ServerWorldListener.mapping +++ b/mappings/net/minecraft/server/world/ServerWorldListener.mapping @@ -26,6 +26,7 @@ CLASS ui net/minecraft/server/world/ServerWorldListener ARG 5 y ARG 7 z METHOD a addParticle (Lft;ZZDDDDDD)V + METHOD a playRecord (Lxd;Let;)V METHOD b onBlockBreakingStage (ILet;I)V ARG 1 entityId ARG 2 pos diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping index 6be8876af4..92b22f7452 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping @@ -1,6 +1,12 @@ CLASS bkp net/minecraft/sound/BlockSoundGroup FIELD a WOOD Lbkp; + FIELD b GRAVEL Lbkp; + FIELD c GRASS Lbkp; FIELD d STONE Lbkp; + FIELD e METAL Lbkp; + FIELD f GLASS Lbkp; + FIELD g WOOL Lbkp; + FIELD h SAND Lbkp; FIELD r volume F FIELD s pitch F FIELD t breakSound Lxd; diff --git a/mappings/net/minecraft/text/TextComponent.mapping b/mappings/net/minecraft/text/TextComponent.mapping index 1a44732d99..677fe9d130 100644 --- a/mappings/net/minecraft/text/TextComponent.mapping +++ b/mappings/net/minecraft/text/TextComponent.mapping @@ -1,11 +1,15 @@ CLASS ja net/minecraft/text/TextComponent - CLASS ja$a + CLASS ja$a Serializer FIELD a GSON Lcom/google/gson/Gson; FIELD b POS_FIELD Ljava/lang/reflect/Field; FIELD c LINE_START_FIELD Ljava/lang/reflect/Field; + METHOD a fromJson (Lcom/google/gson/JsonElement;)Lja; METHOD a getReaderPosition (Lcom/google/gson/stream/JsonReader;)I + METHOD a fromJsonString (Lcom/mojang/brigadier/StringReader;)Lja; METHOD a toJsonString (Lja;)Ljava/lang/String; + METHOD a fromJsonString (Ljava/lang/String;)Lja; METHOD b toJson (Lja;)Lcom/google/gson/JsonElement; + METHOD b fromLenientJsonString (Ljava/lang/String;)Lja; METHOD a getChildren ()Ljava/util/List; METHOD a getStringTruncated (I)Ljava/lang/String; METHOD a applyFormat (La;)Lja; diff --git a/mappings/net/minecraft/util/math/BoundingBox.mapping b/mappings/net/minecraft/util/math/BoundingBox.mapping index 4c7aa57381..30256ee35a 100644 --- a/mappings/net/minecraft/util/math/BoundingBox.mapping +++ b/mappings/net/minecraft/util/math/BoundingBox.mapping @@ -21,17 +21,21 @@ CLASS cju net/minecraft/util/math/BoundingBox METHOD a offset (Lcjy;)Lcju; METHOD a intersects (Lcjy;Lcjy;)Z ARG 1 a + METHOD a rayTrace (Lcjy;Lcjy;Let;)Lcjv; METHOD a offset (Let;)Lcju; METHOD b isValid ()Z METHOD b stretch (DDD)Lcju; ARG 1 x METHOD b union (Lcju;)Lcju; + METHOD b contains (Lcjy;)Z + METHOD b rayTrace (Lcjy;Lcjy;)Lcjv; METHOD c getCenter ()Lcjy; METHOD c expand (DDD)Lcju; ARG 1 x METHOD c intersects (Lcju;)Z METHOD d offset (DDD)Lcju; ARG 1 x + METHOD e contains (DDD)Z METHOD f contract (DDD)Lcju; ARG 1 x METHOD g expand (D)Lcju; diff --git a/mappings/net/minecraft/util/math/Polar2f.mapping b/mappings/net/minecraft/util/math/Polar2f.mapping deleted file mode 100644 index 9f84996013..0000000000 --- a/mappings/net/minecraft/util/math/Polar2f.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS cjx net/minecraft/util/math/Polar2f - FIELD i pitch F - FIELD j yaw F - METHOD (FF)V - ARG 1 pitch diff --git a/mappings/net/minecraft/util/math/Vec2f.mapping b/mappings/net/minecraft/util/math/Vec2f.mapping new file mode 100644 index 0000000000..b8f08b8aa1 --- /dev/null +++ b/mappings/net/minecraft/util/math/Vec2f.mapping @@ -0,0 +1,8 @@ +CLASS cjx net/minecraft/util/math/Vec2f + FIELD a ZERO Lcjx; + FIELD i x F + FIELD j y F + METHOD (FF)V + ARG 1 x + ARG 2 y + METHOD c equals (Lcjx;)Z diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index 8caeef8a6c..e500e8980e 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -3,6 +3,7 @@ CLASS bao net/minecraft/world/IWorld METHOD a getChunk (IILbpz;)Lbpu; ARG 1 chunkX ARG 2 chunkZ + METHOD a playSound (Laqg;Let;Lxd;Lxf;FF)V METHOD a updateNeighbors (Let;Lbfo;)V METHOD a getVisibleEntities (Ljava/lang/Class;Lcju;)Ljava/util/List; ARG 1 entityClass diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/ViewableWorld.mapping index 9e8c3d8327..a7c9fc8305 100644 --- a/mappings/net/minecraft/world/ViewableWorld.mapping +++ b/mappings/net/minecraft/world/ViewableWorld.mapping @@ -21,4 +21,5 @@ CLASS bar net/minecraft/world/ViewableWorld METHOD b getClosestSurvivalPlayer (Lagf;D)Laqg; METHOD d getWorldBorder ()Lbps; METHOD d isAir (Let;)Z + METHOD o getDimension ()Lbqz; METHOD r_ getSeaLevel ()I diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 8a82c86b6b..5f6114f783 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -23,6 +23,7 @@ CLASS ban net/minecraft/world/World FIELD q thunderGradientPrev F FIELD r thunderGradient F FIELD s rand Ljava/util/Random; + FIELD t dimension Lbqz; FIELD u pathingCoordinator Lakr; FIELD v listeners Ljava/util/List; FIELD w chunkProvider Lbpy; @@ -97,6 +98,7 @@ CLASS ban net/minecraft/world/World ARG 1 player ARG 2 eventId ARG 3 pos + METHOD a playSound (Laqg;Let;Lxd;Lxf;FF)V METHOD a toCrashReportElement (Lb;)Lc; METHOD a registerListener (Lbaq;)V METHOD a init (Lbas;)V @@ -142,6 +144,7 @@ CLASS ban net/minecraft/world/World ARG 3 newState METHOD a getEmittedStrongRedstonePower (Let;Ley;)I ARG 1 pos + METHOD a playRecord (Let;Lxd;)V METHOD a breakBlock (Let;Z)Z ARG 1 pos METHOD a countTransientEntities (Ljava/lang/Class;I)I @@ -180,6 +183,7 @@ CLASS ban net/minecraft/world/World ARG 1 playerClass METHOD b unloadEntities (Ljava/util/Collection;)V METHOD b getPlayerByUuid (Ljava/util/UUID;)Laqg; + METHOD c getAmbientDarkness ()I METHOD c setAmbientDarkness (I)V METHOD c setBlockBreakingProgress (ILet;I)V ARG 1 entityId @@ -216,6 +220,7 @@ CLASS ban net/minecraft/world/World ARG 0 pos METHOD n getChunk (Let;)Lbqg; METHOD n_ updateEntities ()V + METHOD o getDimension ()Lbqz; METHOD q removeBlockEntity (Let;)V METHOD r_ getSeaLevel ()I METHOD s_ getSeed ()J diff --git a/mappings/net/minecraft/world/WorldListener.mapping b/mappings/net/minecraft/world/WorldListener.mapping index 00f7c0b41a..0f14d8b1ee 100644 --- a/mappings/net/minecraft/world/WorldListener.mapping +++ b/mappings/net/minecraft/world/WorldListener.mapping @@ -24,6 +24,7 @@ CLASS baq net/minecraft/world/WorldListener ARG 5 y ARG 7 z METHOD a addParticle (Lft;ZZDDDDDD)V + METHOD a playRecord (Lxd;Let;)V METHOD b onBlockBreakingStage (ILet;I)V ARG 1 entityId ARG 2 pos diff --git a/mappings/up.mapping b/mappings/up.mapping index 7a3224ff90..c65ab6d874 100644 --- a/mappings/up.mapping +++ b/mappings/up.mapping @@ -7,6 +7,7 @@ CLASS up ARG 1 chunkX ARG 2 chunkZ METHOD a spawnEntity (Lagf;)Z + METHOD a playSound (Laqg;Let;Lxd;Lxf;FF)V METHOD a getLightLevel (Lbay;Let;)I ARG 1 type METHOD a getTop (Lbrn$a;II)I @@ -33,5 +34,6 @@ CLASS up METHOD g getLocalDifficulty (Let;)Laex; METHOD i getSaveHandler ()Lcge; METHOD m getRandom ()Ljava/util/Random; + METHOD o getDimension ()Lbqz; METHOD r_ getSeaLevel ()I METHOD s_ getSeed ()J