diff --git a/mappings/anh.mapping b/mappings/anh.mapping index 93537a4431..af159fe4bb 100644 --- a/mappings/anh.mapping +++ b/mappings/anh.mapping @@ -1,3 +1,3 @@ CLASS anh - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD y_ initDataTracker ()V diff --git a/mappings/apf.mapping b/mappings/apf.mapping deleted file mode 100644 index 5897682f6a..0000000000 --- a/mappings/apf.mapping +++ /dev/null @@ -1,38 +0,0 @@ -CLASS apf - CLASS apf$a PickupType - FIELD a NO_PICKUP Lapf$a; - FIELD b PICKUP Lapf$a; - FIELD c CREATIVE_PICKUP Lapf$a; - METHOD a fromOrdinal (I)Lapf$a; - METHOD S_ update ()V - METHOD a shouldRender (D)Z - ARG 0 distanceSq - METHOD a setPositionAndRotations (DDDFFIZ)V - ARG 0 x - ARG 1 y - ARG 2 z - ARG 3 yaw - ARG 4 pitch - METHOD a onHit (Lafq;)V - ARG 0 entity - METHOD a move (Lafu;DDD)V - ARG 1 x - ARG 2 y - ARG 3 z - METHOD a deserializeCustomData (Lhl;)V - ARG 0 tag - METHOD b serializeCustomData (Lhl;)V - ARG 0 tag - METHOD bH getEyeHeight ()F - METHOD c setVelocity (DDDFF)V - ARG 0 dirX - ARG 1 dirY - ARG 2 dirZ - ARG 3 force - ARG 4 variation - METHOD h setVelocityClient (DDD)V - ARG 0 x - ARG 1 y - ARG 2 z - METHOD l asItemStack ()Lauc; - METHOD y_ initDataTracker ()V diff --git a/mappings/ey.mapping b/mappings/ey.mapping deleted file mode 100644 index 20f29f4c31..0000000000 --- a/mappings/ey.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS ey - METHOD a get (I)Ljava/lang/Object; diff --git a/mappings/fh.mapping b/mappings/fh.mapping deleted file mode 100644 index ffa00d92a6..0000000000 --- a/mappings/fh.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS fh - FIELD e LOGGER Lorg/apache/logging/log4j/Logger; - FIELD j BLOCKS Leu; - FIELD k ENCHANTMENTS Lfh; - FIELD m ITEMS Leu; - FIELD n POTIONS Lfh; - FIELD s BIOMES Lfh; - FIELD v BLOCK_ENTITIES Lfh; - METHOD a getDefaultId ()Lpt; - METHOD a getRawId (Ljava/lang/Object;)I - METHOD a getRandom (Ljava/util/Random;)Ljava/lang/Object; - ARG 0 rand - METHOD a get (Lpt;)Ljava/lang/Object; - ARG 0 id - METHOD b getId (Ljava/lang/Object;)Lpt; - ARG 0 value diff --git a/mappings/fv.mapping b/mappings/fv.mapping new file mode 100644 index 0000000000..9acd22f903 --- /dev/null +++ b/mappings/fv.mapping @@ -0,0 +1,2 @@ +CLASS fv + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/j.mapping b/mappings/j.mapping index 9460093bf4..eec21eae36 100644 --- a/mappings/j.mapping +++ b/mappings/j.mapping @@ -1,5 +1,6 @@ CLASS j FIELD a RESOURCE_LEAK_DETECTOR_DISABLED Lio/netty/util/ResourceLeakDetector$Level; + FIELD b isDevelopment Z FIELD c INVALID_CHARS_LEVEL_NAME [C METHOD a isValidChar (C)Z ARG 0 chr diff --git a/mappings/net/minecraft/client/world/WorldClient.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping index 286ad70de6..46d75d44b2 100644 --- a/mappings/net/minecraft/client/world/WorldClient.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -6,6 +6,7 @@ CLASS cva net/minecraft/client/world/WorldClient ARG 1 levelInfo ARG 3 difficulty ARG 4 profiler + METHOD D getScoreboard ()Lcib; METHOD E getChunkProvider ()Lbnz; METHOD a playSound (DDDLwv;Lwx;FFZ)V ARG 0 x diff --git a/mappings/bw.mapping b/mappings/net/minecraft/command/ICommandSource.mapping similarity index 78% rename from mappings/bw.mapping rename to mappings/net/minecraft/command/ICommandSource.mapping index 4a178f48e5..5a84ae6fcf 100644 --- a/mappings/bw.mapping +++ b/mappings/net/minecraft/command/ICommandSource.mapping @@ -1,4 +1,4 @@ -CLASS bw +CLASS bw net/minecraft/command/ICommandSource METHOD C_ shouldBroadcastConsoleToOps ()Z METHOD a sendCommandFeedback ()Z METHOD a appendCommandFeedback (Liw;)V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 5563502851..060f871b51 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -35,6 +35,7 @@ CLASS afh net/minecraft/entity/Entity FIELD ar uuid Ljava/util/UUID; FIELD as uuidString Ljava/lang/String; FIELD at glowing Z + FIELD au factory Lafl; FIELD av entityId I FIELD aw passengerList Ljava/util/List; FIELD ax riddenEntity Lafh; @@ -65,10 +66,12 @@ CLASS afh net/minecraft/entity/Entity METHOD O_ getNameAsComponent ()Liw; METHOD P_ hasCustomName ()Z METHOD Q getNameComponent ()Liw; + METHOD R getFactory ()Lafl; METHOD S getEntityId ()I METHOD S_ update ()V METHOD T getScoreboardTags ()Ljava/util/Set; METHOD T_ stopRiding ()V + METHOD U kill ()V METHOD V getDataTracker ()Lpl; METHOD X invalidate ()V METHOD Y updateLogic ()V @@ -181,7 +184,7 @@ CLASS afh net/minecraft/entity/Entity METHOD aZ hasPassengers ()Z METHOD aa setOnFireFromLava ()V METHOD ab extinguish ()V - METHOD ac kill ()V + METHOD ac destroy ()V METHOD af getSoundSwim ()Lwv; METHOD ag getSoundSplash ()Lwv; METHOD ai checkBlockCollision ()V @@ -334,6 +337,7 @@ CLASS afh net/minecraft/entity/Entity ARG 0 entity METHOD o addPassenger (Lafh;)V ARG 0 entity + METHOD p isShotFromCrossbow ()Z METHOD p removePassenger (Lafh;)V ARG 0 entity METHOD q canAddPassenger (Lafh;)Z diff --git a/mappings/net/minecraft/entity/EntityFactory.mapping b/mappings/net/minecraft/entity/EntityFactory.mapping index a401e2616e..f52de833fa 100644 --- a/mappings/net/minecraft/entity/EntityFactory.mapping +++ b/mappings/net/minecraft/entity/EntityFactory.mapping @@ -4,9 +4,11 @@ CLASS afl net/minecraft/entity/EntityFactory FIELD aW factory Ljava/util/function/Function; FIELD aZ translationKey Ljava/lang/String; FIELD ba textComponent Liw; + METHOD a getId (Lafl;)Lpt; METHOD a newInstance (Laza;)Lafh; ARG 0 world - METHOD a (Ljava/lang/String;Lafl$a;)Lafl; + METHOD a get (Ljava/lang/String;)Lafl; + METHOD a register (Ljava/lang/String;Lafl$a;)Lafl; METHOD c getEntityClass ()Ljava/lang/Class; METHOD d getTranslationKey ()Ljava/lang/String; METHOD e getTextComponent ()Liw; diff --git a/mappings/net/minecraft/entity/EntityLiving.mapping b/mappings/net/minecraft/entity/EntityLiving.mapping index c54043d2b4..904a49437f 100644 --- a/mappings/net/minecraft/entity/EntityLiving.mapping +++ b/mappings/net/minecraft/entity/EntityLiving.mapping @@ -10,6 +10,8 @@ CLASS afq net/minecraft/entity/EntityLiving FIELD ay stuckArrowTimer I FIELD az hurtTime I FIELD bA activePotionEffects Ljava/util/Map; + FIELD bB equippedHand Lfe; + FIELD bC equippedArmor Lfe; FIELD bE attacker Lafq; FIELD bF lastAttackedTime I FIELD bK absorptionAmount F @@ -29,6 +31,7 @@ CLASS afq net/minecraft/entity/EntityLiving ARG 0 other METHOD S_ update ()V METHOD T_ stopRiding ()V + METHOD U kill ()V METHOD Y updateLogic ()V METHOD a setPositionAndRotations (DDDFFIZ)V ARG 0 x @@ -71,7 +74,7 @@ CLASS afq net/minecraft/entity/EntityLiving METHOD aD doesCollide ()Z METHOD aH isValid ()Z METHOD aV getItemsArmor ()Ljava/lang/Iterable; - METHOD ac kill ()V + METHOD ac destroy ()V METHOD b getStackInHand (Laea;)Lauc; ARG 0 hand METHOD b getPotionEffect (Laez;)Lafa; @@ -99,7 +102,7 @@ CLASS afq net/minecraft/entity/EntityLiving METHOD c containsOnlyAmbientEffects (Ljava/util/Collection;)Z ARG 0 effects METHOD cB getAttributeContainer ()Lagg; - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cD getMainHandStack ()Lauc; METHOD cE getOffHandStack ()Lauc; METHOD cF getSoundVolume ()F diff --git a/mappings/net/minecraft/entity/EntityWaterCreature.mapping b/mappings/net/minecraft/entity/EntityWaterCreature.mapping index 7df63071b6..1bc1f59f2e 100644 --- a/mappings/net/minecraft/entity/EntityWaterCreature.mapping +++ b/mappings/net/minecraft/entity/EntityWaterCreature.mapping @@ -2,4 +2,4 @@ CLASS ald net/minecraft/entity/EntityWaterCreature METHOD Y updateLogic ()V METHOD a canBeLeashedBy (Lapb;)Z ARG 0 player - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; diff --git a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping index a0d3add79b..ae60a06f4d 100644 --- a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping +++ b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping @@ -13,6 +13,7 @@ CLASS alv net/minecraft/entity/boss/EntityEnderDragon METHOD G getLootTableId ()Lpt; METHOD J checkDespawn ()V METHOD K_ getPartDamageWorld ()Laza; + METHOD U kill ()V METHOD a damage (Laeq;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/boss/EntityWither.mapping b/mappings/net/minecraft/entity/boss/EntityWither.mapping index 5421956f7f..21bb47637f 100644 --- a/mappings/net/minecraft/entity/boss/EntityWither.mapping +++ b/mappings/net/minecraft/entity/boss/EntityWither.mapping @@ -30,7 +30,7 @@ CLASS amp net/minecraft/entity/boss/EntityWither ARG 0 fallDistance METHOD c addPotionEffect (Lafa;)Z ARG 0 effect - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; METHOD d setInvulTimer (I)V diff --git a/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping b/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping index 7776019f13..55d6eb6316 100644 --- a/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping @@ -26,6 +26,7 @@ CLASS amr net/minecraft/entity/decoration/EntityArmorStand METHOD C pushAway (Lafh;)V ARG 0 entity METHOD S_ update ()V + METHOD U kill ()V METHOD a setBitField (BIZ)B ARG 0 value ARG 1 bitField @@ -91,7 +92,7 @@ CLASS amr net/minecraft/entity/decoration/EntityArmorStand ARG 0 height METHOD n shouldShowArms ()Z METHOD o shouldHideBasePlate ()Z - METHOD p isMarker ()Z + METHOD p isShotFromCrossbow ()Z METHOD p setSmall (Z)V ARG 0 value METHOD q setShowArms (Z)V diff --git a/mappings/net/minecraft/entity/decoration/EntityEnderCrystal.mapping b/mappings/net/minecraft/entity/decoration/EntityEnderCrystal.mapping index 1cdcf5e8e4..c7c58468ba 100644 --- a/mappings/net/minecraft/entity/decoration/EntityEnderCrystal.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityEnderCrystal.mapping @@ -2,6 +2,7 @@ CLASS alu net/minecraft/entity/decoration/EntityEnderCrystal FIELD b BEAM_TARGET Lpi; FIELD c SHOW_BOTTOM Lpi; METHOD S_ update ()V + METHOD U kill ()V METHOD a shouldRender (D)Z ARG 0 distanceSq METHOD a damage (Laeq;F)Z diff --git a/mappings/anm.mapping b/mappings/net/minecraft/entity/mob/EntityDrowned.mapping similarity index 95% rename from mappings/anm.mapping rename to mappings/net/minecraft/entity/mob/EntityDrowned.mapping index d3393d8752..df19c9c2b9 100644 --- a/mappings/anm.mapping +++ b/mappings/net/minecraft/entity/mob/EntityDrowned.mapping @@ -1,4 +1,4 @@ -CLASS anm +CLASS anm net/minecraft/entity/mob/EntityDrowned CLASS anm$a METHOD a canStart ()Z METHOD b shouldContinue ()Z diff --git a/mappings/net/minecraft/entity/mob/EntityEndermite.mapping b/mappings/net/minecraft/entity/mob/EntityEndermite.mapping index d83efc20eb..1c0c7cab6f 100644 --- a/mappings/net/minecraft/entity/mob/EntityEndermite.mapping +++ b/mappings/net/minecraft/entity/mob/EntityEndermite.mapping @@ -11,7 +11,7 @@ CLASS anp net/minecraft/entity/mob/EntityEndermite METHOD b serializeCustomData (Lhl;)V ARG 0 tag METHOD bH getEyeHeight ()F - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; METHOD d getSoundHurt (Laeq;)Lwv; diff --git a/mappings/net/minecraft/entity/mob/EntityGuardian.mapping b/mappings/net/minecraft/entity/mob/EntityGuardian.mapping index 675f0aa44a..1efecc1d7f 100644 --- a/mappings/net/minecraft/entity/mob/EntityGuardian.mapping +++ b/mappings/net/minecraft/entity/mob/EntityGuardian.mapping @@ -17,7 +17,7 @@ CLASS anu net/minecraft/entity/mob/EntityGuardian METHOD b createNavigation (Laza;)Lajn; ARG 0 world METHOD bH getEyeHeight ()F - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; METHOD d getSoundHurt (Laeq;)Lwv; diff --git a/mappings/anw.mapping b/mappings/net/minecraft/entity/mob/EntityIllagerBeast.mapping similarity index 92% rename from mappings/anw.mapping rename to mappings/net/minecraft/entity/mob/EntityIllagerBeast.mapping index bdf7e80bde..49116cfe6c 100644 --- a/mappings/anw.mapping +++ b/mappings/net/minecraft/entity/mob/EntityIllagerBeast.mapping @@ -1,4 +1,4 @@ -CLASS anw +CLASS anw net/minecraft/entity/mob/EntityIllagerBeast CLASS anw$b METHOD (Lafr;Laza;)V ARG 0 entity diff --git a/mappings/anx.mapping b/mappings/net/minecraft/entity/mob/EntityIllusioner.mapping similarity index 93% rename from mappings/anx.mapping rename to mappings/net/minecraft/entity/mob/EntityIllusioner.mapping index 72b04df182..0d5da6d2ce 100644 --- a/mappings/anx.mapping +++ b/mappings/net/minecraft/entity/mob/EntityIllusioner.mapping @@ -1,4 +1,4 @@ -CLASS anx +CLASS anx net/minecraft/entity/mob/EntityIllusioner CLASS anx$a METHOD a canStart ()Z METHOD c start ()V diff --git a/mappings/aob.mapping b/mappings/net/minecraft/entity/mob/EntityPhantom.mapping similarity index 94% rename from mappings/aob.mapping rename to mappings/net/minecraft/entity/mob/EntityPhantom.mapping index 1cf5c051d4..49619c0ac0 100644 --- a/mappings/aob.mapping +++ b/mappings/net/minecraft/entity/mob/EntityPhantom.mapping @@ -1,4 +1,4 @@ -CLASS aob +CLASS aob net/minecraft/entity/mob/EntityPhantom CLASS aob$b METHOD a canStart ()Z METHOD b shouldContinue ()Z @@ -38,7 +38,7 @@ CLASS aob METHOD b canTrack (Ljava/lang/Class;)Z METHOD bH getEyeHeight ()F METHOD bX getSoundCategory ()Lwx; - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cF getSoundVolume ()F METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; diff --git a/mappings/aod.mapping b/mappings/net/minecraft/entity/mob/EntityPillager.mapping similarity index 92% rename from mappings/aod.mapping rename to mappings/net/minecraft/entity/mob/EntityPillager.mapping index a7edbeedec..25e1e48f73 100644 --- a/mappings/aod.mapping +++ b/mappings/net/minecraft/entity/mob/EntityPillager.mapping @@ -1,4 +1,4 @@ -CLASS aod +CLASS aod net/minecraft/entity/mob/EntityPillager CLASS aod$a METHOD a canStart ()Z METHOD c start ()V diff --git a/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping b/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping index a3aa170a35..a77e9a203d 100644 --- a/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping @@ -17,7 +17,7 @@ CLASS aoh net/minecraft/entity/mob/EntitySilverfish ARG 1 block METHOD aK getHeightOffset ()D METHOD bH getEyeHeight ()F - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; METHOD d getSoundHurt (Laeq;)Lwv; diff --git a/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping b/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping index 376e939ea8..e0bedb846b 100644 --- a/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping @@ -19,7 +19,7 @@ CLASS ani net/minecraft/entity/mob/EntitySkeletonBase ARG 0 tag METHOD aK getHeightOffset ()D METHOD bH getEyeHeight ()F - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cb initAttributes ()V METHOD dz isAiming ()Z METHOD k updateMovement ()V diff --git a/mappings/net/minecraft/entity/mob/EntitySkeletonHorse.mapping b/mappings/net/minecraft/entity/mob/EntitySkeletonHorse.mapping index aabe08c9a7..76bdabccc2 100644 --- a/mappings/net/minecraft/entity/mob/EntitySkeletonHorse.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySkeletonHorse.mapping @@ -12,7 +12,7 @@ CLASS alm net/minecraft/entity/mob/EntitySkeletonHorse METHOD af getSoundSwim ()Lwv; METHOD b serializeCustomData (Lhl;)V ARG 0 tag - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; METHOD d getSoundHurt (Laeq;)Lwv; diff --git a/mappings/net/minecraft/entity/mob/EntitySlime.mapping b/mappings/net/minecraft/entity/mob/EntitySlime.mapping index 5063e2a038..4ed128f7eb 100644 --- a/mappings/net/minecraft/entity/mob/EntitySlime.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySlime.mapping @@ -18,6 +18,7 @@ CLASS aoj net/minecraft/entity/mob/EntitySlime FIELD bC SLIME_SIZE Lpi; METHOD F getLootItem ()Latx; METHOD G getLootTableId ()Lpt; + METHOD R getFactory ()Lafl; METHOD S_ update ()V METHOD X invalidate ()V METHOD a (Lazb;Ladz;Lafz;Lhl;)Lafz; diff --git a/mappings/net/minecraft/entity/mob/EntitySpider.mapping b/mappings/net/minecraft/entity/mob/EntitySpider.mapping index de7bde3d95..352662a97a 100644 --- a/mappings/net/minecraft/entity/mob/EntitySpider.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySpider.mapping @@ -20,7 +20,7 @@ CLASS aol net/minecraft/entity/mob/EntitySpider ARG 0 world METHOD bH getEyeHeight ()F METHOD bj stickInWeb ()V - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; METHOD d getSoundHurt (Laeq;)Lwv; diff --git a/mappings/net/minecraft/entity/mob/EntityZombie.mapping b/mappings/net/minecraft/entity/mob/EntityZombie.mapping index 4d704fea97..de1e815fed 100644 --- a/mappings/net/minecraft/entity/mob/EntityZombie.mapping +++ b/mappings/net/minecraft/entity/mob/EntityZombie.mapping @@ -30,7 +30,7 @@ CLASS aor net/minecraft/entity/mob/EntityZombie METHOD b serializeCustomData (Lhl;)V ARG 0 tag METHOD bH getEyeHeight ()F - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; METHOD d getSoundHurt (Laeq;)Lwv; diff --git a/mappings/net/minecraft/entity/mob/EntityZombieHorse.mapping b/mappings/net/minecraft/entity/mob/EntityZombieHorse.mapping index 6ad7502cc4..1810413a73 100644 --- a/mappings/net/minecraft/entity/mob/EntityZombieHorse.mapping +++ b/mappings/net/minecraft/entity/mob/EntityZombieHorse.mapping @@ -6,7 +6,7 @@ CLASS alo net/minecraft/entity/mob/EntityZombieHorse METHOD a interactMob (Lapb;Laea;)Z ARG 0 player ARG 1 playerHand - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; METHOD d getSoundHurt (Laeq;)Lwv; diff --git a/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping b/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping index 8f3d8650d1..8a0b1a8914 100644 --- a/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping +++ b/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping @@ -1,5 +1,6 @@ CLASS als net/minecraft/entity/parts/IEntityPartDamageDelegate METHOD K_ getPartDamageWorld ()Laza; + METHOD R getFactory ()Lafl; METHOD a damage (Lalt;Laeq;F)Z ARG 0 part ARG 1 source diff --git a/mappings/akw.mapping b/mappings/net/minecraft/entity/passive/EntityCod.mapping similarity index 72% rename from mappings/akw.mapping rename to mappings/net/minecraft/entity/passive/EntityCod.mapping index bc0af8a8ba..f4b5a7b736 100644 --- a/mappings/akw.mapping +++ b/mappings/net/minecraft/entity/passive/EntityCod.mapping @@ -1,4 +1,4 @@ -CLASS akw +CLASS akj net/minecraft/entity/passive/EntityCod METHOD D getSoundAmbient ()Lwv; METHOD G getLootTableId ()Lpt; METHOD cu getSoundDeath ()Lwv; diff --git a/mappings/akl.mapping b/mappings/net/minecraft/entity/passive/EntityDolphin.mapping similarity index 95% rename from mappings/akl.mapping rename to mappings/net/minecraft/entity/passive/EntityDolphin.mapping index ea7727f5b9..c79fd578bc 100644 --- a/mappings/akl.mapping +++ b/mappings/net/minecraft/entity/passive/EntityDolphin.mapping @@ -1,4 +1,4 @@ -CLASS akl +CLASS akl net/minecraft/entity/passive/EntityDolphin CLASS akl$a METHOD a tick ()V CLASS akl$b diff --git a/mappings/ake.mapping b/mappings/net/minecraft/entity/passive/EntityFish.mapping similarity index 91% rename from mappings/ake.mapping rename to mappings/net/minecraft/entity/passive/EntityFish.mapping index 9785cab2ae..81cc612f06 100644 --- a/mappings/ake.mapping +++ b/mappings/net/minecraft/entity/passive/EntityFish.mapping @@ -1,4 +1,4 @@ -CLASS ake +CLASS ake net/minecraft/entity/passive/EntityFish CLASS ake$a METHOD a tick ()V CLASS ake$b diff --git a/mappings/akq.mapping b/mappings/net/minecraft/entity/passive/EntityPanda.mapping similarity index 96% rename from mappings/akq.mapping rename to mappings/net/minecraft/entity/passive/EntityPanda.mapping index d9234800d5..9df773047c 100644 --- a/mappings/akq.mapping +++ b/mappings/net/minecraft/entity/passive/EntityPanda.mapping @@ -1,4 +1,4 @@ -CLASS akq +CLASS akq net/minecraft/entity/passive/EntityPanda CLASS akq$a METHOD a canStart ()Z CLASS akq$b diff --git a/mappings/aku.mapping b/mappings/net/minecraft/entity/passive/EntityPufferfish.mapping similarity index 90% rename from mappings/aku.mapping rename to mappings/net/minecraft/entity/passive/EntityPufferfish.mapping index 3263942774..4b50891236 100644 --- a/mappings/aku.mapping +++ b/mappings/net/minecraft/entity/passive/EntityPufferfish.mapping @@ -1,4 +1,4 @@ -CLASS aku +CLASS aku net/minecraft/entity/passive/EntityPufferfish CLASS aku$a METHOD a canStart ()Z METHOD b shouldContinue ()Z diff --git a/mappings/akj.mapping b/mappings/net/minecraft/entity/passive/EntitySalmon.mapping similarity index 71% rename from mappings/akj.mapping rename to mappings/net/minecraft/entity/passive/EntitySalmon.mapping index 4feb3dfb20..456cea6e7b 100644 --- a/mappings/akj.mapping +++ b/mappings/net/minecraft/entity/passive/EntitySalmon.mapping @@ -1,4 +1,4 @@ -CLASS akj +CLASS akw net/minecraft/entity/passive/EntitySalmon METHOD D getSoundAmbient ()Lwv; METHOD G getLootTableId ()Lpt; METHOD cu getSoundDeath ()Lwv; diff --git a/mappings/alb.mapping b/mappings/net/minecraft/entity/passive/EntityTropicalFish.mapping similarity index 84% rename from mappings/alb.mapping rename to mappings/net/minecraft/entity/passive/EntityTropicalFish.mapping index d9cd60b617..337884f05f 100644 --- a/mappings/alb.mapping +++ b/mappings/net/minecraft/entity/passive/EntityTropicalFish.mapping @@ -1,4 +1,4 @@ -CLASS alb +CLASS alb net/minecraft/entity/passive/EntityTropicalFish METHOD D getSoundAmbient ()Lwv; METHOD G getLootTableId ()Lpt; METHOD a (Lazb;Ladz;Lafz;Lhl;)Lafz; diff --git a/mappings/alc.mapping b/mappings/net/minecraft/entity/passive/EntityTurtle.mapping similarity index 95% rename from mappings/alc.mapping rename to mappings/net/minecraft/entity/passive/EntityTurtle.mapping index 5d370b6024..3d993dd997 100644 --- a/mappings/alc.mapping +++ b/mappings/net/minecraft/entity/passive/EntityTurtle.mapping @@ -1,4 +1,4 @@ -CLASS alc +CLASS alc net/minecraft/entity/passive/EntityTurtle CLASS alc$a METHOD a canStart ()Z CLASS alc$b @@ -56,7 +56,7 @@ CLASS alc ARG 0 world METHOD b serializeCustomData (Lhl;)V ARG 0 tag - METHOD cC getEntityAttribute ()Laft; + METHOD cC ()Laft; METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; METHOD d getSoundHurt (Laeq;)Lwv; diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index cb822f57c3..e55ce90b24 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -184,6 +184,7 @@ CLASS apb net/minecraft/entity/player/EntityPlayer METHOD m getSoundFall (I)Lwv; ARG 0 height METHOD n initAi ()V + METHOD p isShotFromCrossbow ()Z METHOD p setScore (I)V ARG 0 value METHOD q setAbsorptionAmount (F)V diff --git a/mappings/api.mapping b/mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping similarity index 71% rename from mappings/api.mapping rename to mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping index a63773a054..ccc44d32ca 100644 --- a/mappings/api.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping @@ -1,4 +1,4 @@ -CLASS api +CLASS api net/minecraft/entity/projectile/EntityDragonFireball METHOD a damage (Laeq;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping b/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping new file mode 100644 index 0000000000..95467784d1 --- /dev/null +++ b/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping @@ -0,0 +1,76 @@ +CLASS apf net/minecraft/entity/projectile/EntityProjectile + CLASS apf$a PickupType + FIELD a NO_PICKUP Lapf$a; + FIELD b PICKUP Lapf$a; + FIELD c CREATIVE_PICKUP Lapf$a; + METHOD a fromOrdinal (I)Lapf$a; + FIELD aA inBlockState Lblz; + FIELD aB life I + FIELD aD damage D + FIELD aF sound Lwv; + FIELD au COLLIDABLE_ENTITIES Ljava/util/function/Predicate; + FIELD av FLAGS Lpi; + FIELD aw PIERCE_LEVEL Lpi; + FIELD ax xTile I + FIELD ay yTile I + FIELD az zTIle I + FIELD b inGround Z + FIELD d pickupType Lapf$a; + FIELD e shake I + FIELD f ownerUUID Ljava/util/UUID; + METHOD S_ update ()V + METHOD a shouldRender (D)Z + ARG 0 distanceSq + METHOD a setPositionAndRotations (DDDFFIZ)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 yaw + ARG 4 pitch + METHOD a setFlag (IZ)V + ARG 0 index + ARG 1 value + METHOD a setOwner (Lafh;)V + ARG 0 entity + METHOD a onHit (Lafq;)V + ARG 0 entity + METHOD a move (Lafu;DDD)V + ARG 1 x + ARG 2 y + ARG 3 z + METHOD a deserializeCustomData (Lhl;)V + ARG 0 tag + METHOD a setSound (Lwv;)V + ARG 0 value + METHOD a setCritical (Z)V + ARG 0 value + METHOD b setFlagByte (B)V + ARG 0 value + METHOD b serializeCustomData (Lhl;)V + ARG 0 tag + METHOD bH getEyeHeight ()F + METHOD c setDamage (D)V + ARG 0 value + METHOD c setVelocity (DDDFF)V + ARG 0 dirX + ARG 1 dirY + ARG 2 dirZ + ARG 3 force + ARG 4 variation + METHOD h setVelocityClient (DDD)V + ARG 0 x + ARG 1 y + ARG 2 z + METHOD i getSound ()Lwv; + METHOD k getOwner ()Lafh; + METHOD l asItemStack ()Lauc; + METHOD m getDamage ()D + METHOD o isCritical ()Z + METHOD o setNoClip (Z)V + ARG 0 value + METHOD p isShotFromCrossbow ()Z + METHOD p setShotFromCrossbow (Z)V + ARG 0 value + METHOD q getPierceLevel ()B + METHOD s isNoClip ()Z + METHOD y_ initDataTracker ()V diff --git a/mappings/apz.mapping b/mappings/net/minecraft/entity/projectile/EntityTrident.mapping similarity index 64% rename from mappings/apz.mapping rename to mappings/net/minecraft/entity/projectile/EntityTrident.mapping index 5df36e142f..e52022b37a 100644 --- a/mappings/apz.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityTrident.mapping @@ -1,4 +1,6 @@ -CLASS apz +CLASS apz net/minecraft/entity/projectile/EntityTrident + FIELD aw tridentStack Lauc; + FIELD ax dealtDamage Z METHOD S_ update ()V METHOD a deserializeCustomData (Lhl;)V ARG 0 tag @@ -8,5 +10,6 @@ CLASS apz ARG 0 x ARG 1 y ARG 2 z + METHOD i getSound ()Lwv; METHOD l asItemStack ()Lauc; METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 063d803673..c58ce7fd22 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -1,6 +1,7 @@ CLASS auc net/minecraft/item/ItemStack FIELD a NULL_STACK Lauc; FIELD b MODIFIER_FORMAT Ljava/text/DecimalFormat; + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d amount I FIELD e updateCooldown I FIELD f item Latx; @@ -14,7 +15,10 @@ CLASS auc net/minecraft/item/ItemStack METHOD (Layz;)V ARG 0 item METHOD (Layz;I)V + ARG 0 container ARG 1 amount + METHOD (Lhl;)V + ARG 0 tag METHOD A getRepairCost ()I METHOD B toTextComponent ()Liw; METHOD C getUpdateCooldown ()I @@ -71,6 +75,8 @@ CLASS auc net/minecraft/item/ItemStack ARG 3 user METHOD a getBlockBreakingSpeed (Lblz;)F ARG 0 state + METHOD a fromTag (Lhl;)Lauc; + ARG 0 tag METHOD a setDisplayName (Liw;)Lauc; METHOD a getOrCreateSubTagCompound (Ljava/lang/String;)Lhl; ARG 0 tagName diff --git a/mappings/net/minecraft/reference/DispenserBehaviors.mapping b/mappings/net/minecraft/reference/Bootstrap.mapping similarity index 85% rename from mappings/net/minecraft/reference/DispenserBehaviors.mapping rename to mappings/net/minecraft/reference/Bootstrap.mapping index 06a0dc006b..f5887820d6 100644 --- a/mappings/net/minecraft/reference/DispenserBehaviors.mapping +++ b/mappings/net/minecraft/reference/Bootstrap.mapping @@ -1,4 +1,4 @@ -CLASS pw net/minecraft/reference/DispenserBehaviors +CLASS pw net/minecraft/reference/Bootstrap CLASS pw$1 METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; ARG 0 world @@ -48,7 +48,11 @@ CLASS pw net/minecraft/reference/DispenserBehaviors ARG 0 location ARG 1 stack ARG 5 projectile - CLASS pw$a + CLASS pw$a DispenseBoat + FIELD a itemDropper Let; + FIELD b type Laqe$b; + METHOD (Laqe$b;)V + ARG 0 type METHOD a playSound (Ler;)V ARG 0 block METHOD a doDispense (Ler;Lauc;)Lauc; @@ -132,4 +136,15 @@ CLASS pw net/minecraft/reference/DispenserBehaviors ARG 0 location ARG 1 stack ARG 5 projectile + FIELD a OUTPUT Ljava/io/PrintStream; + FIELD b initialized Z FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a registerDispenserBehaviors ()V + METHOD a println (Ljava/lang/String;)V + ARG 0 str + METHOD a checkTranslations (Ljava/lang/String;Lfh;Ljava/util/function/Function;)V + ARG 0 prefix + ARG 1 registry + ARG 2 translationGetter + METHOD b initialize ()V + METHOD c setOutputStreams ()V diff --git a/mappings/net/minecraft/util/IdList.mapping b/mappings/net/minecraft/util/IdList.mapping index bec11baf26..8bd18086c4 100644 --- a/mappings/net/minecraft/util/IdList.mapping +++ b/mappings/net/minecraft/util/IdList.mapping @@ -4,8 +4,8 @@ CLASS ez net/minecraft/util/IdList METHOD (I)V ARG 0 size METHOD a size ()I - METHOD a get (I)Ljava/lang/Object; - ARG 0 id + METHOD a getInt (I)Ljava/lang/Object; + ARG 0 index METHOD a getId (Ljava/lang/Object;)I ARG 0 value METHOD a add (Ljava/lang/Object;I)V diff --git a/mappings/net/minecraft/util/IntIterable.mapping b/mappings/net/minecraft/util/IntIterable.mapping new file mode 100644 index 0000000000..447c0795d2 --- /dev/null +++ b/mappings/net/minecraft/util/IntIterable.mapping @@ -0,0 +1,3 @@ +CLASS ey net/minecraft/util/IntIterable + METHOD a getInt (I)Ljava/lang/Object; + ARG 0 index diff --git a/mappings/net/minecraft/util/PrintStreamLogger.mapping b/mappings/net/minecraft/util/PrintStreamLogger.mapping new file mode 100644 index 0000000000..6637f794cb --- /dev/null +++ b/mappings/net/minecraft/util/PrintStreamLogger.mapping @@ -0,0 +1,2 @@ +CLASS qc net/minecraft/util/PrintStreamLogger + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/util/PrintStreamLoggerDebug.mapping b/mappings/net/minecraft/util/PrintStreamLoggerDebug.mapping new file mode 100644 index 0000000000..0317b8791d --- /dev/null +++ b/mappings/net/minecraft/util/PrintStreamLoggerDebug.mapping @@ -0,0 +1 @@ +CLASS qa net/minecraft/util/PrintStreamLoggerDebug diff --git a/mappings/net/minecraft/util/registry/DefaultMappedRegistry.mapping b/mappings/net/minecraft/util/registry/DefaultMappedRegistry.mapping index dad6f5f4b9..e17b861cd0 100644 --- a/mappings/net/minecraft/util/registry/DefaultMappedRegistry.mapping +++ b/mappings/net/minecraft/util/registry/DefaultMappedRegistry.mapping @@ -4,8 +4,12 @@ CLASS eu net/minecraft/util/registry/DefaultMappedRegistry METHOD (Ljava/lang/String;)V ARG 0 defaultId METHOD a getDefaultId ()Lpt; - METHOD a get (I)Ljava/lang/Object; - ARG 0 id + METHOD a getInt (I)Ljava/lang/Object; + ARG 0 index + METHOD a set (ILpt;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 rawId + ARG 1 id + ARG 2 value METHOD a getRawId (Ljava/lang/Object;)I ARG 0 value METHOD a getRandom (Ljava/util/Random;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/registry/IdRegistry.mapping b/mappings/net/minecraft/util/registry/IdRegistry.mapping index 8cf097e13a..843da085bd 100644 --- a/mappings/net/minecraft/util/registry/IdRegistry.mapping +++ b/mappings/net/minecraft/util/registry/IdRegistry.mapping @@ -1,12 +1,21 @@ CLASS fd net/minecraft/util/registry/IdRegistry FIELD b idStore Lxu; - METHOD a get (I)Ljava/lang/Object; - ARG 0 id + METHOD a getInt (I)Ljava/lang/Object; + ARG 0 index + METHOD a set (ILpt;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 rawId + ARG 1 id + ARG 2 value METHOD a getRawId (Ljava/lang/Object;)I ARG 0 value METHOD a getRandom (Ljava/util/Random;)Ljava/lang/Object; ARG 0 rand METHOD a get (Lpt;)Ljava/lang/Object; ARG 0 id + METHOD a add (Lpt;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 id + ARG 1 value + METHOD b keys ()Ljava/util/Set; METHOD b getId (Ljava/lang/Object;)Lpt; ARG 0 value + METHOD c isEmpty ()Z diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping new file mode 100644 index 0000000000..5dad992573 --- /dev/null +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -0,0 +1,33 @@ +CLASS fh net/minecraft/util/registry/Registry + FIELD A STAT_TYPES Lfh; + FIELD e LOGGER Lorg/apache/logging/log4j/Logger; + FIELD f REGISTRIES Lfl; + FIELD g SOUNDS Lfh; + FIELD h FLUIDS Leu; + FIELD i POTION_EFFECT_TYPES Lfh; + FIELD j BLOCKS Leu; + FIELD k ENCHANTMENTS Lfh; + FIELD l ENTITY_FACTORIES Lfh; + FIELD m ITEMS Leu; + FIELD n POTIONS Lfh; + FIELD s BIOMES Lfh; + FIELD v BLOCK_ENTITIES Lfh; + FIELD x WORLD_TYPES Lfh; + METHOD a getDefaultId ()Lpt; + METHOD a set (Lfh;ILjava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; + METHOD a register (Lfh;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; + METHOD a register (Lfh;Lpt;Ljava/lang/Object;)Ljava/lang/Object; + METHOD a getRawId (Ljava/lang/Object;)I + ARG 0 value + METHOD a registerRegistry (Ljava/lang/String;Lfl;)Lfh; + ARG 0 id + ARG 1 registry + METHOD a (Ljava/lang/String;Lfl;Ljava/util/function/Supplier;)Lfl; + METHOD a getRandom (Ljava/util/Random;)Ljava/lang/Object; + ARG 0 rand + METHOD a get (Lpt;)Ljava/lang/Object; + ARG 0 id + METHOD b keys ()Ljava/util/Set; + METHOD b getId (Ljava/lang/Object;)Lpt; + ARG 0 value + METHOD d stream ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/util/registry/RegistryWritable.mapping b/mappings/net/minecraft/util/registry/RegistryWritable.mapping new file mode 100644 index 0000000000..6d6dce66fd --- /dev/null +++ b/mappings/net/minecraft/util/registry/RegistryWritable.mapping @@ -0,0 +1,9 @@ +CLASS fl net/minecraft/util/registry/RegistryWritable + METHOD a set (ILpt;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 rawId + ARG 1 id + ARG 2 value + METHOD a add (Lpt;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 id + ARG 1 value + METHOD c isEmpty ()Z diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 0c756960e9..a50feb7352 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -27,6 +27,7 @@ CLASS aza net/minecraft/world/World FIELD x saveHandler Lcdk; FIELD y properties Lcdj; FIELD z villageManager Lajz; + METHOD D getScoreboard ()Lcib; METHOD E getChunkProvider ()Lbnz; METHOD E getPendingBlockEntity (Leq;)Lbkf; ARG 0 pos diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index 74ea9a7006..2d7655ab73 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -1,6 +1,8 @@ CLASS tz net/minecraft/world/WorldServer FIELD C server Lnet/minecraft/server/MinecraftServer; + FIELD E entitiesByUUID Ljava/util/Map; FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + METHOD D getScoreboard ()Lcib; METHOD E getChunkProvider ()Lbnz; METHOD a isChunkLoaded (IIZ)Z METHOD a setTime (J)V @@ -22,6 +24,7 @@ CLASS tz net/minecraft/world/WorldServer ARG 1 block ARG 2 first ARG 3 second + METHOD a getEntityByUUID (Ljava/util/UUID;)Lafh; METHOD b onEntityAdded (Lafh;)V ARG 0 entity METHOD c onEntityRemoved (Lafh;)V diff --git a/mappings/xu.mapping b/mappings/xu.mapping index 573a18b90a..9b099b778d 100644 --- a/mappings/xu.mapping +++ b/mappings/xu.mapping @@ -1,2 +1,3 @@ CLASS xu - METHOD a get (I)Ljava/lang/Object; + METHOD a getInt (I)Ljava/lang/Object; + ARG 0 index