diff --git a/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping b/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping index 5829bb5c9b..6a70096a9d 100644 --- a/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping @@ -154,5 +154,7 @@ CLASS none/bme net/minecraft/client/network/handler/impl/NetworkGameHandlerClien ARG 0 packet METHOD a onEntityTeleport (Lnone/ii;)V ARG 0 packet + METHOD a onEntityAttributes (Lnone/ij;)V + ARG 0 packet METHOD a onEntityPotionEffect (Lnone/ik;)V ARG 0 packet diff --git a/mappings/net/minecraft/client/network/handler/impl/NetworkLoginHandlerClient.mapping b/mappings/net/minecraft/client/network/handler/impl/NetworkLoginHandlerClient.mapping index 0d386dc9aa..b75e82ec80 100644 --- a/mappings/net/minecraft/client/network/handler/impl/NetworkLoginHandlerClient.mapping +++ b/mappings/net/minecraft/client/network/handler/impl/NetworkLoginHandlerClient.mapping @@ -12,6 +12,7 @@ CLASS none/bmd net/minecraft/client/network/handler/impl/NetworkLoginHandlerClie METHOD a onLoginEncryptionRequest (Lnone/jt;)V ARG 0 packet METHOD a onLoginCompression (Lnone/ju;)V + ARG 0 packet METHOD a onLoginDisconnect (Lnone/jv;)V ARG 0 packet METHOD b getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; diff --git a/mappings/none/boj.mapping b/mappings/net/minecraft/client/sortme/ContainerInventoryClient.mapping similarity index 63% rename from mappings/none/boj.mapping rename to mappings/net/minecraft/client/sortme/ContainerInventoryClient.mapping index 36325751a4..41f37944fc 100644 --- a/mappings/none/boj.mapping +++ b/mappings/net/minecraft/client/sortme/ContainerInventoryClient.mapping @@ -1,4 +1,10 @@ -CLASS none/boj +CLASS none/boj net/minecraft/client/sortme/ContainerInventoryClient + FIELD a id Ljava/lang/String; + FIELD b invFields Ljava/util/Map; + METHOD (Ljava/lang/String;Lnone/fa;I)V + ARG 0 id + ARG 1 customName + ARG 2 size METHOD a createContainer (Lnone/aak;Lnone/aal;)Lnone/abw; ARG 0 playerInv ARG 1 player diff --git a/mappings/net/minecraft/client/world/WorldClient.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping index f507e2f589..eafd63bdea 100644 --- a/mappings/net/minecraft/client/world/WorldClient.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -22,7 +22,7 @@ CLASS none/bmg net/minecraft/client/world/WorldClient ARG 0 entity METHOD b setTimeOfDay (J)V ARG 0 value - METHOD b onEntitySpawn (Lnone/sf;)V + METHOD b onSpawnEntity (Lnone/sf;)V ARG 0 entity METHOD c getMinecraft (Lnone/bmg;)Lnone/bdq; METHOD n createChunkProvider ()Lnone/atj; diff --git a/mappings/net/minecraft/entity/EntityLiving.mapping b/mappings/net/minecraft/entity/EntityLiving.mapping index d38cad115d..174476c33f 100644 --- a/mappings/net/minecraft/entity/EntityLiving.mapping +++ b/mappings/net/minecraft/entity/EntityLiving.mapping @@ -2,6 +2,7 @@ CLASS none/so net/minecraft/entity/EntityLiving FIELD aQ headPitch F FIELD au LIVING_FLAGS Lnone/kj; FIELD ay stuckArrowTimer I + FIELD br attributeContainer Lnone/te; FIELD bt activePotionEffects Ljava/util/Map; FIELD c HEALTH Lnone/kj; FIELD f POTION_SWIRLS_COLOR Lnone/kj; @@ -29,6 +30,8 @@ CLASS none/so net/minecraft/entity/EntityLiving METHOD a setEquippedStack (Lnone/sk;Lnone/aer;)V ARG 0 slot ARG 1 stack + METHOD a getAttributeInstance (Lnone/ta;)Lnone/tb; + ARG 0 attribute METHOD aH getItemsArmor ()Ljava/lang/Iterable; METHOD aU getHeadPitch ()F METHOD a_ onEquipStack (Lnone/aer;)V @@ -61,6 +64,7 @@ CLASS none/so net/minecraft/entity/EntityLiving METHOD cG isFallFlying ()Z METHOD ca getHealthMaximum ()F METHOD cb getStuckArrows ()I + METHOD cd getAttributeContainer ()Lnone/te; METHOD cf getMainHandStack ()Lnone/aer; METHOD cg getOffHandStack ()Lnone/aer; METHOD cw getMainHand ()Lnone/sn; diff --git a/mappings/net/minecraft/entity/attribute/Attribute.mapping b/mappings/net/minecraft/entity/attribute/Attribute.mapping new file mode 100644 index 0000000000..3d4b3182b7 --- /dev/null +++ b/mappings/net/minecraft/entity/attribute/Attribute.mapping @@ -0,0 +1,7 @@ +CLASS none/td net/minecraft/entity/attribute/Attribute + FIELD b id Ljava/lang/String; + METHOD (Lnone/ta;Ljava/lang/String;D)V + ARG 1 id + METHOD a getId ()Ljava/lang/String; + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other diff --git a/mappings/net/minecraft/entity/attribute/AttributeClamped.mapping b/mappings/net/minecraft/entity/attribute/AttributeClamped.mapping new file mode 100644 index 0000000000..d1f76040a8 --- /dev/null +++ b/mappings/net/minecraft/entity/attribute/AttributeClamped.mapping @@ -0,0 +1,11 @@ +CLASS none/th net/minecraft/entity/attribute/AttributeClamped + FIELD a minValue D + FIELD b maxValue D + FIELD c name Ljava/lang/String; + METHOD (Lnone/ta;Ljava/lang/String;DDD)V + ARG 1 id + ARG 3 minValue + ARG 4 maxValue + METHOD a setName (Ljava/lang/String;)Lnone/th; + ARG 0 name + METHOD g getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping new file mode 100644 index 0000000000..56d9a186ad --- /dev/null +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -0,0 +1,14 @@ +CLASS none/tg net/minecraft/entity/attribute/AttributeContainer + FIELD d instancesByName Ljava/util/Map; + METHOD a get (Ljava/lang/String;)Lnone/tb; + ARG 0 name + METHOD a get (Lnone/ta;)Lnone/tb; + ARG 0 attribute + METHOD b get (Ljava/lang/String;)Lnone/tf; + ARG 0 name + METHOD b register (Lnone/ta;)Lnone/tb; + ARG 0 attribute + METHOD c createInstance (Lnone/ta;)Lnone/tb; + ARG 0 attribute + METHOD e get (Lnone/ta;)Lnone/tf; + ARG 0 attribute diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainerBase.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainerBase.mapping new file mode 100644 index 0000000000..71a3908c77 --- /dev/null +++ b/mappings/net/minecraft/entity/attribute/AttributeContainerBase.mapping @@ -0,0 +1,12 @@ +CLASS none/te net/minecraft/entity/attribute/AttributeContainerBase + FIELD a instancesByKey Ljava/util/Map; + FIELD b instancesById Ljava/util/Map; + METHOD a values ()Ljava/util/Collection; + METHOD a get (Ljava/lang/String;)Lnone/tb; + ARG 0 name + METHOD a get (Lnone/ta;)Lnone/tb; + ARG 0 attribute + METHOD b register (Lnone/ta;)Lnone/tb; + ARG 0 attribute + METHOD c createInstance (Lnone/ta;)Lnone/tb; + ARG 0 attribute diff --git a/mappings/net/minecraft/entity/attribute/ModifiableAttribute.mapping b/mappings/net/minecraft/entity/attribute/AttributeInstance.mapping similarity index 90% rename from mappings/net/minecraft/entity/attribute/ModifiableAttribute.mapping rename to mappings/net/minecraft/entity/attribute/AttributeInstance.mapping index 164af389a2..6766186729 100644 --- a/mappings/net/minecraft/entity/attribute/ModifiableAttribute.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeInstance.mapping @@ -1,4 +1,4 @@ -CLASS none/tf net/minecraft/entity/attribute/ModifiableAttribute +CLASS none/tf net/minecraft/entity/attribute/AttributeInstance FIELD b attribute Lnone/ta; FIELD f baseValue D METHOD a getAttribute ()Lnone/ta; diff --git a/mappings/net/minecraft/entity/attribute/AttributeManager.mapping b/mappings/net/minecraft/entity/attribute/AttributeManager.mapping new file mode 100644 index 0000000000..60d1894547 --- /dev/null +++ b/mappings/net/minecraft/entity/attribute/AttributeManager.mapping @@ -0,0 +1,21 @@ +CLASS none/zs net/minecraft/entity/attribute/AttributeManager + FIELD a MAX_HEALTH Lnone/ta; + FIELD b FOLLOW_RANGE Lnone/ta; + FIELD c KNOCKBACK_RESISTANCE Lnone/ta; + FIELD d MOVEMENT_SPEED Lnone/ta; + FIELD e ATTACK_DAMAGE Lnone/ta; + FIELD f ATTACK_SPEED Lnone/ta; + FIELD g ARMOR Lnone/ta; + FIELD h ARMOR_TOUGHNESS Lnone/ta; + FIELD i LUCK Lnone/ta; + FIELD j LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a deserializeFromTag (Lnone/dt;)Lnone/tc; + ARG 0 tag + METHOD a serializeToTag (Lnone/tb;)Lnone/dt; + ARG 0 instance + METHOD a (Lnone/tb;Lnone/dt;)V + METHOD a serializeToTag (Lnone/tc;)Lnone/dt; + ARG 0 modifier + METHOD a serializeToTag (Lnone/te;)Lnone/dz; + ARG 0 container + METHOD a (Lnone/te;Lnone/dz;)V diff --git a/mappings/net/minecraft/sortme/AttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/AttributeModifier.mapping similarity index 77% rename from mappings/net/minecraft/sortme/AttributeModifier.mapping rename to mappings/net/minecraft/entity/attribute/AttributeModifier.mapping index b10eca20e3..1fd88c800e 100644 --- a/mappings/net/minecraft/sortme/AttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeModifier.mapping @@ -1,4 +1,4 @@ -CLASS none/tc net/minecraft/sortme/AttributeModifier +CLASS none/tc net/minecraft/entity/attribute/AttributeModifier FIELD a amount D FIELD b operation I FIELD c name Ljava/lang/String; @@ -14,8 +14,11 @@ CLASS none/tc net/minecraft/sortme/AttributeModifier ARG 2 amount ARG 3 operation METHOD a getId ()Ljava/util/UUID; + METHOD a setSerialize (Z)Lnone/tc; + ARG 0 value METHOD b getName ()Ljava/lang/String; METHOD c getOperation ()I METHOD d getAmount ()D + METHOD e shouldSerialize ()Z METHOD equals (Ljava/lang/Object;)Z ARG 0 other diff --git a/mappings/net/minecraft/entity/attribute/IAttribute.mapping b/mappings/net/minecraft/entity/attribute/IAttribute.mapping index 3928800169..b88105ac35 100644 --- a/mappings/net/minecraft/entity/attribute/IAttribute.mapping +++ b/mappings/net/minecraft/entity/attribute/IAttribute.mapping @@ -1 +1,2 @@ CLASS none/ta net/minecraft/entity/attribute/IAttribute + METHOD a getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/mob/EntityMob.mapping b/mappings/net/minecraft/entity/mob/EntityMob.mapping index 4547ef17e7..1d246d2344 100644 --- a/mappings/net/minecraft/entity/mob/EntityMob.mapping +++ b/mappings/net/minecraft/entity/mob/EntityMob.mapping @@ -14,6 +14,9 @@ CLASS none/sp net/minecraft/entity/mob/EntityMob ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V ARG 0 tagCompound + METHOD a registerTagUpgraders (Lnone/pf;Ljava/lang/Class;)V + ARG 0 handler + ARG 1 entityClass METHOD a setEquippedStack (Lnone/sk;Lnone/aer;)V ARG 0 slot ARG 1 stack diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index 819b1352c1..780e057f10 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -32,12 +32,15 @@ CLASS none/aal net/minecraft/entity/player/EntityPlayer FIELD bt inventory Lnone/aak; FIELD bu containerPlayer Lnone/abw; FIELD bv container Lnone/abw; + FIELD bw hungerManager Lnone/abu; FIELD c enderChestInventory Lnone/acr; FIELD d sleepTimer I FIELD e spawnPosition Lnone/cn; FIELD f spawnForced Z FIELD h xpSeed I METHOD T invalidate ()V + METHOD a addExhaustion (F)V + ARG 0 value METHOD a getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID; ARG 0 profile METHOD a isSkinOverlayVisible (Lnone/aam;)Z @@ -94,6 +97,7 @@ CLASS none/aal net/minecraft/entity/player/EntityPlayer METHOD bW getSoundDeath ()Lnone/nk; METHOD cK getScore ()I METHOD cP getGameProfile ()Lcom/mojang/authlib/GameProfile; + METHOD cX getHungerManager ()Lnone/abu; METHOD cZ canModifyWorld ()Z METHOD cw getMainHand ()Lnone/sn; METHOD d getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/player/HungerManager.mapping b/mappings/net/minecraft/entity/player/HungerManager.mapping new file mode 100644 index 0000000000..6f528e5259 --- /dev/null +++ b/mappings/net/minecraft/entity/player/HungerManager.mapping @@ -0,0 +1,26 @@ +CLASS none/abu net/minecraft/entity/player/HungerManager + FIELD a foodLevel I + FIELD b foodSaturationLevel F + FIELD c exhaustion F + FIELD d foodStarvationTimer I + METHOD a getFoodLevel ()I + METHOD a addExhaustion (F)V + ARG 0 value + METHOD a setFoodLevel (I)V + ARG 0 value + METHOD a add (IF)V + ARG 0 food + ARG 1 saturation + METHOD a update (Lnone/aal;)V + ARG 0 player + METHOD a eat (Lnone/ael;Lnone/aer;)V + ARG 0 item + ARG 1 stack + METHOD a deserialize (Lnone/dt;)V + ARG 0 tag + METHOD b setSaturationLevelClient (F)V + ARG 0 value + METHOD b serialize (Lnone/dt;)V + ARG 0 tag + METHOD c isNotFull ()Z + METHOD e getSaturationLevel ()F diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 0133f0143f..809dc8ea7b 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -7,6 +7,9 @@ CLASS none/rj net/minecraft/inventory/Inventory ARG 0 name ARG 1 customNamed ARG 2 size + METHOD (Lnone/fa;I)V + ARG 0 customName + ARG 1 size METHOD a getInvStack (I)Lnone/aer; ARG 0 slot METHOD a takeInvStack (II)Lnone/aer; diff --git a/mappings/net/minecraft/sortme/InventoryEnderChest.mapping b/mappings/net/minecraft/inventory/InventoryEnderChest.mapping similarity index 84% rename from mappings/net/minecraft/sortme/InventoryEnderChest.mapping rename to mappings/net/minecraft/inventory/InventoryEnderChest.mapping index 2eb18a6883..2ece36fa32 100644 --- a/mappings/net/minecraft/sortme/InventoryEnderChest.mapping +++ b/mappings/net/minecraft/inventory/InventoryEnderChest.mapping @@ -1,4 +1,4 @@ -CLASS none/acr net/minecraft/sortme/InventoryEnderChest +CLASS none/acr net/minecraft/inventory/InventoryEnderChest FIELD a currentTile Lnone/arm; METHOD a canPlayerUseInv (Lnone/aal;)Z ARG 0 player diff --git a/mappings/net/minecraft/migration/impl/TagUpdaterBannerStack.mapping b/mappings/net/minecraft/migration/impl/TagUpgraderBannerStack.mapping similarity index 56% rename from mappings/net/minecraft/migration/impl/TagUpdaterBannerStack.mapping rename to mappings/net/minecraft/migration/impl/TagUpgraderBannerStack.mapping index 06885ab458..8b320f47e1 100644 --- a/mappings/net/minecraft/migration/impl/TagUpdaterBannerStack.mapping +++ b/mappings/net/minecraft/migration/impl/TagUpgraderBannerStack.mapping @@ -1,4 +1,4 @@ -CLASS none/pz net/minecraft/migration/impl/TagUpdaterBannerStack +CLASS none/pz net/minecraft/migration/impl/TagUpgraderBannerStack METHOD a getTargetVersion ()I METHOD a upgradeTag (Lnone/dt;)Lnone/dt; ARG 0 tag diff --git a/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping b/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping index 08b5df079f..f21a82f55d 100644 --- a/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping @@ -141,5 +141,7 @@ CLASS none/fo net/minecraft/network/handler/INetworkGameHandlerClient ARG 0 packet METHOD a onEntityTeleport (Lnone/ii;)V ARG 0 packet + METHOD a onEntityAttributes (Lnone/ij;)V + ARG 0 packet METHOD a onEntityPotionEffect (Lnone/ik;)V ARG 0 packet diff --git a/mappings/net/minecraft/network/handler/INetworkGameHandlerServer.mapping b/mappings/net/minecraft/network/handler/INetworkGameHandlerServer.mapping index 7176c82368..9ceeb9fd4b 100644 --- a/mappings/net/minecraft/network/handler/INetworkGameHandlerServer.mapping +++ b/mappings/net/minecraft/network/handler/INetworkGameHandlerServer.mapping @@ -51,3 +51,5 @@ CLASS none/il net/minecraft/network/handler/INetworkGameHandlerServer ARG 0 packet METHOD a onPlayerBlockPlace (Lnone/jl;)V ARG 0 packet + METHOD a onPlayerSwingHand (Lnone/jm;)V + ARG 0 packet diff --git a/mappings/net/minecraft/network/handler/INetworkLoginHandlerClient.mapping b/mappings/net/minecraft/network/handler/INetworkLoginHandlerClient.mapping index a5039db6a2..76a227b7da 100644 --- a/mappings/net/minecraft/network/handler/INetworkLoginHandlerClient.mapping +++ b/mappings/net/minecraft/network/handler/INetworkLoginHandlerClient.mapping @@ -4,5 +4,6 @@ CLASS none/jr net/minecraft/network/handler/INetworkLoginHandlerClient METHOD a onLoginEncryptionRequest (Lnone/jt;)V ARG 0 packet METHOD a onLoginCompression (Lnone/ju;)V + ARG 0 packet METHOD a onLoginDisconnect (Lnone/jv;)V ARG 0 packet diff --git a/mappings/net/minecraft/network/handler/impl/NetworkGameHandlerServer.mapping b/mappings/net/minecraft/network/handler/impl/NetworkGameHandlerServer.mapping index 05a6e20b74..7fc4c3a7dd 100644 --- a/mappings/net/minecraft/network/handler/impl/NetworkGameHandlerServer.mapping +++ b/mappings/net/minecraft/network/handler/impl/NetworkGameHandlerServer.mapping @@ -69,6 +69,8 @@ CLASS none/mg net/minecraft/network/handler/impl/NetworkGameHandlerServer ARG 0 packet METHOD a onPlayerBlockPlace (Lnone/jl;)V ARG 0 packet + METHOD a onPlayerSwingHand (Lnone/jm;)V + ARG 0 packet METHOD b isInvalidPlayerUpdate (Lnone/iy;)Z METHOD b isInvalidEntityVehicleMove (Lnone/iz;)Z METHOD c kick (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/network/packet/client/CPacketEntityAttributes.mapping b/mappings/net/minecraft/network/packet/client/CPacketEntityAttributes.mapping new file mode 100644 index 0000000000..e0fe970de9 --- /dev/null +++ b/mappings/net/minecraft/network/packet/client/CPacketEntityAttributes.mapping @@ -0,0 +1,27 @@ +CLASS none/ij net/minecraft/network/packet/client/CPacketEntityAttributes + CLASS none/ij$a Entry + FIELD b id Ljava/lang/String; + FIELD c baseValue D + FIELD d modifiers Ljava/util/Collection; + METHOD (Lnone/ij;Ljava/lang/String;DLjava/util/Collection;)V + ARG 0 id + ARG 1 baseValue + ARG 2 modifiers + METHOD a getId ()Ljava/lang/String; + METHOD b getBaseValue ()D + METHOD c getModifiers ()Ljava/util/Collection; + FIELD a id I + FIELD b entries Ljava/util/List; + METHOD (ILjava/util/Collection;)V + ARG 0 id + ARG 1 instances + METHOD a getEntityId ()I + METHOD a readPacket (Lnone/es;)V + ARG 0 packet + METHOD a applyPacket (Lnone/ev;)V + ARG 0 handler + METHOD a applyPacket (Lnone/fo;)V + ARG 0 handler + METHOD b getEntries ()Ljava/util/List; + METHOD b writePacket (Lnone/es;)V + ARG 0 packet diff --git a/mappings/none/jm.mapping b/mappings/net/minecraft/network/packet/server/SPacketPlayerSwingHand.mapping similarity index 80% rename from mappings/none/jm.mapping rename to mappings/net/minecraft/network/packet/server/SPacketPlayerSwingHand.mapping index c0c8c189b4..db6c5a268c 100644 --- a/mappings/none/jm.mapping +++ b/mappings/net/minecraft/network/packet/server/SPacketPlayerSwingHand.mapping @@ -1,4 +1,4 @@ -CLASS none/jm +CLASS none/jm net/minecraft/network/packet/server/SPacketPlayerSwingHand FIELD a hand Lnone/ra; METHOD (Lnone/ra;)V ARG 0 hand diff --git a/mappings/net/minecraft/sortme/AttributesSomething.mapping b/mappings/net/minecraft/sortme/AttributesSomething.mapping deleted file mode 100644 index 98af16f864..0000000000 --- a/mappings/net/minecraft/sortme/AttributesSomething.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/zs net/minecraft/sortme/AttributesSomething - FIELD j LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/sortme/IScoreboardObjective.mapping b/mappings/net/minecraft/sortme/IScoreboardObjective.mapping index 4c18869536..139bddf37d 100644 --- a/mappings/net/minecraft/sortme/IScoreboardObjective.mapping +++ b/mappings/net/minecraft/sortme/IScoreboardObjective.mapping @@ -22,4 +22,5 @@ CLASS none/bdg net/minecraft/sortme/IScoreboardObjective FIELD k XP Lnone/bdg; FIELD l LEVEL Lnone/bdg; METHOD a getName ()Ljava/lang/String; + METHOD b isReadOnly ()Z METHOD c getType ()Lnone/bdg$a; diff --git a/mappings/net/minecraft/sortme/OptionMainHand.mapping b/mappings/net/minecraft/sortme/OptionMainHand.mapping index dc87b00f6f..db2988a007 100644 --- a/mappings/net/minecraft/sortme/OptionMainHand.mapping +++ b/mappings/net/minecraft/sortme/OptionMainHand.mapping @@ -1,5 +1,7 @@ CLASS none/sn net/minecraft/sortme/OptionMainHand FIELD a LEFT Lnone/sn; FIELD b RIGHT Lnone/sn; - FIELD c optionName Lnone/fa; + FIELD c name Lnone/fa; + METHOD (Ljava/lang/String;ILnone/fa;)V + ARG 0 name METHOD a getOpposite ()Lnone/sn; diff --git a/mappings/net/minecraft/sortme/PlayerHungerManager.mapping b/mappings/net/minecraft/sortme/PlayerHungerManager.mapping deleted file mode 100644 index ac4b4d7ca9..0000000000 --- a/mappings/net/minecraft/sortme/PlayerHungerManager.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/abu net/minecraft/sortme/PlayerHungerManager diff --git a/mappings/net/minecraft/sortme/PositionImpl.mapping b/mappings/net/minecraft/sortme/PositionImpl.mapping deleted file mode 100644 index 772a53f9de..0000000000 --- a/mappings/net/minecraft/sortme/PositionImpl.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS none/df net/minecraft/sortme/PositionImpl - FIELD a x D - FIELD b y D - FIELD c z D - METHOD (DDD)V - ARG 0 x - ARG 1 y - ARG 2 z - METHOD a getX ()D - METHOD b getY ()D - METHOD c getZ ()D diff --git a/mappings/net/minecraft/sortme/ScoreboardObjective.mapping b/mappings/net/minecraft/sortme/ScoreboardObjective.mapping index 374314be37..cba4b9a112 100644 --- a/mappings/net/minecraft/sortme/ScoreboardObjective.mapping +++ b/mappings/net/minecraft/sortme/ScoreboardObjective.mapping @@ -1,4 +1,5 @@ CLASS none/bde net/minecraft/sortme/ScoreboardObjective METHOD (Ljava/lang/String;)V METHOD a getName ()Ljava/lang/String; + METHOD b isReadOnly ()Z METHOD c getType ()Lnone/bdg$a; diff --git a/mappings/net/minecraft/sortme/ScoreboardObjectiveHearts.mapping b/mappings/net/minecraft/sortme/ScoreboardObjectiveHearts.mapping new file mode 100644 index 0000000000..b7b2b61244 --- /dev/null +++ b/mappings/net/minecraft/sortme/ScoreboardObjectiveHearts.mapping @@ -0,0 +1,3 @@ +CLASS none/bdf net/minecraft/sortme/ScoreboardObjectiveHearts + METHOD b isReadOnly ()Z + METHOD c getType ()Lnone/bdg$a; diff --git a/mappings/net/minecraft/sortme/ScoreboardObjectiveReadOnly.mapping b/mappings/net/minecraft/sortme/ScoreboardObjectiveReadOnly.mapping new file mode 100644 index 0000000000..53482048dc --- /dev/null +++ b/mappings/net/minecraft/sortme/ScoreboardObjectiveReadOnly.mapping @@ -0,0 +1,2 @@ +CLASS none/bdh net/minecraft/sortme/ScoreboardObjectiveReadOnly + METHOD b isReadOnly ()Z diff --git a/mappings/none/lv.mapping b/mappings/net/minecraft/sortme/WorldListenerServer.mapping similarity index 78% rename from mappings/none/lv.mapping rename to mappings/net/minecraft/sortme/WorldListenerServer.mapping index 861d0d4be2..341df81547 100644 --- a/mappings/none/lv.mapping +++ b/mappings/net/minecraft/sortme/WorldListenerServer.mapping @@ -1,7 +1,9 @@ -CLASS none/lv +CLASS none/lv net/minecraft/sortme/WorldListenerServer FIELD a server Lnet/minecraft/server/MinecraftServer; FIELD b world Lnone/lu; METHOD a onSpawnParticle (IZDDDDDD[I)V + ARG 0 typeId + ARG 1 ignoreRange METHOD a onPlaySound (Lnone/aal;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound diff --git a/mappings/net/minecraft/util/CaseInsensitiveHashMap.mapping b/mappings/net/minecraft/util/CaseInsensitiveHashMap.mapping new file mode 100644 index 0000000000..9bda7cdca2 --- /dev/null +++ b/mappings/net/minecraft/util/CaseInsensitiveHashMap.mapping @@ -0,0 +1,3 @@ +CLASS none/ok net/minecraft/util/CaseInsensitiveHashMap + FIELD a parent Ljava/util/Map; + METHOD a (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/math/BlockPointer.mapping b/mappings/net/minecraft/util/math/BlockPointer.mapping index c93d9ac4fd..b542014f91 100644 --- a/mappings/net/minecraft/util/math/BlockPointer.mapping +++ b/mappings/net/minecraft/util/math/BlockPointer.mapping @@ -1,7 +1,13 @@ -CLASS none/co net/minecraft/util/math/BlockPointer +CLASS none/cp net/minecraft/util/math/BlockPointer + FIELD a world Lnone/aiv; + FIELD b pos Lnone/cn; + METHOD (Lnone/aiv;Lnone/cn;)V + ARG 0 world + ARG 1 pos METHOD a getX ()D METHOD b getY ()D METHOD c getZ ()D METHOD d getBlockPos ()Lnone/cn; METHOD e getBlockState ()Lnone/asl; METHOD g getTileEntity ()Lnone/ard; + METHOD h getWorld ()Lnone/aiv; diff --git a/mappings/net/minecraft/util/math/BlockPointerImpl.mapping b/mappings/net/minecraft/util/math/BlockPointerImpl.mapping deleted file mode 100644 index da09a17c77..0000000000 --- a/mappings/net/minecraft/util/math/BlockPointerImpl.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS none/cp net/minecraft/util/math/BlockPointerImpl - FIELD a world Lnone/aiv; - FIELD b pos Lnone/cn; - METHOD (Lnone/aiv;Lnone/cn;)V - ARG 0 world - ARG 1 pos - METHOD a getX ()D - METHOD b getY ()D - METHOD c getZ ()D - METHOD d getBlockPos ()Lnone/cn; - METHOD e getBlockState ()Lnone/asl; - METHOD g getTileEntity ()Lnone/ard; - METHOD h getWorld ()Lnone/aiv; diff --git a/mappings/net/minecraft/util/math/IBlockPointer.mapping b/mappings/net/minecraft/util/math/IBlockPointer.mapping new file mode 100644 index 0000000000..a7a440bc6f --- /dev/null +++ b/mappings/net/minecraft/util/math/IBlockPointer.mapping @@ -0,0 +1,7 @@ +CLASS none/co net/minecraft/util/math/IBlockPointer + METHOD a getX ()D + METHOD b getY ()D + METHOD c getZ ()D + METHOD d getBlockPos ()Lnone/cn; + METHOD e getBlockState ()Lnone/asl; + METHOD g getTileEntity ()Lnone/ard; diff --git a/mappings/net/minecraft/util/math/IPosition.mapping b/mappings/net/minecraft/util/math/IPosition.mapping new file mode 100644 index 0000000000..509185c2c7 --- /dev/null +++ b/mappings/net/minecraft/util/math/IPosition.mapping @@ -0,0 +1,4 @@ +CLASS none/de net/minecraft/util/math/IPosition + METHOD a getX ()D + METHOD b getY ()D + METHOD c getZ ()D diff --git a/mappings/net/minecraft/util/math/IWorldPosition.mapping b/mappings/net/minecraft/util/math/IWorldPosition.mapping new file mode 100644 index 0000000000..2851a57681 --- /dev/null +++ b/mappings/net/minecraft/util/math/IWorldPosition.mapping @@ -0,0 +1,2 @@ +CLASS none/cz net/minecraft/util/math/IWorldPosition + METHOD h getWorld ()Lnone/aiv; diff --git a/mappings/net/minecraft/util/math/Position.mapping b/mappings/net/minecraft/util/math/Position.mapping index 1996d8fea8..ef784ec48a 100644 --- a/mappings/net/minecraft/util/math/Position.mapping +++ b/mappings/net/minecraft/util/math/Position.mapping @@ -1,4 +1,11 @@ -CLASS none/de net/minecraft/util/math/Position +CLASS none/df net/minecraft/util/math/Position + FIELD a x D + FIELD b y D + FIELD c z D + METHOD (DDD)V + ARG 0 x + ARG 1 y + ARG 2 z METHOD a getX ()D METHOD b getY ()D METHOD c getZ ()D diff --git a/mappings/net/minecraft/util/math/WorldPosition.mapping b/mappings/net/minecraft/util/math/WorldPosition.mapping deleted file mode 100644 index 1b5066b28d..0000000000 --- a/mappings/net/minecraft/util/math/WorldPosition.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/cz net/minecraft/util/math/WorldPosition - METHOD h getWorld ()Lnone/aiv; diff --git a/mappings/net/minecraft/world/IWorldListener.mapping b/mappings/net/minecraft/world/IWorldListener.mapping index a38f3e8079..4f3b46f5ec 100644 --- a/mappings/net/minecraft/world/IWorldListener.mapping +++ b/mappings/net/minecraft/world/IWorldListener.mapping @@ -1,5 +1,7 @@ CLASS none/aix net/minecraft/world/IWorldListener METHOD a onSpawnParticle (IZDDDDDD[I)V + ARG 0 typeId + ARG 1 ignoreRange METHOD a onPlaySound (Lnone/aal;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 5d8836a956..ddc461cd98 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -56,7 +56,7 @@ CLASS none/aiv net/minecraft/world/World ARG 1 chunkZ METHOD a spawnParticle (IZDDDDDD[I)V ARG 0 typeId - ARG 1 shouldIgnoreRange + ARG 1 ignoreRange METHOD a setTime (J)V ARG 0 value METHOD a getEntitiesIn (Ljava/lang/Class;Lnone/bcr;)Ljava/util/List; @@ -109,7 +109,7 @@ CLASS none/aiv net/minecraft/world/World ARG 0 type METHOD a spawnParticle (Lnone/dd;ZDDDDDD[I)V ARG 0 type - ARG 1 shouldIgnoreRange + ARG 1 ignoreRange METHOD a sendPacket (Lnone/fl;)V ARG 0 packet METHOD a spawnEntity (Lnone/sf;)Z @@ -154,7 +154,7 @@ CLASS none/aiv net/minecraft/world/World ARG 0 pos ARG 1 facingFrom METHOD b sendBlockUpdate (Lnone/cn;Z)Z - METHOD b onEntitySpawn (Lnone/sf;)V + METHOD b onSpawnEntity (Lnone/sf;)V ARG 0 entity METHOD c (Lnone/cn;)Lnone/asl; METHOD c getEmittedRedstonePower (Lnone/cn;Lnone/cu;)I diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index 62acee3811..9af8c2c18f 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -24,7 +24,7 @@ CLASS none/lu net/minecraft/world/WorldServer METHOD a (ZLnone/ot;)V METHOD aE isMainThread ()Z METHOD b getWorld ()Lnone/aiv; - METHOD b onEntitySpawn (Lnone/sf;)V + METHOD b onSpawnEntity (Lnone/sf;)V ARG 0 entity METHOD e updateSleepingStatus ()V METHOD k updateEntities ()V diff --git a/mappings/net/minecraft/world/provider/DimensionProvider.mapping b/mappings/net/minecraft/world/provider/DimensionProvider.mapping index 58ff490dda..2cb380fc7e 100644 --- a/mappings/net/minecraft/world/provider/DimensionProvider.mapping +++ b/mappings/net/minecraft/world/provider/DimensionProvider.mapping @@ -10,6 +10,7 @@ CLASS none/aue net/minecraft/world/provider/DimensionProvider METHOD b getFogColor (FF)Lnone/bcu; METHOD c getChunkGenerator ()Lnone/ati; METHOD d hasClouds ()Z + METHOD m ()Z METHOD n getLightValues ()[F METHOD o createWorldBorderHandler ()Lnone/atf; METHOD p getDimensionType ()Lnone/auf; diff --git a/mappings/none/bdd.mapping b/mappings/none/bdd.mapping index c1d8330e98..abe6bcabaa 100644 --- a/mappings/none/bdd.mapping +++ b/mappings/none/bdd.mapping @@ -1,3 +1,5 @@ CLASS none/bdd + FIELD o formattedName Ljava/lang/String; METHOD a getName ()Ljava/lang/String; + METHOD b isReadOnly ()Z METHOD c getType ()Lnone/bdg$a; diff --git a/mappings/none/bdf.mapping b/mappings/none/bdf.mapping deleted file mode 100644 index 2451290ec3..0000000000 --- a/mappings/none/bdf.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/bdf - METHOD c getType ()Lnone/bdg$a; diff --git a/mappings/none/bpa.mapping b/mappings/none/bpa.mapping index 6f253bbb77..81cc4d5e5a 100644 --- a/mappings/none/bpa.mapping +++ b/mappings/none/bpa.mapping @@ -8,6 +8,8 @@ CLASS none/bpa FIELD h mc Lnone/bdq; FIELD z destroyStages [Lnone/bxd; METHOD a onSpawnParticle (IZDDDDDD[I)V + ARG 0 typeId + ARG 1 ignoreRange METHOD a onPlaySound (Lnone/aal;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound diff --git a/mappings/none/ij.mapping b/mappings/none/ij.mapping deleted file mode 100644 index 7a7609c46d..0000000000 --- a/mappings/none/ij.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS none/ij - CLASS none/ij$a Entry - FIELD a id I - FIELD b entries Ljava/util/List; - METHOD (ILjava/util/Collection;)V - ARG 0 id - METHOD a getEntityId ()I - METHOD a readPacket (Lnone/es;)V - ARG 0 packet - METHOD a applyPacket (Lnone/ev;)V - ARG 0 handler - METHOD a applyPacket (Lnone/fo;)V - ARG 0 handler - METHOD b getEntries ()Ljava/util/List; - METHOD b writePacket (Lnone/es;)V - ARG 0 packet diff --git a/mappings/none/vw.mapping b/mappings/none/vw.mapping index c76bb4cceb..2d85db667d 100644 --- a/mappings/none/vw.mapping +++ b/mappings/none/vw.mapping @@ -1,5 +1,7 @@ CLASS none/vw METHOD a onSpawnParticle (IZDDDDDD[I)V + ARG 0 typeId + ARG 1 ignoreRange METHOD a onPlaySound (Lnone/aal;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound