mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix method conflicts

This commit is contained in:
asiekierka 2016-10-16 13:39:01 +02:00
parent 1c74fd5ee2
commit 0b94e1272b
28 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/block/entity/BlockEntityCommandBlock.mapping
View File

@ -2,7 +2,7 @@ CLASS none/arh net/minecraft/block/entity/BlockEntityCommandBlock
CLASS none/arh$1 CLASS none/arh$1
METHOD a setCommand (Ljava/lang/String;)V METHOD a setCommand (Ljava/lang/String;)V
ARG 0 command ARG 0 command
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD d getPos ()Lnone/bcv; METHOD d getPos ()Lnone/bcv;
METHOD e getWorld ()Lnone/aiw; METHOD e getWorld ()Lnone/aiw;
METHOD f getEntity ()Lnone/sg; METHOD f getEntity ()Lnone/sg;

2
mappings/net/minecraft/block/entity/BlockEntityDropper.mapping
View File

@ -1,5 +1,5 @@
CLASS none/arl net/minecraft/block/entity/BlockEntityDropper CLASS none/arl net/minecraft/block/entity/BlockEntityDropper
METHOD b registerTagUpgraders (Lnone/pf;)V METHOD b registerTagUpgradersDropper (Lnone/pf;)V
ARG 0 handler ARG 0 handler
METHOD h_ getName ()Ljava/lang/String; METHOD h_ getName ()Ljava/lang/String;
METHOD l getContainerId ()Ljava/lang/String; METHOD l getContainerId ()Ljava/lang/String;

4
mappings/net/minecraft/block/entity/BlockEntitySign.mapping
View File

@ -8,7 +8,7 @@ CLASS none/arw net/minecraft/block/entity/BlockEntitySign
METHOD a updateCommandStat (Lnone/o$a;I)V METHOD a updateCommandStat (Lnone/o$a;I)V
ARG 0 statType ARG 0 statType
ARG 1 statValue ARG 1 statValue
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD d getPos ()Lnone/bcv; METHOD d getPos ()Lnone/bcv;
METHOD e getWorld ()Lnone/aiw; METHOD e getWorld ()Lnone/aiw;
METHOD f getEntity ()Lnone/sg; 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 METHOD a updateCommandStat (Lnone/o$a;I)V
ARG 0 statType ARG 0 statType
ARG 1 statValue ARG 1 statValue
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD d getPos ()Lnone/bcv; METHOD d getPos ()Lnone/bcv;
METHOD e getWorld ()Lnone/aiw; METHOD e getWorld ()Lnone/aiw;
METHOD f getEntity ()Lnone/sg; METHOD f getEntity ()Lnone/sg;

7
mappings/net/minecraft/block/entity/BlockEntityStructureBlock.mapping
View File

@ -18,7 +18,7 @@ CLASS none/ary net/minecraft/block/entity/BlockEntityStructureBlock
FIELD a name Ljava/lang/String; FIELD a name Ljava/lang/String;
FIELD f author Ljava/lang/String; FIELD f author Ljava/lang/String;
FIELD g metadata 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 i size Lnone/cn;
FIELD j mirror Lnone/any; FIELD j mirror Lnone/any;
FIELD k rotation Lnone/apl; FIELD k rotation Lnone/apl;
@ -53,7 +53,8 @@ CLASS none/ary net/minecraft/block/entity/BlockEntityStructureBlock
ARG 0 mirror ARG 0 mirror
METHOD b setRotation (Lnone/apl;)V METHOD b setRotation (Lnone/apl;)V
ARG 0 value 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; METHOD b serialize (Lnone/dt;)Lnone/dt;
ARG 0 tag ARG 0 tag
METHOD c getUpdatePacket ()Lnone/fy; METHOD c getUpdatePacket ()Lnone/fy;
@ -62,7 +63,7 @@ CLASS none/ary net/minecraft/block/entity/BlockEntityStructureBlock
METHOD d serializeInitialChunkData ()Lnone/dt; METHOD d serializeInitialChunkData ()Lnone/dt;
METHOD d setPowered (Z)V METHOD d setPowered (Z)V
ARG 0 value ARG 0 value
METHOD e egetPos ()Lnone/cn; METHOD e getOffset ()Lnone/cn;
METHOD e setShowAir (Z)V METHOD e setShowAir (Z)V
ARG 0 value ARG 0 value
METHOD f getSize ()Lnone/cn; METHOD f getSize ()Lnone/cn;

