diff --git a/mappings/net/minecraft/block/entity/BlockEntityCommandBlock.mapping b/mappings/net/minecraft/block/entity/BlockEntityCommandBlock.mapping index f71d860e53..aaebae56da 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 getBlockPos ()Lnone/cn; + METHOD c ()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/BlockEntityDropper.mapping b/mappings/net/minecraft/block/entity/BlockEntityDropper.mapping index 8ebfee690c..53ba45f06b 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityDropper.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityDropper.mapping @@ -1,5 +1,5 @@ CLASS none/arl net/minecraft/block/entity/BlockEntityDropper - METHOD b registerTagUpgraders (Lnone/pf;)V + METHOD b registerTagUpgradersDropper (Lnone/pf;)V ARG 0 handler METHOD h_ getName ()Ljava/lang/String; METHOD l getContainerId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/entity/BlockEntitySign.mapping b/mappings/net/minecraft/block/entity/BlockEntitySign.mapping index a85d0cb100..0170aa7a79 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 getBlockPos ()Lnone/cn; + METHOD c ()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 getBlockPos ()Lnone/cn; + METHOD c ()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/BlockEntityStructureBlock.mapping b/mappings/net/minecraft/block/entity/BlockEntityStructureBlock.mapping index 42a25d8a26..8787ce7677 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityStructureBlock.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityStructureBlock.mapping @@ -18,7 +18,7 @@ CLASS none/ary net/minecraft/block/entity/BlockEntityStructureBlock FIELD a name Ljava/lang/String; FIELD f author Ljava/lang/String; FIELD g metadata Ljava/lang/String; - FIELD h pos Lnone/cn; + FIELD h offset Lnone/cn; FIELD i size Lnone/cn; FIELD j mirror Lnone/any; FIELD k rotation Lnone/apl; @@ -53,7 +53,8 @@ CLASS none/ary net/minecraft/block/entity/BlockEntityStructureBlock ARG 0 mirror METHOD b setRotation (Lnone/apl;)V ARG 0 value - METHOD b setPos (Lnone/cn;)V + METHOD b setOffset (Lnone/cn;)V + ARG 0 value METHOD b serialize (Lnone/dt;)Lnone/dt; ARG 0 tag METHOD c getUpdatePacket ()Lnone/fy; @@ -62,7 +63,7 @@ CLASS none/ary net/minecraft/block/entity/BlockEntityStructureBlock METHOD d serializeInitialChunkData ()Lnone/dt; METHOD d setPowered (Z)V ARG 0 value - METHOD e egetPos ()Lnone/cn; + METHOD e getOffset ()Lnone/cn; METHOD e setShowAir (Z)V ARG 0 value METHOD f getSize ()Lnone/cn; diff --git a/mappings/net/minecraft/block/entity/IHopper.mapping b/mappings/net/minecraft/block/entity/IHopper.mapping index 32f62cee14..8cb9c29010 100644 --- a/mappings/net/minecraft/block/entity/IHopper.mapping +++ b/mappings/net/minecraft/block/entity/IHopper.mapping @@ -1,5 +1,5 @@ CLASS none/arq net/minecraft/block/entity/IHopper - METHOD D getWorld ()Lnone/aiw; + METHOD D getHopperWorld ()Lnone/aiw; METHOD E getHopperX ()D METHOD F getHopperY ()D METHOD G getHopperZ ()D diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping index ddd8974130..3217977fa9 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 getBlockPos ()Lnone/cn; + METHOD c ()Lnone/cn; METHOD c setCurrentHand (Lnone/rb;)V METHOD cy ()Lnone/rb; METHOD d move (DDD)V diff --git a/mappings/net/minecraft/client/util/ModelIdentifier.mapping b/mappings/net/minecraft/client/util/ModelIdentifier.mapping index 5f74eaf76c..3b6a49f2be 100644 --- a/mappings/net/minecraft/client/util/ModelIdentifier.mapping +++ b/mappings/net/minecraft/client/util/ModelIdentifier.mapping @@ -3,7 +3,8 @@ CLASS none/bzr net/minecraft/client/util/ModelIdentifier METHOD (Lnone/kp;Ljava/lang/String;)V ARG 0 id ARG 1 variant - METHOD b split (Ljava/lang/String;)[Ljava/lang/String; + METHOD b splitWithVariant (Ljava/lang/String;)[Ljava/lang/String; + ARG 0 str METHOD c getVariant ()Ljava/lang/String; METHOD equals (Ljava/lang/Object;)Z ARG 0 other diff --git a/mappings/net/minecraft/command/CommandExecute.mapping b/mappings/net/minecraft/command/CommandExecute.mapping index 662413041e..1e57ef8a37 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 getBlockPos ()Lnone/cn; + METHOD c ()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 96335a200e..c3e498d9d3 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 getBlockPos ()Lnone/cn; + METHOD c ()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 071a0bd8b2..3bd54fd024 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 getBlockPos ()Lnone/cn; + METHOD c ()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 8e2a427c99..425cee35ae 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -227,7 +227,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 getBlockPos ()Lnone/cn; + METHOD c ()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/EntityFallingBlock.mapping b/mappings/net/minecraft/entity/EntityFallingBlock.mapping index 7c98d3bb21..f7805c4875 100644 --- a/mappings/net/minecraft/entity/EntityFallingBlock.mapping +++ b/mappings/net/minecraft/entity/EntityFallingBlock.mapping @@ -14,7 +14,7 @@ CLASS none/yz net/minecraft/entity/EntityFallingBlock ARG 4 block METHOD a addCrashReportDetails (Lnone/c;)V ARG 0 element - METHOD a setBlockPos (Lnone/cn;)V + METHOD a setFallingBlockPos (Lnone/cn;)V ARG 0 pos METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag @@ -27,7 +27,7 @@ CLASS none/yz net/minecraft/entity/EntityFallingBlock METHOD e handleFallDamage (FF)V ARG 0 fallDistance METHOD i initDataTracker ()V - METHOD j getBlockPos ()Lnone/cn; + METHOD j getFallingBlockPos ()Lnone/cn; METHOD k getWorldClient ()Lnone/aiw; METHOD l getBlockState ()Lnone/asm; METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/mob/EntityGuardian.mapping b/mappings/net/minecraft/entity/mob/EntityGuardian.mapping index efc21f99f8..2993daf471 100644 --- a/mappings/net/minecraft/entity/mob/EntityGuardian.mapping +++ b/mappings/net/minecraft/entity/mob/EntityGuardian.mapping @@ -16,7 +16,7 @@ CLASS none/zn net/minecraft/entity/mob/EntityGuardian METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; METHOD bq getEyeHeight ()F - METHOD c registerTagUpgraders (Lnone/pf;)V + METHOD c registerTagUpgraders2 (Lnone/pf;)V ARG 0 handler METHOD i initDataTracker ()V METHOD n updateMovement ()V diff --git a/mappings/net/minecraft/entity/mob/EntityMob.mapping b/mappings/net/minecraft/entity/mob/EntityMob.mapping index d130e55079..acd4cb7599 100644 --- a/mappings/net/minecraft/entity/mob/EntityMob.mapping +++ b/mappings/net/minecraft/entity/mob/EntityMob.mapping @@ -26,7 +26,7 @@ CLASS none/sq net/minecraft/entity/mob/EntityMob ARG 1 playerHand METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag - METHOD a registerTagUpgraders (Lnone/pf;Ljava/lang/Class;)V + METHOD a registerTagUpgradersFor (Lnone/pf;Ljava/lang/Class;)V ARG 0 handler ARG 1 entityClass METHOD a startRiding (Lnone/sg;Z)Z diff --git a/mappings/net/minecraft/entity/mob/EntitySlime.mapping b/mappings/net/minecraft/entity/mob/EntitySlime.mapping index bf404f21ba..b49764e406 100644 --- a/mappings/net/minecraft/entity/mob/EntitySlime.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySlime.mapping @@ -26,7 +26,7 @@ CLASS none/zx net/minecraft/entity/mob/EntitySlime METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; METHOD bq getEyeHeight ()F - METHOD c registerTagUpgraders (Lnone/pf;)V + METHOD c registerTagUpgraders2 (Lnone/pf;)V ARG 0 handler METHOD ch getSoundVolume ()F METHOD df getSize ()I diff --git a/mappings/net/minecraft/entity/mob/EntitySpider.mapping b/mappings/net/minecraft/entity/mob/EntitySpider.mapping index 14c7891493..f7f51dc037 100644 --- a/mappings/net/minecraft/entity/mob/EntitySpider.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySpider.mapping @@ -12,7 +12,7 @@ CLASS none/zy net/minecraft/entity/mob/EntitySpider METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; METHOD bq getEyeHeight ()F - METHOD c registerTagUpgraders (Lnone/pf;)V + METHOD c registerTagUpgraders2 (Lnone/pf;)V ARG 0 handler METHOD i initDataTracker ()V METHOD m_ canClimb ()Z diff --git a/mappings/net/minecraft/entity/mob/EntityZombie.mapping b/mappings/net/minecraft/entity/mob/EntityZombie.mapping index f63afd47d2..57d63000ae 100644 --- a/mappings/net/minecraft/entity/mob/EntityZombie.mapping +++ b/mappings/net/minecraft/entity/mob/EntityZombie.mapping @@ -21,7 +21,7 @@ CLASS none/aac net/minecraft/entity/mob/EntityZombie METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; METHOD bq getEyeHeight ()F - METHOD c registerTagUpgraders (Lnone/pf;)V + METHOD c registerTagUpgraders2 (Lnone/pf;)V ARG 0 handler METHOD dj hasArmsRaised ()Z METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/EntityMooshroom.mapping b/mappings/net/minecraft/entity/passive/EntityMooshroom.mapping index 49fe542bc9..a84cc9675a 100644 --- a/mappings/net/minecraft/entity/passive/EntityMooshroom.mapping +++ b/mappings/net/minecraft/entity/passive/EntityMooshroom.mapping @@ -7,7 +7,7 @@ CLASS none/wr net/minecraft/entity/passive/EntityMooshroom ARG 0 other METHOD b createChild (Lnone/sd;)Lnone/wp; ARG 0 other - METHOD c registerTagUpgraders (Lnone/pf;)V + METHOD c registerTagUpgraders2 (Lnone/pf;)V ARG 0 handler METHOD c createChild (Lnone/sd;)Lnone/wr; ARG 0 other diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index bc0f223062..74d97395cc 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 getBlockPos ()Lnone/cn; + METHOD c ()Lnone/cn; METHOD c changeWorld (I)Lnone/sg; ARG 0 worldId METHOD di isPvpEnabled ()Z diff --git a/mappings/net/minecraft/entity/projectile/EntityArrow.mapping b/mappings/net/minecraft/entity/projectile/EntityArrow.mapping index 444496f53b..d01be1e3f5 100644 --- a/mappings/net/minecraft/entity/projectile/EntityArrow.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityArrow.mapping @@ -20,7 +20,7 @@ CLASS none/abg net/minecraft/entity/projectile/EntityArrow ARG 0 entity METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag - METHOD c registerTagUpgraders (Lnone/pf;)V + METHOD c registerTagUpgraders2 (Lnone/pf;)V ARG 0 handler METHOD i initDataTracker ()V METHOD j asItemStack ()Lnone/aes; diff --git a/mappings/net/minecraft/entity/projectile/EntitySpectralArrow.mapping b/mappings/net/minecraft/entity/projectile/EntitySpectralArrow.mapping index 319c84bb67..0497172461 100644 --- a/mappings/net/minecraft/entity/projectile/EntitySpectralArrow.mapping +++ b/mappings/net/minecraft/entity/projectile/EntitySpectralArrow.mapping @@ -5,7 +5,7 @@ CLASS none/aba net/minecraft/entity/projectile/EntitySpectralArrow ARG 0 entity METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag - METHOD c registerTagUpgraders (Lnone/pf;)V + METHOD c registerTagUpgraders2 (Lnone/pf;)V ARG 0 handler METHOD j asItemStack ()Lnone/aes; METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/vehicle/EntityCommandBlockMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityCommandBlockMinecart.mapping index 01bc119922..d9c51d4637 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 getBlockPos ()Lnone/cn; + METHOD c ()Lnone/cn; METHOD d getPos ()Lnone/bcv; METHOD e getWorld ()Lnone/aiw; METHOD f getEntity ()Lnone/sg; diff --git a/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping index 7c7d5ca4be..efaf58ff6d 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping @@ -3,7 +3,7 @@ CLASS none/abp net/minecraft/entity/vehicle/EntityHopperMinecart FIELD b transferCooldown I FIELD c currentBlockPos Lnone/cn; METHOD C isEnabled ()Z - METHOD D getWorld ()Lnone/aiw; + METHOD D getHopperWorld ()Lnone/aiw; METHOD E getHopperX ()D METHOD F getHopperY ()D METHOD G getHopperZ ()D diff --git a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping index 59cc5c396e..10d3552ebc 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping @@ -49,7 +49,7 @@ CLASS none/abk net/minecraft/entity/vehicle/EntityMinecartBase ARG 0 value METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag - METHOD a registerTagUpgradersFor (Lnone/pf;Ljava/lang/Class;)V + METHOD a registerTagUpgradersForStorage (Lnone/pf;Ljava/lang/Class;)V ARG 0 handler ARG 1 minecartClass METHOD a (Lnone/rr;)V diff --git a/mappings/net/minecraft/scoreboard/ScoreboardServer.mapping b/mappings/net/minecraft/scoreboard/ScoreboardServer.mapping index bedd94ac3b..cdbfb15694 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardServer.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardServer.mapping @@ -41,6 +41,7 @@ CLASS none/lb net/minecraft/scoreboard/ScoreboardServer ARG 0 objective METHOD f getPacketHandlersForObjectiveRemoval (Lnone/bcx;)Ljava/util/List; ARG 0 objective - METHOD g removeObjective (Lnone/bcx;)V + METHOD g removeKnownObjective (Lnone/bcx;)V + ARG 0 objective METHOD h getObjectiveDisplaySlot (Lnone/bcx;)I ARG 0 objective diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 52890bc5fd..dc36c69ee0 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 getBlockPos ()Lnone/cn; + METHOD c ()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 b3e03eef20..f95cf55485 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 getBlockPos ()Lnone/cn; + METHOD c ()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 b828388a5a..09682b260b 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 getBlockPos ()Lnone/cn; + METHOD c ()Lnone/cn; METHOD n updateMovement ()V METHOD y_ update ()V