diff --git a/build.gradle b/build.gradle index d618bc1b01..bae95ac389 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "1.14.1" +def minecraft_version = "1.14.2 Pre-Release 1" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping index 9c8e9b4d1d..5697ce7d35 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -20,4 +20,4 @@ CLASS btf net/minecraft/block/entity/BannerBlockEntity METHOD c getPatterns ()Ljava/util/List; METHOD f getPatternColors ()Ljava/util/List; METHOD g getPatternCacheKey ()Ljava/lang/String; - METHOD s readPattern ()V + METHOD h readPattern ()V diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index 83cfd46417..e44727907f 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -24,8 +24,8 @@ CLASS btj net/minecraft/block/entity/BeaconBlockEntity METHOD a playSound (Lyj;)V METHOD b getPotionEffectById (I)Laia; ARG 0 id - METHOD c getBeamSegments ()Ljava/util/List; METHOD createMenu (ILavx;Lavy;)Layc; ARG 1 syncId - METHOD f getLevel ()I + METHOD f getBeamSegments ()Ljava/util/List; + METHOD h getLevel ()I METHOD s applyPlayerEffects ()V diff --git a/mappings/net/minecraft/block/entity/BedBlockEntity.mapping b/mappings/net/minecraft/block/entity/BedBlockEntity.mapping index 3c9ed1356d..3415adbbaa 100644 --- a/mappings/net/minecraft/block/entity/BedBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BedBlockEntity.mapping @@ -2,4 +2,4 @@ CLASS btk net/minecraft/block/entity/BedBlockEntity FIELD a color Lbay; METHOD a setColor (Lbay;)V ARG 1 color - METHOD c getColor ()Lbay; + METHOD d getColor ()Lbay; diff --git a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping index 1b1be8be3e..a7d7da7ec1 100644 --- a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping @@ -3,4 +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 + METHOD d playResonateSound ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 89db8c717c..3503e7b6c4 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -5,7 +5,7 @@ CLASS btn net/minecraft/block/entity/BlockEntity FIELD d world Lbhi; FIELD e pos Lev; FIELD f invalid Z - METHOD W_ getSquaredRenderDistance ()D + METHOD W_ invalidate ()V METHOD a toUpdatePacket ()Lkn; METHOD a getSquaredDistance (DDD)D ARG 1 x @@ -21,11 +21,11 @@ CLASS btn net/minecraft/block/entity/BlockEntity METHOD c createFromTag (Lib;)Lbtn; METHOD d writeIdentifyingData (Lib;)Lib; METHOD e markDirty ()V - METHOD i hasWorld ()Z - METHOD j getPos ()Lev; - METHOD k getCachedState ()Lbvk; - METHOD l isInvalid ()Z - METHOD m invalidate ()V + METHOD i getSquaredRenderDistance ()D + METHOD j hasWorld ()Z + METHOD k getPos ()Lev; + METHOD l getCachedState ()Lbvk; + METHOD m isInvalid ()Z METHOD n validate ()V METHOD o resetBlock ()V METHOD p shouldNotCopyTagFromItem ()Z diff --git a/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping b/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping index b36b55bf4a..824ceb7b6b 100644 --- a/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping @@ -9,5 +9,5 @@ CLASS btp net/minecraft/block/entity/BrewingStandBlockEntity FIELD k itemBrewing Lbbw; FIELD l fuel I METHOD f getSlotsEmpty ()[Z - METHOD s canCraft ()Z - METHOD t craft ()V + METHOD h canCraft ()Z + METHOD s craft ()V diff --git a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping index 634bc7bf45..d6320b0c6a 100644 --- a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping @@ -7,10 +7,10 @@ CLASS btq net/minecraft/block/entity/CampfireBlockEntity METHOD a addItem (Lbcb;I)Z ARG 1 item ARG 2 integer - METHOD c getItemsBeingCooked ()Lfj; - METHOD d spawnItemsBeingCooked ()V + METHOD d getItemsBeingCooked ()Lfj; METHOD d saveInitialChunkData (Lib;)Lib; ARG 1 tag - METHOD f updateItemsBeingCooked ()V + METHOD f spawnItemsBeingCooked ()V + METHOD h updateItemsBeingCooked ()V METHOD s spawnSmokeParticles ()V METHOD t updateListeners ()V diff --git a/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping b/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping index 1f01148411..fbb64ef818 100644 --- a/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping @@ -25,4 +25,4 @@ CLASS btr net/minecraft/block/entity/ChestBlockEntity ARG 0 from ARG 1 to METHOD a playSound (Lyj;)V - METHOD s onInvOpenOrClose ()V + METHOD h onInvOpenOrClose ()V diff --git a/mappings/net/minecraft/block/entity/CommandBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/CommandBlockBlockEntity.mapping index e93c3c3738..d19ec4fafc 100644 --- a/mappings/net/minecraft/block/entity/CommandBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CommandBlockBlockEntity.mapping @@ -7,12 +7,12 @@ CLASS bts net/minecraft/block/entity/CommandBlockBlockEntity FIELD h commandExecutor Lbgo; METHOD a setPowered (Z)V METHOD b setAuto (Z)V - METHOD c getCommandExecutor ()Lbgo; METHOD c setNeedsUpdatePacket (Z)V ARG 1 needsUpdatePacket - METHOD d isPowered ()Z - METHOD f isAuto ()Z - METHOD g isConditionMet ()Z + METHOD d getCommandExecutor ()Lbgo; + METHOD f isPowered ()Z + METHOD g isAuto ()Z + METHOD h isConditionMet ()Z METHOD s updateConditionMet ()Z METHOD t needsUpdatePacket ()Z METHOD u getType ()Lbts$a; diff --git a/mappings/net/minecraft/block/entity/ComparatorBlockEntity.mapping b/mappings/net/minecraft/block/entity/ComparatorBlockEntity.mapping index edff591cce..4af8f333c0 100644 --- a/mappings/net/minecraft/block/entity/ComparatorBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ComparatorBlockEntity.mapping @@ -1,4 +1,4 @@ CLASS btt net/minecraft/block/entity/ComparatorBlockEntity FIELD a outputSignal I METHOD a setOutputSignal (I)V - METHOD c getOutputSignal ()I + METHOD d getOutputSignal ()I diff --git a/mappings/net/minecraft/block/entity/ConduitBlockEntity.mapping b/mappings/net/minecraft/block/entity/ConduitBlockEntity.mapping index 20f2c9eec8..a21921e165 100644 --- a/mappings/net/minecraft/block/entity/ConduitBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ConduitBlockEntity.mapping @@ -15,9 +15,9 @@ CLASS btu net/minecraft/block/entity/ConduitBlockEntity ARG 1 active METHOD b setEyeOpen (Z)V ARG 1 eyeOpen - METHOD c isActive ()Z - METHOD d isEyeOpen ()Z - METHOD f updateActivatingBlocks ()Z + METHOD d isActive ()Z + METHOD f isEyeOpen ()Z + METHOD h updateActivatingBlocks ()Z METHOD s givePlayersEffects ()V METHOD t attackHostileEntity ()V METHOD u updateTargetEntity ()V diff --git a/mappings/net/minecraft/block/entity/DispenserBlockEntity.mapping b/mappings/net/minecraft/block/entity/DispenserBlockEntity.mapping index fcecdd1ba1..d63e6a76fe 100644 --- a/mappings/net/minecraft/block/entity/DispenserBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/DispenserBlockEntity.mapping @@ -3,4 +3,4 @@ CLASS btw net/minecraft/block/entity/DispenserBlockEntity FIELD b inventory Lfj; METHOD a addToFirstFreeSlot (Lbcb;)I ARG 1 stack - METHOD s chooseNonEmptySlot ()I + METHOD h chooseNonEmptySlot ()I diff --git a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping index 00569d47a5..fe1d38a9ad 100644 --- a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping @@ -19,9 +19,9 @@ CLASS buo net/minecraft/block/entity/EndGatewayBlockEntity METHOD b getCooldownBeamHeight (F)F ARG 1 tickDelta METHOD b createPortal (Lev;)V - METHOD c isRecentlyGenerated ()Z - METHOD d needsCooldownBeforeTeleporting ()Z - METHOD f startTeleportCooldown ()V + METHOD d isRecentlyGenerated ()Z + METHOD f needsCooldownBeforeTeleporting ()Z + METHOD h startTeleportCooldown ()V METHOD s getDrawnSidesCount ()I METHOD t findBestPortalExitPos ()Lev; METHOD u createPortal ()V diff --git a/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping b/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping index 355bffabd1..f3c98f7c9b 100644 --- a/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping @@ -4,5 +4,5 @@ CLASS btz net/minecraft/block/entity/EnderChestBlockEntity FIELD c viewerCount I FIELD g ticks I METHOD a canPlayerUse (Lavy;)Z - METHOD c onOpen ()V - METHOD d onClose ()V + METHOD d onOpen ()V + METHOD f onClose ()V diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping index d1750434dd..004bb43f0b 100644 --- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping @@ -57,9 +57,9 @@ CLASS buc net/minecraft/block/entity/HopperBlockEntity ARG 0 inv ARG 1 facing METHOD c getInputItemEntities (Lbub;)Ljava/util/List; - METHOD s isEmpty ()Z - METHOD t isFull ()Z - METHOD u insert ()Z - METHOD v getOutputInventory ()Lagw; - METHOD x needsCooldown ()Z - METHOD y isDisabled ()Z + METHOD h isEmpty ()Z + METHOD s isFull ()Z + METHOD t insert ()Z + METHOD u getOutputInventory ()Lagw; + METHOD v needsCooldown ()Z + METHOD x isDisabled ()Z diff --git a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping index f7e8d24bbe..fc08864a1b 100644 --- a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping @@ -8,6 +8,6 @@ CLASS bud net/minecraft/block/entity/JigsawBlockEntity ARG 1 value METHOD b setTargetPool (Lqs;)V ARG 1 value - METHOD c getAttachmentType ()Lqs; - METHOD d getTargetPool ()Lqs; - METHOD f getFinalState ()Ljava/lang/String; + METHOD d getAttachmentType ()Lqs; + METHOD f getTargetPool ()Lqs; + METHOD g getFinalState ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping b/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping index 390951ee3a..be6d2a6ce8 100644 --- a/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping @@ -1,4 +1,4 @@ CLASS bue net/minecraft/block/entity/JukeboxBlockEntity FIELD a record Lbcb; METHOD a setRecord (Lbcb;)V - METHOD c getRecord ()Lbcb; + METHOD d getRecord ()Lbcb; diff --git a/mappings/net/minecraft/block/entity/LecternBlockEntity.mapping b/mappings/net/minecraft/block/entity/LecternBlockEntity.mapping index 1a947f0cf2..2422fb973c 100644 --- a/mappings/net/minecraft/block/entity/LecternBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LecternBlockEntity.mapping @@ -16,10 +16,10 @@ CLASS buf net/minecraft/block/entity/LecternBlockEntity METHOD b resolveBook (Lbcb;Lavy;)Lbcb; ARG 1 book ARG 2 player - METHOD c getBook ()Lbcb; METHOD createMenu (ILavx;Lavy;)Layc; ARG 1 syncId - METHOD f hasBook ()Z - METHOD g getCurrentPage ()I + METHOD f getBook ()Lbcb; + METHOD g hasBook ()Z + METHOD h getCurrentPage ()I METHOD s getComparatorOutput ()I METHOD t onBookRemoved ()V diff --git a/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping b/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping index e5c4012f77..de83592ba5 100644 --- a/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping @@ -1,3 +1,3 @@ CLASS bum net/minecraft/block/entity/MobSpawnerBlockEntity FIELD a logic Lbgp; - METHOD c getLogic ()Lbgp; + METHOD d getLogic ()Lbgp; diff --git a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping index 59cda81045..54b104b0e8 100644 --- a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping @@ -13,11 +13,11 @@ CLASS bvg net/minecraft/block/entity/PistonBlockEntity METHOD a getProgress (F)F METHOD a getCollisionShape (Lbgs;Lev;)Lcsr; METHOD b getRenderOffsetX (F)F - METHOD c isExtending ()Z METHOD c getRenderOffsetY (F)F - METHOD d getFacing ()Lfa; + METHOD d isExtending ()Z METHOD d getRenderOffsetZ (F)F - METHOD f isSource ()Z + METHOD f getFacing ()Lfa; + METHOD h isSource ()Z METHOD t getPushedBlock ()Lbvk; METHOD u finish ()V METHOD v getSavedWorldTime ()J diff --git a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping index 2742bef2cb..5401da7645 100644 --- a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping @@ -19,8 +19,8 @@ CLASS bui net/minecraft/block/entity/ShulkerBoxBlockEntity ARG 1 tag METHOD g serializeInventory (Lib;)Lib; ARG 1 tag - METHOD s updateAnimation ()V - METHOD t getAnimationStage ()Lbui$a; - METHOD u getColor ()Lbay; - METHOD v pushEntities ()V - METHOD x updateNeighborStates ()V + METHOD h updateAnimation ()V + METHOD s getAnimationStage ()Lbui$a; + METHOD t getColor ()Lbay; + METHOD u pushEntities ()V + METHOD v updateNeighborStates ()V diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping index 4461b3089a..59349c2a2b 100644 --- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping @@ -28,10 +28,10 @@ CLASS buj net/minecraft/block/entity/SignBlockEntity ARG 1 player METHOD a setEditable (Z)V METHOD b onActivate (Lavy;)Z - METHOD c isEditable ()Z - METHOD d getEditor ()Lavy; - METHOD f getTextColor ()Lbay; - METHOD g resetSelectionState ()V + METHOD d isEditable ()Z + METHOD f getEditor ()Lavy; + METHOD g getTextColor ()Lbay; + METHOD h resetSelectionState ()V METHOD s isCaretVisible ()Z METHOD t getCurrentRow ()I METHOD u getSelectionStart ()I diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index bdb9f06360..b0fb7b2ddf 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -13,5 +13,5 @@ CLASS buk net/minecraft/block/entity/SkullBlockEntity ARG 0 value METHOD b loadProperties (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; ARG 0 profile - METHOD c getOwner ()Lcom/mojang/authlib/GameProfile; - METHOD d loadOwnerProperties ()V + METHOD d getOwner ()Lcom/mojang/authlib/GameProfile; + METHOD f loadOwnerProperties ()V diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index 6928d78c72..a45f3034d7 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -47,16 +47,16 @@ CLASS bun net/minecraft/block/entity/StructureBlockBlockEntity METHOD b setOffset (Lev;)V METHOD b setMetadata (Ljava/lang/String;)V METHOD b saveStructure (Z)Z - METHOD c getStructureName ()Ljava/lang/String; METHOD c setSize (Lev;)V METHOD c loadStructure (Z)Z - METHOD d hasStructureName ()Z + METHOD d getStructureName ()Ljava/lang/String; METHOD d setPowered (Z)V METHOD e setShowAir (Z)V - METHOD f getOffset ()Lev; + METHOD f hasStructureName ()Z METHOD f setShowBoundingBox (Z)V ARG 1 showBoundingBox - METHOD g getSize ()Lev; + METHOD g getOffset ()Lev; + METHOD h getSize ()Lev; METHOD s getMirror ()Lbpx; METHOD t getRotation ()Lbqx; METHOD u getMetadata ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index 1ad520bbb6..1c6a4ef846 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -74,11 +74,6 @@ CLASS cwe net/minecraft/client/gui/DrawableHelper ARG 4 bottom ARG 5 color1 ARG 6 color2 - METHOD hLine (IIII)V - ARG 1 xStart - ARG 2 xEnd - ARG 3 y - ARG 4 color METHOD innerBlit (IIIIIFFFF)V ARG 0 xStart ARG 1 xEnd @@ -101,8 +96,3 @@ CLASS cwe net/minecraft/client/gui/DrawableHelper ARG 8 v ARG 9 texWidth ARG 10 texHeight - METHOD vLine (IIII)V - ARG 1 x - ARG 2 yStart - ARG 3 yEnd - ARG 4 color diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index f0ef9dfd2e..8e0b9369ce 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -25,6 +25,6 @@ CLASS cwv net/minecraft/client/gui/hud/DebugHud METHOD d drawRightText ()V METHOD e getLeftText ()Ljava/util/List; METHOD f getRightText ()Ljava/util/List; - METHOD g getWorld ()Lbhi; - METHOD h getChunk ()Lbxk; - METHOD i getClientChunk ()Lbxk; + METHOD h getWorld ()Lbhi; + METHOD i getChunk ()Lbxk; + METHOD j getClientChunk ()Lbxk; diff --git a/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping index 9fb9c9a826..17a9007113 100644 --- a/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping @@ -1,5 +1,3 @@ CLASS aop net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal FIELD a golem Lara; FIELD b target Lair; - METHOD (Lara;)V - ARG 1 golem diff --git a/mappings/net/minecraft/entity/boss/WitherEntity.mapping b/mappings/net/minecraft/entity/boss/WitherEntity.mapping index 3d758187dd..d81b36ffde 100644 --- a/mappings/net/minecraft/entity/boss/WitherEntity.mapping +++ b/mappings/net/minecraft/entity/boss/WitherEntity.mapping @@ -1,12 +1,12 @@ CLASS atb net/minecraft/entity/boss/WitherEntity FIELD bA INVUL_TIMER Lqh; - FIELD bB HEAD_TARGET_PREDICATE Laqa; - FIELD bC sideHeadPitches [F - FIELD bD sideHeadYaws [F - FIELD bE prevSideHeadPitches [F - FIELD bF prevSideHeadYaws [F - FIELD bJ bossBar Lvd; - FIELD bK CAN_ATTACK_PREDICATE Ljava/util/function/Predicate; + FIELD bB sideHeadPitches [F + FIELD bC sideHeadYaws [F + FIELD bD prevSideHeadPitches [F + FIELD bE prevSideHeadYaws [F + FIELD bI bossBar Lvd; + FIELD bJ CAN_ATTACK_PREDICATE Ljava/util/function/Predicate; + FIELD bK HEAD_TARGET_PREDICATE Laqa; FIELD b TRACKED_ENTITY_ID_1 Lqh; FIELD bz TRACKED_ENTITY_IDS Ljava/util/List; FIELD c TRACKED_ENTITY_ID_2 Lqh; diff --git a/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping index c4c4a1b73b..660e2e8f4c 100644 --- a/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping @@ -13,7 +13,6 @@ CLASS avh net/minecraft/entity/passive/AbstractTraderEntity 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 diff --git a/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping b/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping index 80821c0a4d..0bdfaae1d6 100644 --- a/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping @@ -8,5 +8,3 @@ CLASS asa net/minecraft/entity/passive/TraderLlamaEntity 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/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 87cd89c344..7676cff9d0 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -59,9 +59,9 @@ CLASS avl net/minecraft/entity/passive/VillagerEntity METHOD ev getAvailableFood ()I METHOD ew trySpawnGolem ()V METHOD ex spawnIronGolem ()Lara; - METHOD f beginTradeWith (Lavy;)V + METHOD g beginTradeWith (Lavy;)V ARG 1 customer - METHOD g prepareRecipesFor (Lavy;)V + METHOD h prepareRecipesFor (Lavy;)V ARG 1 player METHOD s depleteFood (I)V ARG 1 amount diff --git a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping index 4c716ca745..8821dcae28 100644 --- a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping +++ b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping @@ -2,9 +2,9 @@ CLASS bhv net/minecraft/server/world/ServerTickScheduler FIELD a invalidObjPredicate Ljava/util/function/Predicate; FIELD b idToName Ljava/util/function/Function; FIELD d ticksScheduled Ljava/util/Set; - FIELD h world Lvg; - FIELD i ticksCurrent Ljava/util/List; - FIELD j tickConsumer Ljava/util/function/Consumer; + FIELD f world Lvg; + FIELD g ticksCurrent Ljava/util/Queue; + FIELD i tickConsumer Ljava/util/function/Consumer; METHOD (Lvg;Ljava/util/function/Predicate;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/function/Consumer;)V ARG 1 world ARG 2 invalidObjPredicate @@ -13,16 +13,12 @@ CLASS bhv net/minecraft/server/world/ServerTickScheduler ARG 5 tickConsumer METHOD a tick ()V METHOD a toTag (Lbgu;)Lii; + METHOD a getScheduledTicksInChunk (Lbgu;ZZ)Ljava/util/List; METHOD a copyScheduledTicks (Lcht;Lev;)V ARG 1 box ARG 2 offset - METHOD a getScheduledTicks (Lcht;Z)Ljava/util/List; - ARG 1 box - ARG 2 remove + METHOD a getScheduledTicks (Lcht;ZZ)Ljava/util/List; METHOD a serializeScheduledTicks (Ljava/util/function/Function;Ljava/lang/Iterable;J)Lii; ARG 0 identifierProvider ARG 1 scheduledTicks ARG 2 time - METHOD a getScheduledTicksInChunk (ZLbgu;)Ljava/util/List; - ARG 1 remove - ARG 2 pos diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 9c9f693292..484edbbe46 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -24,8 +24,8 @@ CLASS us net/minecraft/server/world/ThreadedAnvilChunkStorage ARG 1 players METHOD equals (Ljava/lang/Object;)Z ARG 1 o - FIELD A watchDistance I - FIELD B viewDistance I + FIELD B watchDistance I + FIELD C viewDistance I FIELD a MAX_LEVEL I FIELD d LOGGER Lorg/apache/logging/log4j/Logger; FIELD e currentChunkHolders Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; diff --git a/mappings/net/minecraft/village/PointOfInterestStorage.mapping b/mappings/net/minecraft/village/PointOfInterestStorage.mapping index 09eb56dd95..b153d40176 100644 --- a/mappings/net/minecraft/village/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/village/PointOfInterestStorage.mapping @@ -71,4 +71,3 @@ CLASS aqh net/minecraft/village/PointOfInterestStorage METHOD c getType (Lev;)Ljava/util/Optional; ARG 1 pos METHOD f isOccupied (J)Z - ARG 1 pos diff --git a/mappings/net/minecraft/world/ScheduledTick.mapping b/mappings/net/minecraft/world/ScheduledTick.mapping index e17e376325..fa3ac1f0ea 100644 --- a/mappings/net/minecraft/world/ScheduledTick.mapping +++ b/mappings/net/minecraft/world/ScheduledTick.mapping @@ -13,6 +13,6 @@ CLASS bhy net/minecraft/world/ScheduledTick ARG 2 t ARG 3 time ARG 5 priority - METHOD a getObject ()Ljava/lang/Object; + METHOD b getObject ()Ljava/lang/Object; METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index de82563dcc..5118960dd3 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -35,9 +35,9 @@ CLASS bxs net/minecraft/world/chunk/ProtoChunk METHOD b addLightSource (SI)V ARG 1 chunkSliceRel ARG 2 sectionY - METHOD j addLightSource (Lev;)V + METHOD k addLightSource (Lev;)V ARG 1 pos - METHOD k getPackedSectionRelative (Lev;)S + METHOD l getPackedSectionRelative (Lev;)S ARG 0 pos METHOD w getLightSourcesBySection ()[Lit/unimi/dsi/fastutil/shorts/ShortList; METHOD x getBlockEntities ()Ljava/util/Map; diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 90c09623bd..12fc7b65d5 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -59,7 +59,7 @@ CLASS bxk net/minecraft/world/chunk/WorldChunk ARG 4 clearOld METHOD b remove (Laii;)V METHOD c setLoadedToWorld (Z)V - METHOD j createBlockEntity (Lev;)Lbtn; + METHOD k createBlockEntity (Lev;)Lbtn; METHOD s markDirty ()V METHOD t isEmpty ()Z METHOD u getLevelType ()Lur$b; diff --git a/mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping b/mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping index 8d3b8240eb..f747b50286 100644 --- a/mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping +++ b/mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping @@ -17,5 +17,5 @@ CLASS ckm net/minecraft/world/chunk/WorldNibbleStorage METHOD c getDataForChunk (J)Lbxe; ARG 1 chunkPos METHOD d disableCache ()V - METHOD d removeChunk (J)V + METHOD d removeChunk (J)Lbxe; ARG 1 chunkPos diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index 12828ce9a8..59b5907d25 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -8,7 +8,7 @@ CLASS ckr net/minecraft/world/chunk/light/LightStorage FIELD k DIRECTIONS [Lfa; FIELD l lightType Lbhr; FIELD m chunkProvider Lbxm; - FIELD n toRemove Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD o toRemove Lit/unimi/dsi/fastutil/longs/LongSet; METHOD (Lbhr;Lbxm;Lckm;)V ARG 1 lightType ARG 2 chunkProvider @@ -34,12 +34,12 @@ CLASS ckr net/minecraft/world/chunk/light/LightStorage ARG 1 blockPos ARG 3 value METHOD c updateAll ()V - METHOD c scheduleChunkLightUpdate (JZ)V - ARG 1 chunkBlockPos - ARG 3 isEmpty METHOD d notifyChunkProvider ()V METHOD d getLight (J)I ARG 1 blockPos + METHOD d scheduleChunkLightUpdate (JZ)V + ARG 1 chunkBlockPos + ARG 3 isEmpty METHOD g hasChunk (J)Z ARG 1 chunkPos METHOD i get (J)I