2
mappings/net/minecraft/block/entity/IHopper.mapping
View File

@ -1,5 +1,5 @@
CLASS none/arq net/minecraft/block/entity/IHopper CLASS none/arq net/minecraft/block/entity/IHopper
METHOD D getWorld ()Lnone/aiw; METHOD D getHopperWorld ()Lnone/aiw;
METHOD E getHopperX ()D METHOD E getHopperX ()D
METHOD F getHopperY ()D METHOD F getHopperY ()D
METHOD G getHopperZ ()D METHOD G getHopperZ ()D

2
mappings/net/minecraft/client/player/EntityPlayerClient.mapping
View File

@ -53,7 +53,7 @@ CLASS none/boh net/minecraft/client/player/EntityPlayerClient
METHOD aM isSneaking ()Z METHOD aM isSneaking ()Z
METHOD b heal (F)V METHOD b heal (F)V
ARG 0 amount ARG 0 amount
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD c setCurrentHand (Lnone/rb;)V METHOD c setCurrentHand (Lnone/rb;)V
METHOD cy ()Lnone/rb; METHOD cy ()Lnone/rb;
METHOD d move (DDD)V METHOD d move (DDD)V

3
mappings/net/minecraft/client/util/ModelIdentifier.mapping
View File

@ -3,7 +3,8 @@ CLASS none/bzr net/minecraft/client/util/ModelIdentifier
METHOD <init> (Lnone/kp;Ljava/lang/String;)V METHOD <init> (Lnone/kp;Ljava/lang/String;)V
ARG 0 id ARG 0 id
ARG 1 variant 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 c getVariant ()Ljava/lang/String;
METHOD equals (Ljava/lang/Object;)Z METHOD equals (Ljava/lang/Object;)Z
ARG 0 other ARG 0 other

2
mappings/net/minecraft/command/CommandExecute.mapping
View File

@ -8,7 +8,7 @@ CLASS none/ae net/minecraft/command/CommandExecute
METHOD a updateCommandStat (Lnone/o$a;I)V METHOD a updateCommandStat (Lnone/o$a;I)V
ARG 0 statType ARG 0 statType
ARG 1 statValue ARG 1 statValue
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD d getPos ()Lnone/bcv; METHOD d getPos ()Lnone/bcv;
METHOD e getWorld ()Lnone/aiw; METHOD e getWorld ()Lnone/aiw;
METHOD f getEntity ()Lnone/sg; METHOD f getEntity ()Lnone/sg;

2
mappings/net/minecraft/command/CommandStatistics.mapping
View File

@ -8,7 +8,7 @@ CLASS none/o net/minecraft/command/CommandStatistics
METHOD a updateCommandStat (Lnone/o$a;I)V METHOD a updateCommandStat (Lnone/o$a;I)V
ARG 0 statType ARG 0 statType
ARG 1 statValue ARG 1 statValue
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD d getPos ()Lnone/bcv; METHOD d getPos ()Lnone/bcv;
METHOD e getWorld ()Lnone/aiw; METHOD e getWorld ()Lnone/aiw;
METHOD f getEntity ()Lnone/sg; METHOD f getEntity ()Lnone/sg;

2
mappings/net/minecraft/command/ICommandSender.mapping
View File

@ -7,7 +7,7 @@ CLASS none/n net/minecraft/command/ICommandSender
METHOD a updateCommandStat (Lnone/o$a;I)V METHOD a updateCommandStat (Lnone/o$a;I)V
ARG 0 statType ARG 0 statType
ARG 1 statValue ARG 1 statValue
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD d getPos ()Lnone/bcv; METHOD d getPos ()Lnone/bcv;
METHOD e getWorld ()Lnone/aiw; METHOD e getWorld ()Lnone/aiw;
METHOD f getEntity ()Lnone/sg; METHOD f getEntity ()Lnone/sg;

2
mappings/net/minecraft/entity/Entity.mapping
View File

