diff --git a/mappings/net/minecraft/block/BlockBeetroots.mapping b/mappings/net/minecraft/block/BlockBeetroots.mapping index 422241f778..e581547fcc 100644 --- a/mappings/net/minecraft/block/BlockBeetroots.mapping +++ b/mappings/net/minecraft/block/BlockBeetroots.mapping @@ -1,5 +1,5 @@ CLASS none/akx net/minecraft/block/BlockBeetroots - FIELD a AGE Lnone/atb; + FIELD a AGE_BEETROOTS Lnone/atb; FIELD d BOUNDING_BOXES [Lnone/bcs; METHOD b createStateFactory ()Lnone/asn; METHOD b (Lnone/aiw;)I diff --git a/mappings/net/minecraft/block/BlockLogBase.mapping b/mappings/net/minecraft/block/BlockLogBase.mapping index b31409eba1..0d221f3fda 100644 --- a/mappings/net/minecraft/block/BlockLogBase.mapping +++ b/mappings/net/minecraft/block/BlockLogBase.mapping @@ -10,7 +10,7 @@ CLASS none/anv net/minecraft/block/BlockLogBase METHOD a byFacingAxis (Lnone/cu$a;)Lnone/anv$a; ARG 0 axis METHOD m asString ()Ljava/lang/String; - FIELD a AXIS Lnone/ata; + FIELD a AXIS_LOG Lnone/ata; METHOD a getStateForPlacement (Lnone/aiw;Lnone/cn;Lnone/cu;FFFILnone/sp;)Lnone/asm; ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/BlockTallGrass.mapping b/mappings/net/minecraft/block/BlockTallGrass.mapping index a7f40d8b7f..e92a5f1104 100644 --- a/mappings/net/minecraft/block/BlockTallGrass.mapping +++ b/mappings/net/minecraft/block/BlockTallGrass.mapping @@ -13,7 +13,7 @@ CLASS none/aqk net/minecraft/block/BlockTallGrass METHOD m asString ()Ljava/lang/String; METHOD values values ()[Lnone/aqk$a; FIELD a TYPE Lnone/ata; - FIELD c BOX Lnone/bcs; + FIELD c BOX_TALL_GRASS Lnone/bcs; METHOD a deserializeState (I)Lnone/asm; ARG 0 meta METHOD a getDropAmount (ILjava/util/Random;)I diff --git a/mappings/net/minecraft/block/BlockWaterlily.mapping b/mappings/net/minecraft/block/BlockWaterlily.mapping index df4602218b..8b280110f6 100644 --- a/mappings/net/minecraft/block/BlockWaterlily.mapping +++ b/mappings/net/minecraft/block/BlockWaterlily.mapping @@ -1,5 +1,5 @@ CLASS none/aqu net/minecraft/block/BlockWaterlily - FIELD a BOX Lnone/bcs; + FIELD a BOX_WATERLILY Lnone/bcs; METHOD a (Lnone/aiw;Lnone/cn;Lnone/asm;Lnone/sg;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/entity/BlockEntityCommandBlock.mapping b/mappings/net/minecraft/block/entity/BlockEntityCommandBlock.mapping index aaebae56da..f71d860e53 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityCommandBlock.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityCommandBlock.mapping @@ -2,7 +2,7 @@ CLASS none/arh net/minecraft/block/entity/BlockEntityCommandBlock CLASS none/arh$1 METHOD a setCommand (Ljava/lang/String;)V ARG 0 command - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcv; METHOD e getWorld ()Lnone/aiw; METHOD f getEntity ()Lnone/sg; diff --git a/mappings/net/minecraft/block/entity/BlockEntitySign.mapping b/mappings/net/minecraft/block/entity/BlockEntitySign.mapping index 0170aa7a79..a85d0cb100 100644 --- a/mappings/net/minecraft/block/entity/BlockEntitySign.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntitySign.mapping @@ -8,7 +8,7 @@ CLASS none/arw net/minecraft/block/entity/BlockEntitySign METHOD a updateCommandStat (Lnone/o$a;I)V ARG 0 statType ARG 1 statValue - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcv; METHOD e getWorld ()Lnone/aiw; METHOD f getEntity ()Lnone/sg; @@ -25,7 +25,7 @@ CLASS none/arw net/minecraft/block/entity/BlockEntitySign METHOD a updateCommandStat (Lnone/o$a;I)V ARG 0 statType ARG 1 statValue - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcv; METHOD e getWorld ()Lnone/aiw; METHOD f getEntity ()Lnone/sg; diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping index 3217977fa9..ddd8974130 100644 --- a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping +++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping @@ -53,7 +53,7 @@ CLASS none/boh net/minecraft/client/player/EntityPlayerClient METHOD aM isSneaking ()Z METHOD b heal (F)V ARG 0 amount - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD c setCurrentHand (Lnone/rb;)V METHOD cy ()Lnone/rb; METHOD d move (DDD)V diff --git a/mappings/net/minecraft/command/CommandExecute.mapping b/mappings/net/minecraft/command/CommandExecute.mapping index 1e57ef8a37..662413041e 100644 --- a/mappings/net/minecraft/command/CommandExecute.mapping +++ b/mappings/net/minecraft/command/CommandExecute.mapping @@ -8,7 +8,7 @@ CLASS none/ae net/minecraft/command/CommandExecute METHOD a updateCommandStat (Lnone/o$a;I)V ARG 0 statType ARG 1 statValue - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcv; METHOD e getWorld ()Lnone/aiw; METHOD f getEntity ()Lnone/sg; diff --git a/mappings/net/minecraft/command/CommandStatistics.mapping b/mappings/net/minecraft/command/CommandStatistics.mapping index c3e498d9d3..96335a200e 100644 --- a/mappings/net/minecraft/command/CommandStatistics.mapping +++ b/mappings/net/minecraft/command/CommandStatistics.mapping @@ -8,7 +8,7 @@ CLASS none/o net/minecraft/command/CommandStatistics METHOD a updateCommandStat (Lnone/o$a;I)V ARG 0 statType ARG 1 statValue - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcv; METHOD e getWorld ()Lnone/aiw; METHOD f getEntity ()Lnone/sg; diff --git a/mappings/net/minecraft/command/ICommandSender.mapping b/mappings/net/minecraft/command/ICommandSender.mapping index 3bd54fd024..071a0bd8b2 100644 --- a/mappings/net/minecraft/command/ICommandSender.mapping +++ b/mappings/net/minecraft/command/ICommandSender.mapping @@ -7,7 +7,7 @@ CLASS none/n net/minecraft/command/ICommandSender METHOD a updateCommandStat (Lnone/o$a;I)V ARG 0 statType ARG 1 statValue - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcv; METHOD e getWorld ()Lnone/aiw; METHOD f getEntity ()Lnone/sg; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 804d81435f..9f591e0388 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -234,7 +234,7 @@ CLASS none/sg net/minecraft/entity/Entity METHOD bt isImmuneToExplosion ()Z METHOD bx getPassengerList ()Ljava/util/List; METHOD bz getTopmostRiddenEntity ()Lnone/sg; - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD c changeWorld (I)Lnone/sg; ARG 0 worldId METHOD c setCustomName (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/entity/EntityExperienceOrb.mapping b/mappings/net/minecraft/entity/EntityExperienceOrb.mapping index a25867f8fc..c010cc4f39 100644 --- a/mappings/net/minecraft/entity/EntityExperienceOrb.mapping +++ b/mappings/net/minecraft/entity/EntityExperienceOrb.mapping @@ -1,5 +1,5 @@ CLASS none/sm net/minecraft/entity/EntityExperienceOrb - FIELD b age I + FIELD b xpAge I FIELD d health I FIELD e amount I METHOD (Lnone/aiw;DDDI)V diff --git a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping index 1f8b7f351a..2856334507 100644 --- a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping +++ b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping @@ -10,7 +10,7 @@ CLASS none/xr net/minecraft/entity/boss/EntityEnderDragon FIELD by partBody Lnone/xp; FIELD bz partTail1 Lnone/xp; METHOD G getSoundAmbient ()Lnone/nk; - METHOD a getWorld ()Lnone/aiw; + METHOD a getPartDamageWorld ()Lnone/aiw; METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onTrackedDataSet (Lnone/kj;)V diff --git a/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping b/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping index 18ca24882e..847a52ca95 100644 --- a/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping @@ -40,5 +40,8 @@ CLASS none/yo net/minecraft/entity/decoration/EntityDecorationBase ARG 1 deltaY ARG 2 deltaZ METHOD i initDataTracker ()V - METHOD q getBlockPos ()Lnone/cn; + METHOD l getWidthPixels ()I + METHOD n getHeightPixels ()I + METHOD o onDecorationPlaced ()V + METHOD q getDecorationBlockPos ()Lnone/cn; METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/decoration/EntityItemFrame.mapping b/mappings/net/minecraft/entity/decoration/EntityItemFrame.mapping index e18f3e3474..1e2b1f0ee2 100644 --- a/mappings/net/minecraft/entity/decoration/EntityItemFrame.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityItemFrame.mapping @@ -35,5 +35,8 @@ CLASS none/yp net/minecraft/entity/decoration/EntityItemFrame METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler METHOD i initDataTracker ()V + METHOD l getWidthPixels ()I + METHOD n getHeightPixels ()I + METHOD o onDecorationPlaced ()V METHOD r getHeldItemStack ()Lnone/aes; METHOD s getRotation ()I diff --git a/mappings/net/minecraft/entity/decoration/EntityLeashKnot.mapping b/mappings/net/minecraft/entity/decoration/EntityLeashKnot.mapping index 2158bad369..de08e84d23 100644 --- a/mappings/net/minecraft/entity/decoration/EntityLeashKnot.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityLeashKnot.mapping @@ -15,3 +15,6 @@ CLASS none/yq net/minecraft/entity/decoration/EntityLeashKnot METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD bq getEyeHeight ()F + METHOD l getWidthPixels ()I + METHOD n getHeightPixels ()I + METHOD o onDecorationPlaced ()V diff --git a/mappings/net/minecraft/entity/decoration/EntityPainting.mapping b/mappings/net/minecraft/entity/decoration/EntityPainting.mapping index 6fa564e499..19b90cb432 100644 --- a/mappings/net/minecraft/entity/decoration/EntityPainting.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityPainting.mapping @@ -2,6 +2,10 @@ CLASS none/yr net/minecraft/entity/decoration/EntityPainting CLASS none/yr$a Type FIELD A MAX_TITLE_LENGTH I FIELD B title Ljava/lang/String; + FIELD C width I + FIELD D height I + FIELD E u I + FIELD F v I FIELD a KEBAB Lnone/yr$a; FIELD b AZTEC Lnone/yr$a; FIELD c ALBAN Lnone/yr$a; @@ -28,7 +32,22 @@ CLASS none/yr net/minecraft/entity/decoration/EntityPainting FIELD x BURNING_SKULL Lnone/yr$a; FIELD y SKELETON Lnone/yr$a; FIELD z DONKEY_KONG Lnone/yr$a; + METHOD (Ljava/lang/String;ILjava/lang/String;IIII)V + ARG 0 title + ARG 1 width + ARG 2 height + ARG 3 u + ARG 4 v FIELD c type Lnone/yr$a; + METHOD (Lnone/aiw;Lnone/cn;Lnone/cu;)V + ARG 0 world + ARG 1 pos + ARG 2 facing + METHOD (Lnone/aiw;Lnone/cn;Lnone/cu;Ljava/lang/String;)V + ARG 0 world + ARG 1 pos + ARG 2 facing + ARG 3 title METHOD a (DDDFFIZ)V ARG 0 x ARG 1 y @@ -47,3 +66,6 @@ CLASS none/yr net/minecraft/entity/decoration/EntityPainting ARG 4 pitch METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD l getWidthPixels ()I + METHOD n getHeightPixels ()I + METHOD o onDecorationPlaced ()V diff --git a/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping b/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping index 5726f37604..66e01c4a2a 100644 --- a/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping +++ b/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping @@ -1,5 +1,5 @@ CLASS none/xo net/minecraft/entity/parts/IEntityPartDamageDelegate - METHOD a getWorld ()Lnone/aiw; + METHOD a getPartDamageWorld ()Lnone/aiw; METHOD a damage (Lnone/xp;Lnone/rr;F)Z ARG 0 part ARG 1 source diff --git a/mappings/net/minecraft/entity/passive/EntityPassive.mapping b/mappings/net/minecraft/entity/passive/EntityPassive.mapping index 62483f4675..e147dadc01 100644 --- a/mappings/net/minecraft/entity/passive/EntityPassive.mapping +++ b/mappings/net/minecraft/entity/passive/EntityPassive.mapping @@ -1,5 +1,5 @@ CLASS none/sd net/minecraft/entity/passive/EntityPassive - FIELD a age I + FIELD a breedingAge I FIELD bx CHILD Lnone/kj; METHOD a setSize (FF)V ARG 0 width @@ -15,9 +15,9 @@ CLASS none/sd net/minecraft/entity/passive/EntityPassive ARG 0 other METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag - METHOD b_ setAge (I)V + METHOD b_ setBreedingAge (I)V ARG 0 value METHOD i initDataTracker ()V - METHOD l getAge ()I + METHOD l getBreedingAge ()I METHOD l_ isChild ()Z METHOD n updateMovement ()V diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index 74d97395cc..bc0f223062 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -85,7 +85,7 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer ARG 0 tag METHOD b isInvulnerableTo (Lnone/rr;)Z ARG 0 source - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD c changeWorld (I)Lnone/sg; ARG 0 worldId METHOD di isPvpEnabled ()Z diff --git a/mappings/net/minecraft/entity/vehicle/EntityCommandBlockMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityCommandBlockMinecart.mapping index d9c51d4637..01bc119922 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityCommandBlockMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityCommandBlockMinecart.mapping @@ -1,6 +1,6 @@ CLASS none/abm net/minecraft/entity/vehicle/EntityCommandBlockMinecart CLASS none/abm$1 - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcv; METHOD e getWorld ()Lnone/aiw; METHOD f getEntity ()Lnone/sg; diff --git a/mappings/net/minecraft/item/block/ItemBlockMulti.mapping b/mappings/net/minecraft/item/block/ItemBlockMulti.mapping index 4f6ccfa916..863fe59021 100644 --- a/mappings/net/minecraft/item/block/ItemBlockMulti.mapping +++ b/mappings/net/minecraft/item/block/ItemBlockMulti.mapping @@ -5,7 +5,7 @@ CLASS none/afb net/minecraft/item/block/ItemBlockMulti CLASS none/afb$a VariantNameProvider METHOD a apply (Lnone/aes;)Ljava/lang/String; ARG 0 stack - FIELD b block Lnone/aky; + FIELD b block2 Lnone/aky; FIELD c variantNameProvider Lnone/afb$a; METHOD (Lnone/aky;Lnone/aky;Lnone/afb$a;)V ARG 0 block diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index dc36c69ee0..52890bc5fd 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -188,7 +188,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 snooper METHOD b setDemo (Z)V ARG 0 value - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD c setWorldHeight (I)V ARG 0 value METHOD c setServerIp (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/server/dedicated/ConsoleCommandSender.mapping b/mappings/net/minecraft/server/dedicated/ConsoleCommandSender.mapping index f95cf55485..b3e03eef20 100644 --- a/mappings/net/minecraft/server/dedicated/ConsoleCommandSender.mapping +++ b/mappings/net/minecraft/server/dedicated/ConsoleCommandSender.mapping @@ -11,7 +11,7 @@ CLASS none/nd net/minecraft/server/dedicated/ConsoleCommandSender METHOD a updateCommandStat (Lnone/o$a;I)V ARG 0 statType ARG 1 statValue - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD d getPos ()Lnone/bcv; METHOD e getWorld ()Lnone/aiw; METHOD f getEntity ()Lnone/sg; diff --git a/mappings/none/boi.mapping b/mappings/none/boi.mapping index 09682b260b..b828388a5a 100644 --- a/mappings/none/boi.mapping +++ b/mappings/none/boi.mapping @@ -13,6 +13,6 @@ CLASS none/boi METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage - METHOD c ()Lnone/cn; + METHOD c getBlockPos ()Lnone/cn; METHOD n updateMovement ()V METHOD y_ update ()V