From 86634d3461d673028e0793c40e6b12f60191cfe4 Mon Sep 17 00:00:00 2001 From: NeunEinser Date: Tue, 7 May 2019 23:48:07 +0200 Subject: [PATCH] some new 1.14.1-pre1 stuff (#686) --- mappings/net/minecraft/block/BellBlock.mapping | 2 ++ mappings/net/minecraft/block/Block.mapping | 1 + .../block/HorizontalConnectedBlock.mapping | 2 ++ .../block/entity/BellBlockEntity.mapping | 1 + .../block/entity/BlockEntityType.mapping | 14 ++++++++++++++ .../minecraft/client/MinecraftClient.mapping | 1 + .../network/DebugRendererInfoManager.mapping | 3 +++ .../packet/CustomPayloadS2CPacket.mapping | 1 + .../render/block/BlockModelRenderer.mapping | 18 +++++++++++++++++- .../ai/brain/task/CelebrateRaidWinTask.mapping | 3 +++ .../entity/ai/brain/task/CompositeTask.mapping | 2 ++ .../brain/task/FindPointOfInterestTask.mapping | 3 +++ .../entity/ai/brain/task/FollowMobTask.mapping | 8 +++++++- .../ai/brain/task/HoldTradeOffersTask.mapping | 3 +++ .../entity/ai/brain/task/JumpInBedTask.mapping | 2 +- .../ai/brain/task/LookAroundTask.mapping | 3 +++ .../entity/ai/brain/task/RandomTask.mapping | 1 + .../entity/ai/brain/task/SeekSkyTask.mapping | 3 +++ .../entity/ai/brain/task/Task.mapping | 10 ++++++++++ .../brain/task/VillagerWalkTowardsTask.mapping | 16 ++++++++++++++++ .../entity/ai/brain/task/WaitTask.mapping | 3 +++ .../ai/brain/task/WanderAroundTask.mapping | 2 ++ .../ai/brain/task/WanderIndoorsTask.mapping | 2 ++ .../{ => tasks}/GoToNearbyPositionTask.mapping | 2 +- .../passive/AbstractTraderEntity.mapping | 4 ++++ .../entity/passive/TraderLlamaEntity.mapping | 2 ++ .../passive/WanderingTraderEntity.mapping | 1 + .../function/CommandFunctionManager.mapping | 7 +++++++ .../minecraft/util/shape/VoxelShape.mapping | 5 ++++- 29 files changed, 120 insertions(+), 5 deletions(-) rename mappings/net/minecraft/entity/ai/{ => tasks}/GoToNearbyPositionTask.mapping (55%) diff --git a/mappings/net/minecraft/block/BellBlock.mapping b/mappings/net/minecraft/block/BellBlock.mapping index b8c1e8e42e..008a78647c 100644 --- a/mappings/net/minecraft/block/BellBlock.mapping +++ b/mappings/net/minecraft/block/BellBlock.mapping @@ -20,6 +20,8 @@ CLASS bmk net/minecraft/block/BellBlock ARG 2 state ARG 3 blockEntity ARG 4 hitPosition + ARG 5 player + ARG 6 checkHitPosition METHOD a ring (Lbhi;Lev;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 5b6dbcb538..7c8264667c 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -54,6 +54,7 @@ CLASS bmm net/minecraft/block/Block METHOD d hasDynamicBounds ()Lbmm$c; METHOD e dropsNothing ()Lbmm$c; FIELD a FACINGS [Lfa; + FIELD b FULL_CUBE_SHAPE_CACHE Lcom/google/common/cache/LoadingCache; FIELD c SOLID_MEDIUM_SQUARE_SHAPE Lcsr; FIELD d SOLID_SMALL_SQUARE_SHAPE Lcsr; FIELD e slipperiness F diff --git a/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping b/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping index f148b49b62..761b4b13ac 100644 --- a/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping +++ b/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping @@ -7,6 +7,7 @@ CLASS bnq net/minecraft/block/HorizontalConnectedBlock FIELD f FACING_PROPERTIES Ljava/util/Map; FIELD g collisionShapes [Lcsr; FIELD h boundingShapes [Lcsr; + FIELD i SHAPE_INDEX_CACHE Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD (FFFFFLbmm$c;)V ARG 1 radius1 ARG 2 radius2 @@ -23,3 +24,4 @@ CLASS bnq net/minecraft/block/HorizontalConnectedBlock METHOD a getDirectionMask (Lfa;)I ARG 0 dir METHOD j getShapeIndex (Lbvk;)I + ARG 1 state diff --git a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping index ca45f7225c..1b1be8be3e 100644 --- a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping @@ -3,3 +3,4 @@ CLASS btl net/minecraft/block/entity/BellBlockEntity FIELD b isRinging Z FIELD c lastSideHit Lfa; METHOD a activate (Lfa;)V + METHOD c playResonateSound ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntityType.mapping b/mappings/net/minecraft/block/entity/BlockEntityType.mapping index 3177ee4535..c4273a8c06 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityType.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityType.mapping @@ -1,10 +1,24 @@ CLASS bto net/minecraft/block/entity/BlockEntityType CLASS bto$a Builder FIELD a supplier Ljava/util/function/Supplier; + FIELD b blocks Ljava/util/Set; + METHOD (Ljava/util/function/Supplier;Ljava/util/Set;)V + ARG 1 supplier + ARG 2 blocks METHOD a build (Lcom/mojang/datafixers/types/Type;)Lbto; + METHOD a create (Ljava/util/function/Supplier;[Lbmm;)Lbto$a; + ARG 0 supplier + ARG 1 blocks FIELD G LOGGER Lorg/apache/logging/log4j/Logger; FIELD H supplier Ljava/util/function/Supplier; + FIELD I blocks Ljava/util/Set; FIELD J type Lcom/mojang/datafixers/types/Type; + METHOD (Ljava/util/function/Supplier;Ljava/util/Set;Lcom/mojang/datafixers/types/Type;)V + ARG 1 supplier + ARG 2 blocks + ARG 3 type METHOD a instantiate ()Lbtn; + METHOD a supports (Lbmm;)Z + ARG 1 block METHOD a getId (Lbto;)Lqs; METHOD a create (Ljava/lang/String;Lbto$a;)Lbto; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index b995cd1420..8e5ed35fc4 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -183,6 +183,7 @@ CLASS cvk net/minecraft/client/MinecraftClient METHOD c getFramebuffer ()Lcto; METHOD c reset (Lczt;)V METHOD c printCrashReport (Ld;)V + METHOD c openPauseMenu (Z)V METHOD d getGameVersion ()Ljava/lang/String; METHOD d setConnectedToRealms (Z)V ARG 1 connectedToRealms diff --git a/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping b/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping index e820091fb1..b5c4dc4858 100644 --- a/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping +++ b/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping @@ -8,4 +8,7 @@ CLASS np net/minecraft/client/network/DebugRendererInfoManager METHOD a sendPathfindingData (Lbhi;Lais;Lcni;F)V METHOD a sendNeighborUpdate (Lbhi;Lev;)V METHOD a sendStructureStart (Lbhj;Lcin;)V + METHOD a sendRaids (Lvg;Ljava/util/Collection;)V + ARG 0 server + ARG 1 raids METHOD c sendPointOfInterest (Lvg;Lev;)V diff --git a/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping index 128281f3b2..1ff5c04031 100644 --- a/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping @@ -11,6 +11,7 @@ CLASS lc net/minecraft/client/network/packet/CustomPayloadS2CPacket FIELD j DEBUG_VILLAGE_SECTIONS Lqs; FIELD k DEBUG_GOAL_SELECTOR Lqs; FIELD l DEBUG_BRAIN Lqs; + FIELD m DEBUG_RAIDS Lqs; FIELD n channel Lqs; FIELD o data Ljc; METHOD (Lqs;Ljc;)V diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 586d826b47..312d81b62f 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -16,10 +16,25 @@ CLASS dlg net/minecraft/client/render/block/BlockModelRenderer FIELD j fourthCorner I FIELD k VALUES [Ldlg$c; METHOD a getTranslations (Lfa;)Ldlg$c; + CLASS dlg$d BrightnessCache + FIELD a enabled Z + FIELD b intCache Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap; + FIELD c floatCache Lit/unimi/dsi/fastutil/objects/Object2FloatLinkedOpenHashMap; + METHOD a enable ()V + METHOD a getInt (Lbvk;Lbgq;Lev;)I + ARG 1 state + ARG 2 blockView + ARG 3 pos + METHOD b disable ()V + METHOD b getFloat (Lbvk;Lbgq;Lev;)F + ARG 1 state + ARG 2 blockView + ARG 3 pos CLASS dlg$e NeighborOrientation FIELD m shape I FIELD a colorMap Lcvx; - FIELD b brightnessCacheEnabled Ljava/lang/ThreadLocal; + FIELD b brightnessCache Ljava/lang/ThreadLocal; + METHOD a enableBrightnessCache ()V METHOD a renderQuad (FFFFLjava/util/List;)V ARG 1 colorMultiplier ARG 2 red @@ -68,6 +83,7 @@ CLASS dlg net/minecraft/client/render/block/BlockModelRenderer ARG 1 model ARG 2 state ARG 3 colorMultiplier + METHOD b disableBrightnessCache ()V METHOD b tesselateSmooth (Lbgq;Ldvx;Lbvk;Lev;Lcul;ZLjava/util/Random;J)Z ARG 1 view ARG 2 model diff --git a/mappings/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.mapping index 79359c9611..4ee06f928a 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.mapping @@ -1,5 +1,8 @@ CLASS ajw net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask FIELD a raid Laxc; + METHOD (II)V + ARG 1 minRunTime + ARG 2 maxRunTime METHOD a createFirework (Lbay;I)Lbcb; ARG 1 color ARG 2 flight diff --git a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping index 34b68b02b4..f100719932 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping @@ -11,6 +11,8 @@ CLASS ajz net/minecraft/entity/ai/brain/task/CompositeTask FIELD c runMode Lajz$b; FIELD d tasks Lals; METHOD (Ljava/util/Map;Ljava/util/Set;Lajz$a;Lajz$b;Ljava/util/List;)V + ARG 1 requiredMemoryState ARG 2 memoriesToForgetWhenStopped + ARG 3 order ARG 4 runMode ARG 5 tasks diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping index 6a5727ffca..8cd8cdcea5 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping @@ -1,6 +1,9 @@ CLASS ajq net/minecraft/entity/ai/brain/task/FindPointOfInterestTask + FIELD a poiType Laqk; + FIELD b targetMemoryModule Lapc; FIELD c onlyRunIfChild Z FIELD d lastRunTime J METHOD (Laqk;Lapc;Z)V + ARG 1 poiType ARG 2 targetMemoryModule ARG 3 onlyRunIfChild diff --git a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping index b6120aa4ba..61660ff49f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping @@ -3,4 +3,10 @@ CLASS akx net/minecraft/entity/ai/brain/task/FollowMobTask FIELD b maxDistanceSquared F METHOD (Laim;F)V ARG 1 mobType - ARG 2 maxDistanceSquared + ARG 2 maxDistance + METHOD (Lait;F)V + ARG 1 mobCategory + ARG 2 maxDistance + METHOD (Ljava/util/function/Predicate;F)V + ARG 1 mobType + ARG 2 maxDistance diff --git a/mappings/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.mapping index 963b212d6d..88f11d36a6 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.mapping @@ -1,2 +1,5 @@ CLASS ale net/minecraft/entity/ai/brain/task/HoldTradeOffersTask FIELD b offers Ljava/util/List; + METHOD (II)V + ARG 1 rminRunTime + ARG 2 maxRunTime diff --git a/mappings/net/minecraft/entity/ai/brain/task/JumpInBedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/JumpInBedTask.mapping index a77a67d1d5..cb07fde71c 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/JumpInBedTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/JumpInBedTask.mapping @@ -1,6 +1,6 @@ CLASS akg net/minecraft/entity/ai/brain/task/JumpInBedTask FIELD a walkSpeed F - FIELD b bed Lev; + FIELD b bedPos Lev; FIELD c ticksOutOfBedUntilStopped I FIELD d jumpsRemaining I FIELD e ticksToNextJump I diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookAroundTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookAroundTask.mapping index d0c2823f84..c556b4d691 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookAroundTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookAroundTask.mapping @@ -1 +1,4 @@ CLASS akk net/minecraft/entity/ai/brain/task/LookAroundTask + METHOD (II)V + ARG 1 minRunTime + ARG 2 maxRunTime diff --git a/mappings/net/minecraft/entity/ai/brain/task/RandomTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RandomTask.mapping index fceed78752..e0a10458f3 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/RandomTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/RandomTask.mapping @@ -2,4 +2,5 @@ CLASS akv net/minecraft/entity/ai/brain/task/RandomTask METHOD (Ljava/util/List;)V ARG 1 tasks METHOD (Ljava/util/Map;Ljava/util/List;)V + ARG 1 requiredMemoryState ARG 2 tasks diff --git a/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping index 8d5e3bd696..bad8fde294 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping @@ -2,6 +2,9 @@ CLASS akm net/minecraft/entity/ai/brain/task/SeekSkyTask FIELD a speed F METHOD (F)V ARG 1 speed + METHOD b isSkyVisible (Lvg;Lair;)Z + ARG 0 world + ARG 1 from METHOD c findNearbySky (Lvg;Lair;)Lcrx; ARG 1 world ARG 2 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping index c691772f2a..496818474e 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping @@ -1,9 +1,19 @@ CLASS ajs net/minecraft/entity/ai/brain/task/Task CLASS ajs$a Status + FIELD a requiredMemoryState Ljava/util/Map; FIELD b status Lajs$a; FIELD c endTime J FIELD d minRunTime I FIELD e maxRunTime I + METHOD (Ljava/util/Map;)V + ARG 1 requiredMemoryState + METHOD (Ljava/util/Map;I)V + ARG 1 requiredMemoryState + ARG 2 runTime + METHOD (Ljava/util/Map;II)V + ARG 1 requiredMemoryState + ARG 2 minRunTime + ARG 3 maxRunTime METHOD a getStatus ()Lajs$a; METHOD a isTimeLimitExceeded (J)Z ARG 1 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping index bcd2076ab4..27db531488 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping @@ -1 +1,17 @@ CLASS alc net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask + FIELD a destination Lapc; + FIELD b speed F + FIELD c completionRange I + FIELD e maxRunTime I + METHOD (Lapc;FIII)V + ARG 1 destination + ARG 2 speed + ARG 3 completionRange + ARG 5 maxRunTime + METHOD a shouldGiveUp (Lvg;Lavl;)Z + ARG 1 world + ARG 2 villager + METHOD b reachedDestination (Lvg;Lavl;Lfc;)Z + ARG 1 world + ARG 2 villager + ARG 3 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/WaitTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WaitTask.mapping index 71f1959288..6e7f87644b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WaitTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WaitTask.mapping @@ -1 +1,4 @@ CLASS ajx net/minecraft/entity/ai/brain/task/WaitTask + METHOD (II)V + ARG 1 minRunTime + ARG 2 maxRunTime diff --git a/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping index 7eb4b9f79b..60dea4376f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping @@ -1 +1,3 @@ CLASS akn net/minecraft/entity/ai/brain/task/WanderAroundTask + METHOD (I)V + ARG 1 runTime diff --git a/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping index 650d5aa7ee..a1dbab79c3 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping @@ -1,2 +1,4 @@ CLASS akd net/minecraft/entity/ai/brain/task/WanderIndoorsTask FIELD a speed F + METHOD (F)V + ARG 1 speed diff --git a/mappings/net/minecraft/entity/ai/GoToNearbyPositionTask.mapping b/mappings/net/minecraft/entity/ai/tasks/GoToNearbyPositionTask.mapping similarity index 55% rename from mappings/net/minecraft/entity/ai/GoToNearbyPositionTask.mapping rename to mappings/net/minecraft/entity/ai/tasks/GoToNearbyPositionTask.mapping index d75975c3a2..220cfa505c 100644 --- a/mappings/net/minecraft/entity/ai/GoToNearbyPositionTask.mapping +++ b/mappings/net/minecraft/entity/ai/tasks/GoToNearbyPositionTask.mapping @@ -1,4 +1,4 @@ -CLASS ali net/minecraft/entity/ai/GoToNearbyPositionTask +CLASS ali net/minecraft/entity/ai/tasks/GoToNearbyPositionTask FIELD a memoryModuleType Lapc; FIELD c maxDistance I FIELD d nextRunTime J diff --git a/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping index 80e567030d..c4c4a1b73b 100644 --- a/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping @@ -1,4 +1,5 @@ CLASS avh net/minecraft/entity/passive/AbstractTraderEntity + FIELD bA HEAD_ROLLING_TIME_LEFT Lqh; FIELD bB customer Lavy; FIELD bC inventory Lahi; FIELD bz offers Lbgm; @@ -10,10 +11,13 @@ CLASS avh net/minecraft/entity/passive/AbstractTraderEntity ARG 1 parameters METHOD b afterUsing (Lbgl;)V ARG 1 offer + METHOD dV getHeadRollingTimeLeft ()I METHOD dY hasCustomer ()Z METHOD eb getYesSound ()Lyj; METHOD ec playCelebrateSound ()V METHOD ed getInventory ()Lahi; METHOD ef fillRecipes ()V + METHOD q setHeadRollingTimeLeft (I)V + ARG 1 ticks METHOD r getTradingSound (Z)Lyj; ARG 1 sold diff --git a/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping b/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping index e12d280f5a..80821c0a4d 100644 --- a/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping @@ -6,5 +6,7 @@ CLASS asa net/minecraft/entity/passive/TraderLlamaEntity METHOD (Lasa;Larw;)V ARG 2 llama FIELD bJ despawnDelay I + METHOD eM heldByTrader ()Z + METHOD eN leashedByPlayer ()Z METHOD v setDespawnDelay (I)V ARG 1 delay diff --git a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping index 4d97a2138f..4fa6f46ea2 100644 --- a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping @@ -13,6 +13,7 @@ CLASS avr net/minecraft/entity/passive/WanderingTraderEntity FIELD bA wanderTarget Lev; FIELD bB despawnDelay I METHOD eg getDespawnDelay ()I + METHOD eh tickDespawnDelay ()V METHOD ei getWanderTarget ()Lev; METHOD g setWanderTarget (Lev;)V ARG 1 pos diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index c4eceb5f14..47d84c7872 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -3,6 +3,10 @@ CLASS re net/minecraft/server/function/CommandFunctionManager FIELD a manager Lre; FIELD b source Lcd; FIELD c element Lca$c; + METHOD (Lre;Lcd;Lca$c;)V + ARG 1 manger + ARG 2 source + ARG 3 element METHOD a execute (Ljava/util/ArrayDeque;I)V FIELD a PATH_PREFIX_LENGTH I FIELD b EXTENSION_LENGTH I @@ -13,11 +17,14 @@ CLASS re net/minecraft/server/function/CommandFunctionManager FIELD g idMap Ljava/util/Map; FIELD h executing Z FIELD i chain Ljava/util/ArrayDeque; + FIELD j pending Ljava/util/List; FIELD k tags Lzc; FIELD l tickFunctions Ljava/util/List; FIELD m needToRunLoadFunctions Z METHOD a getServer ()Lnet/minecraft/server/MinecraftServer; METHOD a execute (Lca;Lcd;)I + ARG 1 function + ARG 2 source METHOD a load (Lca;Ljava/lang/Throwable;Lqs;)Lca; ARG 1 function ARG 2 exception diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index 991ab78318..7bb531f9c9 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -1,5 +1,6 @@ CLASS csr net/minecraft/util/shape/VoxelShape FIELD a voxels Lcsg; + FIELD b shapeCache [Lcsr; METHOD (Lcsg;)V ARG 1 voxels METHOD a getBoundingBox ()Lcrs; @@ -26,6 +27,8 @@ CLASS csr net/minecraft/util/shape/VoxelShape METHOD a (Lfa$a;Lcrs;D)D ARG 1 axis ARG 2 box + METHOD a getFace (Lfa;)Lcsr; + ARG 1 facing METHOD b isEmpty ()Z METHOD b contains (DDD)Z ARG 1 x @@ -34,7 +37,7 @@ CLASS csr net/minecraft/util/shape/VoxelShape METHOD b forEachBox (Lcso$a;)V METHOD b getMinimum (Lfa$a;)D ARG 1 axis - METHOD b getFace (Lfa;)Lcsr; + METHOD b getUncachedFace (Lfa;)Lcsr; ARG 1 facing METHOD c simplify ()Lcsr; METHOD c getMaximum (Lfa$a;)D