@ -227,7 +227,7 @@ CLASS none/sg net/minecraft/entity/Entity
METHOD bt isImmuneToExplosion ()Z METHOD bt isImmuneToExplosion ()Z
METHOD bx getPassengerList ()Ljava/util/List; METHOD bx getPassengerList ()Ljava/util/List;
METHOD bz getTopmostRiddenEntity ()Lnone/sg; METHOD bz getTopmostRiddenEntity ()Lnone/sg;
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD c changeWorld (I)Lnone/sg; METHOD c changeWorld (I)Lnone/sg;
ARG 0 worldId ARG 0 worldId
METHOD c setCustomName (Ljava/lang/String;)V METHOD c setCustomName (Ljava/lang/String;)V

4
mappings/net/minecraft/entity/EntityFallingBlock.mapping
View File

@ -14,7 +14,7 @@ CLASS none/yz net/minecraft/entity/EntityFallingBlock
ARG 4 block ARG 4 block
METHOD a addCrashReportDetails (Lnone/c;)V METHOD a addCrashReportDetails (Lnone/c;)V
ARG 0 element ARG 0 element
METHOD a setBlockPos (Lnone/cn;)V METHOD a setFallingBlockPos (Lnone/cn;)V
ARG 0 pos ARG 0 pos
METHOD a deserializeCustomData (Lnone/dt;)V METHOD a deserializeCustomData (Lnone/dt;)V
ARG 0 tag ARG 0 tag
@ -27,7 +27,7 @@ CLASS none/yz net/minecraft/entity/EntityFallingBlock
METHOD e handleFallDamage (FF)V METHOD e handleFallDamage (FF)V
ARG 0 fallDistance ARG 0 fallDistance
METHOD i initDataTracker ()V METHOD i initDataTracker ()V
METHOD j getBlockPos ()Lnone/cn; METHOD j getFallingBlockPos ()Lnone/cn;
METHOD k getWorldClient ()Lnone/aiw; METHOD k getWorldClient ()Lnone/aiw;
METHOD l getBlockState ()Lnone/asm; METHOD l getBlockState ()Lnone/asm;
METHOD y_ update ()V METHOD y_ update ()V

2
mappings/net/minecraft/entity/mob/EntityGuardian.mapping
View File

@ -16,7 +16,7 @@ CLASS none/zn net/minecraft/entity/mob/EntityGuardian
METHOD bV getSoundHurt ()Lnone/nk; METHOD bV getSoundHurt ()Lnone/nk;
METHOD bW getSoundDeath ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk;
METHOD bq getEyeHeight ()F METHOD bq getEyeHeight ()F
METHOD c registerTagUpgraders (Lnone/pf;)V METHOD c registerTagUpgraders2 (Lnone/pf;)V
ARG 0 handler ARG 0 handler
METHOD i initDataTracker ()V METHOD i initDataTracker ()V
METHOD n updateMovement ()V METHOD n updateMovement ()V

2
mappings/net/minecraft/entity/mob/EntityMob.mapping
View File

@ -26,7 +26,7 @@ CLASS none/sq net/minecraft/entity/mob/EntityMob
ARG 1 playerHand ARG 1 playerHand
METHOD a deserializeCustomData (Lnone/dt;)V METHOD a deserializeCustomData (Lnone/dt;)V
ARG 0 tag 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 0 handler
ARG 1 entityClass ARG 1 entityClass
METHOD a startRiding (Lnone/sg;Z)Z METHOD a startRiding (Lnone/sg;Z)Z

2
mappings/net/minecraft/entity/mob/EntitySlime.mapping
View File

@ -26,7 +26,7 @@ CLASS none/zx net/minecraft/entity/mob/EntitySlime
METHOD bV getSoundHurt ()Lnone/nk; METHOD bV getSoundHurt ()Lnone/nk;
METHOD bW getSoundDeath ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk;
METHOD bq getEyeHeight ()F METHOD bq getEyeHeight ()F
METHOD c registerTagUpgraders (Lnone/pf;)V METHOD c registerTagUpgraders2 (Lnone/pf;)V
ARG 0 handler ARG 0 handler
METHOD ch getSoundVolume ()F METHOD ch getSoundVolume ()F
METHOD df getSize ()I METHOD df getSize ()I

2
mappings/net/minecraft/entity/mob/EntitySpider.mapping
View File

@ -12,7 +12,7 @@ CLASS none/zy net/minecraft/entity/mob/EntitySpider
METHOD bV getSoundHurt ()Lnone/nk; METHOD bV getSoundHurt ()Lnone/nk;
METHOD bW getSoundDeath ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk;
METHOD bq getEyeHeight ()F METHOD bq getEyeHeight ()F
METHOD c registerTagUpgraders (Lnone/pf;)V METHOD c registerTagUpgraders2 (Lnone/pf;)V
ARG 0 handler ARG 0 handler
METHOD i initDataTracker ()V METHOD i initDataTracker ()V
METHOD m_ canClimb ()Z METHOD m_ canClimb ()Z

2
mappings/net/minecraft/entity/mob/EntityZombie.mapping
View File

@ -21,7 +21,7 @@ CLASS none/aac net/minecraft/entity/mob/EntityZombie
METHOD bV getSoundHurt ()Lnone/nk; METHOD bV getSoundHurt ()Lnone/nk;
METHOD bW getSoundDeath ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk;
METHOD bq getEyeHeight ()F METHOD bq getEyeHeight ()F
METHOD c registerTagUpgraders (Lnone/pf;)V METHOD c registerTagUpgraders2 (Lnone/pf;)V
ARG 0 handler ARG 0 handler
METHOD dj hasArmsRaised ()Z METHOD dj hasArmsRaised ()Z
METHOD i initDataTracker ()V METHOD i initDataTracker ()V

2
mappings/net/minecraft/entity/passive/EntityMooshroom.mapping
View File

@ -7,7 +7,7 @@ CLASS none/wr net/minecraft/entity/passive/EntityMooshroom
ARG 0 other ARG 0 other
METHOD b createChild (Lnone/sd;)Lnone/wp; METHOD b createChild (Lnone/sd;)Lnone/wp;
ARG 0 other ARG 0 other
METHOD c registerTagUpgraders (Lnone/pf;)V METHOD c registerTagUpgraders2 (Lnone/pf;)V
ARG 0 handler ARG 0 handler
METHOD c createChild (Lnone/sd;)Lnone/wr; METHOD c createChild (Lnone/sd;)Lnone/wr;
ARG 0 other ARG 0 other

2
mappings/net/minecraft/entity/player/EntityPlayerServer.mapping
View File

@ -85,7 +85,7 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer
ARG 0 tag ARG 0 tag
METHOD b isInvulnerableTo (Lnone/rr;)Z METHOD b isInvulnerableTo (Lnone/rr;)Z
ARG 0 source ARG 0 source
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD c changeWorld (I)Lnone/sg; METHOD c changeWorld (I)Lnone/sg;
ARG 0 worldId ARG 0 worldId
METHOD di isPvpEnabled ()Z METHOD di isPvpEnabled ()Z

2
mappings/net/minecraft/entity/projectile/EntityArrow.mapping
View File

@ -20,7 +20,7 @@ CLASS none/abg net/minecraft/entity/projectile/EntityArrow
ARG 0 entity ARG 0 entity
METHOD b serializeCustomData (Lnone/dt;)V METHOD b serializeCustomData (Lnone/dt;)V
ARG 0 tag ARG 0 tag
METHOD c registerTagUpgraders (Lnone/pf;)V METHOD c registerTagUpgraders2 (Lnone/pf;)V
ARG 0 handler ARG 0 handler
METHOD i initDataTracker ()V METHOD i initDataTracker ()V
METHOD j asItemStack ()Lnone/aes; METHOD j asItemStack ()Lnone/aes;

2
mappings/net/minecraft/entity/projectile/EntitySpectralArrow.mapping
View File

@ -5,7 +5,7 @@ CLASS none/aba net/minecraft/entity/projectile/EntitySpectralArrow
ARG 0 entity ARG 0 entity
METHOD b serializeCustomData (Lnone/dt;)V METHOD b serializeCustomData (Lnone/dt;)V
ARG 0 tag ARG 0 tag
METHOD c registerTagUpgraders (Lnone/pf;)V METHOD c registerTagUpgraders2 (Lnone/pf;)V
ARG 0 handler ARG 0 handler
METHOD j asItemStack ()Lnone/aes; METHOD j asItemStack ()Lnone/aes;
METHOD y_ update ()V METHOD y_ update ()V

2
mappings/net/minecraft/entity/vehicle/EntityCommandBlockMinecart.mapping
View File

@ -1,6 +1,6 @@
CLASS none/abm net/minecraft/entity/vehicle/EntityCommandBlockMinecart CLASS none/abm net/minecraft/entity/vehicle/EntityCommandBlockMinecart
CLASS none/abm$1 CLASS none/abm$1
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD d getPos ()Lnone/bcv; METHOD d getPos ()Lnone/bcv;
METHOD e getWorld ()Lnone/aiw; METHOD e getWorld ()Lnone/aiw;
METHOD f getEntity ()Lnone/sg; METHOD f getEntity ()Lnone/sg;

2
mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping
View File

@ -3,7 +3,7 @@ CLASS none/abp net/minecraft/entity/vehicle/EntityHopperMinecart
FIELD b transferCooldown I FIELD b transferCooldown I
FIELD c currentBlockPos Lnone/cn; FIELD c currentBlockPos Lnone/cn;
METHOD C isEnabled ()Z METHOD C isEnabled ()Z
METHOD D getWorld ()Lnone/aiw; METHOD D getHopperWorld ()Lnone/aiw;
METHOD E getHopperX ()D METHOD E getHopperX ()D
METHOD F getHopperY ()D METHOD F getHopperY ()D
METHOD G getHopperZ ()D METHOD G getHopperZ ()D

2
mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping
View File

@ -49,7 +49,7 @@ CLASS none/abk net/minecraft/entity/vehicle/EntityMinecartBase
ARG 0 value ARG 0 value
METHOD a deserializeCustomData (Lnone/dt;)V METHOD a deserializeCustomData (Lnone/dt;)V
ARG 0 tag 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 0 handler
ARG 1 minecartClass ARG 1 minecartClass
METHOD a (Lnone/rr;)V METHOD a (Lnone/rr;)V

3
mappings/net/minecraft/scoreboard/ScoreboardServer.mapping
View File

@ -41,6 +41,7 @@ CLASS none/lb net/minecraft/scoreboard/ScoreboardServer
ARG 0 objective ARG 0 objective
METHOD f getPacketHandlersForObjectiveRemoval (Lnone/bcx;)Ljava/util/List; METHOD f getPacketHandlersForObjectiveRemoval (Lnone/bcx;)Ljava/util/List;
ARG 0 objective ARG 0 objective
METHOD g removeObjective (Lnone/bcx;)V METHOD g removeKnownObjective (Lnone/bcx;)V
ARG 0 objective
METHOD h getObjectiveDisplaySlot (Lnone/bcx;)I METHOD h getObjectiveDisplaySlot (Lnone/bcx;)I
ARG 0 objective ARG 0 objective

2
mappings/net/minecraft/server/MinecraftServer.mapping
View File

@ -188,7 +188,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
ARG 0 snooper ARG 0 snooper
METHOD b setDemo (Z)V METHOD b setDemo (Z)V
ARG 0 value ARG 0 value
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD c setWorldHeight (I)V METHOD c setWorldHeight (I)V
ARG 0 value ARG 0 value
METHOD c setServerIp (Ljava/lang/String;)V METHOD c setServerIp (Ljava/lang/String;)V

2
mappings/net/minecraft/server/dedicated/ConsoleCommandSender.mapping
View File

@ -11,7 +11,7 @@ CLASS none/nd net/minecraft/server/dedicated/ConsoleCommandSender
METHOD a updateCommandStat (Lnone/o$a;I)V METHOD a updateCommandStat (Lnone/o$a;I)V
ARG 0 statType ARG 0 statType
ARG 1 statValue ARG 1 statValue
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD d getPos ()Lnone/bcv; METHOD d getPos ()Lnone/bcv;
METHOD e getWorld ()Lnone/aiw; METHOD e getWorld ()Lnone/aiw;
METHOD f getEntity ()Lnone/sg; METHOD f getEntity ()Lnone/sg;

2
mappings/none/boi.mapping
View File

@ -13,6 +13,6 @@ CLASS none/boi
METHOD a damage (Lnone/rr;F)Z METHOD a damage (Lnone/rr;F)Z
ARG 0 source ARG 0 source
ARG 1 damage ARG 1 damage
METHOD c getBlockPos ()Lnone/cn; METHOD c ()Lnone/cn;
METHOD n updateMovement ()V METHOD n updateMovement ()V
METHOD y_ update ()V METHOD y_ update ()V