Merge branch '16w33a' of github.com:FabricMC/pomf into 16w33a

This commit is contained in:
Shadowfacts 2016-08-20 14:05:34 -04:00
commit 30d7950c0b
No known key found for this signature in database
GPG Key ID: F802198A7D7F309D
54 changed files with 313 additions and 21 deletions

View File

@ -1,30 +1,45 @@
CLASS none/bdo net/minecraft/client/Minecraft
FIELD B profiler Lnone/os;
FIELD C isRunning Z
FIELD J LOGGER Lorg/apache/logging/log4j/Logger;
FIELD K RESOURCE_LOGO Lnone/kp;
FIELD L DISPLAY_MODES Ljava/util/List;
FIELD Q textureManager Lnone/bxc;
FIELD R instance Lnone/bdo;
FIELD Z snooper Lnone/rj;
FIELD aI textureAtlas Lnone/bxa;
FIELD aM sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService;
FIELD aP thread Ljava/lang/Thread;
FIELD aj server Lnone/caj;
FIELD an netProxy Ljava/net/Proxy;
FIELD av isDemo Z
FIELD f world Lnone/bme;
FIELD h player Lnone/boe;
FIELD k fontRenderer Lnone/bec;
FIELD l fontRendererSGA Lnone/bec;
FIELD r guiInGame Lnone/bed;
FIELD t hitResult Lnone/bcq;
FIELD u settings Lnone/bdq;
FIELD w runDirectory Ljava/io/File;
METHOD F getServer ()Lnone/caj;
METHOD G onShutdown ()V
METHOD H getSnooper ()Lnone/rj;
METHOD I getCurrentTimeMillis ()J
METHOD M getNetworkProxy ()Ljava/net/Proxy;
METHOD N getTextureManager ()Lnone/bxc;
METHOD R getTextureAtlas ()Lnone/bxa;
METHOD Z isSnooperEnabled ()Z
METHOD a start ()V
METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;
METHOD a (Ljava/lang/String;)V
METHOD aB handleMouseEvents ()V
METHOD aC doItemPick ()V
METHOD aE isMainThread ()Z
METHOD aw doAttack ()V
METHOD ax doItemUse ()V
METHOD az handleKeyboardEvents ()V
METHOD u isDemo ()Z
METHOD v getNetworkHandler ()Lnone/bmc;
METHOD x isFancyGraphicsEnabled ()Z
METHOD y isAmbientOcclusionEnabled ()Z
METHOD z getInstance ()Lnone/bdo;

View File

@ -0,0 +1,9 @@
CLASS none/boe net/minecraft/client/player/EntityPlayerClient
FIELD d networkHandler Lnone/bmc;
METHOD a onTrackedDataSet (Lnone/kj;)V
METHOD a swingHand (Lnone/qz;)V
ARG 0 hand
METHOD c getBlockPos ()Lnone/cn;
METHOD g sendChatMessage (Ljava/lang/String;)V
ARG 0 message
METHOD m update ()V

View File

@ -0,0 +1 @@
CLASS none/bob net/minecraft/client/player/EntityPlayerClientAbstract

View File

@ -0,0 +1 @@
CLASS none/bxd net/minecraft/client/texture/ITexture

View File

@ -0,0 +1,2 @@
CLASS none/bxf net/minecraft/client/texture/ITextureUpdateMethod
METHOD e updateTexture ()V

View File

@ -0,0 +1 @@
CLASS none/bxg net/minecraft/client/texture/ITextureUpdateable

View File

@ -0,0 +1,54 @@
CLASS none/bxb net/minecraft/client/texture/Sprite
FIELD a frames Ljava/util/List;
FIELD c rotated Z
FIELD d x I
FIELD e y I
FIELD f width I
FIELD g height I
FIELD h framePos I
FIELD i ticks I
FIELD j name Ljava/lang/String;
FIELD l uMin F
FIELD m uMax F
FIELD n vMin F
FIELD o vMax F
METHOD <init> (Ljava/lang/String;)V
ARG 0 name
METHOD a getX ()I
METHOD a getU (D)F
ARG 0 x
METHOD a getFrame (I)[[I
ARG 0 pos
METHOD a init (IIIIZ)V
ARG 0 width
ARG 1 height
ARG 2 x
ARG 3 y
ARG 4 rotated
METHOD a setFrameList (Ljava/util/List;)V
ARG 0 frames
METHOD a copy (Lnone/bxb;)V
ARG 0 src
METHOD a create (Lnone/kp;)Lnone/bxb;
ARG 0 name
METHOD b getY ()I
METHOD b getV (D)F
ARG 0 y
METHOD b setWidth (I)V
ARG 0 width
METHOD c getWidth ()I
METHOD c setHeight (I)V
ARG 0 height
METHOD d getHeight ()I
METHOD d generateMipmaps (I)V
ARG 0 level
METHOD e getMinU ()F
METHOD e growFrameList (I)V
ARG 0 targetSize
METHOD f getMaxU ()F
METHOD g getMinV ()F
METHOD h getMaxV ()F
METHOD i getName ()Ljava/lang/String;
METHOD j update ()V
METHOD k getFrameCount ()I
METHOD l clearFrameList ()V

View File

@ -1 +0,0 @@
CLASS none/bxb net/minecraft/client/texture/TextureAtlasSprite

View File

@ -1,4 +1,11 @@
CLASS none/bxc net/minecraft/client/texture/TextureManager
FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
FIELD b textures Ljava/util/Map;
FIELD c updateable Ljava/util/List;
METHOD a bindTexture (Lnone/kp;)V
ARG 0 id
METHOD a (Lnone/kp;Lnone/bxg;)Z
ARG 0 id
METHOD b getTexture (Lnone/kp;)Lnone/bxd;
ARG 0 id
METHOD e updateTexture ()V

View File

@ -0,0 +1,23 @@
CLASS none/bxa net/minecraft/client/texture/TextureSpriteAtlas
FIELD f MISSINGNO_LOC Lnone/kp;
FIELD g BLOCK_ATLAS_LOC Lnone/kp;
FIELD h LOGGER Lorg/apache/logging/log4j/Logger;
FIELD i sprites Ljava/util/List;
FIELD l prefix Ljava/lang/String;
FIELD n mipLevel I
FIELD o defaultSprite Lnone/bxb;
METHOD <init> (Ljava/lang/String;)V
ARG 0 prefix
METHOD <init> (Ljava/lang/String;Lnone/bwt;)V
ARG 0 prefix
METHOD a setMipLevel (I)V
ARG 0 value
METHOD a getSprite (Ljava/lang/String;)Lnone/bxb;
ARG 0 id
METHOD a getResourceLocation (Lnone/bxb;)Lnone/kp;
ARG 0 sprite
METHOD a register (Lnone/kp;)Lnone/bxb;
ARG 0 id
METHOD e updateTexture ()V
METHOD f getDefaultSprite ()Lnone/bxb;
METHOD g initDefaultSprite ()V

View File

@ -25,6 +25,8 @@ CLASS none/j net/minecraft/command/CommandBase
METHOD a matchesBeginning (Ljava/lang/String;Ljava/lang/String;)Z
ARG 0 arg
ARG 1 target
METHOD a joinPretty (Ljava/util/List;)Lnone/fa;
ARG 0 list
METHOD a canExecute (Lnet/minecraft/server/MinecraftServer;Lnone/n;)Z
METHOD a getTabCompletionList (Lnet/minecraft/server/MinecraftServer;Lnone/n;[Ljava/lang/String;Lnone/cn;)Ljava/util/List;
METHOD a toBlockState (Lnone/akw;Ljava/lang/String;)Lnone/asj;

View File

@ -1,17 +1,53 @@
CLASS none/ahm net/minecraft/enchantment/Enchantment
CLASS none/ahm$a Weight
FIELD a COMMON Lnone/ahm$a;
FIELD b UNCOMMON Lnone/ahm$a;
FIELD c RARE Lnone/ahm$a;
FIELD d LEGENDARY Lnone/ahm$a;
FIELD e WEIGHT I
METHOD a getWeight ()I
FIELD a slotTypes [Lnone/sj;
FIELD b REGISTRY Lnone/db;
FIELD c type Lnone/ahn;
FIELD d translationName Ljava/lang/String;
FIELD e weight Lnone/ahm$a;
METHOD <init> (Lnone/ahm$a;Lnone/ahn;[Lnone/sj;)V
ARG 0 weight
ARG 1 type
ARG 2 slotTypes
METHOD a getTranslationKey ()Ljava/lang/String;
METHOD a getProtectionAmount (ILnone/rp;)I
ARG 0 level
ARG 1 source
METHOD a getAdditionalDamge (ILnone/ss;)F
ARG 0 level
ARG 1 entityType
METHOD a isAcceptableItem (Lnone/aeq;)Z
ARG 0 item
METHOD a isEqual (Lnone/ahm;)Z
ARG 0 other
METHOD a getEquipment (Lnone/sn;)Ljava/util/List;
ARG 0 entity
METHOD a onTargetDamaged (Lnone/sn;Lnone/se;I)V
ARG 0 user
ARG 1 target
ARG 2 level
METHOD b getHighestLevel ()I
METHOD b getEnchantmentById (Ljava/lang/String;)Lnone/ahm;
ARG 0 id
METHOD b getRawIdFromEnchantment (Lnone/ahm;)I
ARG 0 enchantment
METHOD b onUserDamaged (Lnone/sn;Lnone/se;I)V
ARG 0 user
ARG 1 attacker
ARG 2 level
METHOD c getWeight ()Lnone/ahm$a;
METHOD c getEnchantmentByRawId (I)Lnone/ahm;
ARG 0 id
METHOD c setTranslationName (Ljava/lang/String;)Lnone/ahm;
ARG 0 name
METHOD d getLowestLevel ()I
METHOD d getTranslatedNameWithLevel (I)Ljava/lang/String;
ARG 0 level
METHOD e isLootOnly ()Z
METHOD f init ()V

View File

@ -0,0 +1,14 @@
CLASS none/ahn net/minecraft/enchantment/EnchantmentType
FIELD a ALL Lnone/ahn;
FIELD b ARMOR Lnone/ahn;
FIELD c FEET Lnone/ahn;
FIELD d LEGS Lnone/ahn;
FIELD e CHEST Lnone/ahn;
FIELD f HELM Lnone/ahn;
FIELD g WEAPON Lnone/ahn;
FIELD h BREAKER Lnone/ahn;
FIELD i FISHING Lnone/ahn;
FIELD j TOOL Lnone/ahn;
FIELD k BOW Lnone/ahn;
METHOD a isAcceptableItem (Lnone/aeo;)Z
ARG 0 item

View File

@ -0,0 +1,5 @@
CLASS none/aic net/minecraft/enchantment/impl/EnchantmentAquaAffinity
METHOD <init> (Lnone/ahm$a;[Lnone/sj;)V
ARG 0 weight
ARG 1 slotTypes
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,13 @@
CLASS none/ahj net/minecraft/enchantment/impl/EnchantmentDamage
METHOD a getTranslationKey ()Ljava/lang/String;
METHOD a getAdditionalDamge (ILnone/ss;)F
ARG 0 level
ARG 1 entityType
METHOD a isAcceptableItem (Lnone/aeq;)Z
ARG 0 item
METHOD a isEqual (Lnone/ahm;)Z
METHOD a onTargetDamaged (Lnone/sn;Lnone/se;I)V
ARG 0 user
ARG 1 target
ARG 2 level
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,6 @@
CLASS none/aib net/minecraft/enchantment/impl/EnchantmentDepthStrider
METHOD <init> (Lnone/ahm$a;[Lnone/sj;)V
ARG 0 weight
ARG 1 slotTypes
METHOD a isEqual (Lnone/ahm;)Z
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,7 @@
CLASS none/ahl net/minecraft/enchantment/impl/EnchantmentEfficiency
METHOD <init> (Lnone/ahm$a;[Lnone/sj;)V
ARG 0 weight
ARG 1 slotTypes
METHOD a isAcceptableItem (Lnone/aeq;)Z
ARG 0 item
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,5 @@
CLASS none/ahr net/minecraft/enchantment/impl/EnchantmentFireAspect
METHOD <init> (Lnone/ahm$a;[Lnone/sj;)V
ARG 0 weight
ARG 1 slotTypes
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,5 @@
CLASS none/ahg net/minecraft/enchantment/impl/EnchantmentFlame
METHOD <init> (Lnone/ahm$a;[Lnone/sj;)V
ARG 0 weight
ARG 1 slotTypes
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,7 @@
CLASS none/aht net/minecraft/enchantment/impl/EnchantmentFrostWalker
METHOD <init> (Lnone/ahm$a;[Lnone/sj;)V
ARG 0 weight
ARG 1 slotTypes
METHOD a isEqual (Lnone/ahm;)Z
METHOD b getHighestLevel ()I
METHOD e isLootOnly ()Z

View File

@ -0,0 +1,5 @@
CLASS none/ahh net/minecraft/enchantment/impl/EnchantmentInfinity
METHOD <init> (Lnone/ahm$a;[Lnone/sj;)V
ARG 0 weight
ARG 1 slotTypes
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,5 @@
CLASS none/ahu net/minecraft/enchantment/impl/EnchantmentKnockback
METHOD <init> (Lnone/ahm$a;[Lnone/sj;)V
ARG 0 weight
ARG 1 slotTypes
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,6 @@
CLASS none/ahv net/minecraft/enchantment/impl/EnchantmentLuck
METHOD <init> (Lnone/ahm$a;Lnone/ahn;[Lnone/sj;)V
ARG 0 weight
ARG 2 slotTypes
METHOD a isEqual (Lnone/ahm;)Z
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,5 @@
CLASS none/ahs net/minecraft/enchantment/impl/EnchantmentLure
METHOD <init> (Lnone/ahm$a;Lnone/ahn;[Lnone/sj;)V
ARG 0 weight
ARG 2 slotTypes
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,3 @@
CLASS none/ahw net/minecraft/enchantment/impl/EnchantmentMending
METHOD b getHighestLevel ()I
METHOD e isLootOnly ()Z

View File

@ -0,0 +1,2 @@
CLASS none/ahf net/minecraft/enchantment/impl/EnchantmentPower
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,22 @@
CLASS none/ahy net/minecraft/enchantment/impl/EnchantmentProtection
CLASS none/ahy$a Type
FIELD a ALL Lnone/ahy$a;
FIELD b FIRE Lnone/ahy$a;
FIELD c FALL Lnone/ahy$a;
FIELD d EXPLOSION Lnone/ahy$a;
FIELD e PROJECTILE Lnone/ahy$a;
FIELD f name Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;III)V
ARG 3 name
METHOD a getName ()Ljava/lang/String;
FIELD a type Lnone/ahy$a;
METHOD <init> (Lnone/ahm$a;Lnone/ahy$a;[Lnone/sj;)V
ARG 0 weight
ARG 1 type
ARG 2 slotTypes
METHOD a getTranslationKey ()Ljava/lang/String;
METHOD a getProtectionAmount (ILnone/rp;)I
ARG 0 level
ARG 1 source
METHOD a isEqual (Lnone/ahm;)Z
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,2 @@
CLASS none/ahi net/minecraft/enchantment/impl/EnchantmentPunch
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,2 @@
CLASS none/ahx net/minecraft/enchantment/impl/EnchantmentRespiration
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,3 @@
CLASS none/aia net/minecraft/enchantment/impl/EnchantmentSilkTouch
METHOD a isEqual (Lnone/ahm;)Z
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,8 @@
CLASS none/ahz net/minecraft/enchantment/impl/EnchantmentThorns
METHOD a isAcceptableItem (Lnone/aeq;)Z
ARG 0 item
METHOD b getHighestLevel ()I
METHOD b onUserDamaged (Lnone/sn;Lnone/se;I)V
ARG 0 user
ARG 1 attacker
ARG 2 level

View File

@ -0,0 +1,4 @@
CLASS none/ahk net/minecraft/enchantment/impl/EnchantmentUnbreaking
METHOD a isAcceptableItem (Lnone/aeq;)Z
ARG 0 item
METHOD b getHighestLevel ()I

View File

@ -0,0 +1,4 @@
CLASS none/ss net/minecraft/entity/EntityType
FIELD a UNKNOWN Lnone/ss;
FIELD b UNDEAD Lnone/ss;
FIELD c ARTHROPOD Lnone/ss;

View File

@ -1,5 +1,6 @@
CLASS none/yl net/minecraft/entity/decoration/impl/EntityArmorStand
METHOD a deserializeEntityTag (Lnone/dt;)V
METHOD b serializeEntityTag (Lnone/dt;)V
METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq;
METHOD m update ()V
METHOD o_ getPistonBehavior ()Lnone/ayr;

View File

@ -17,6 +17,7 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayerAbstract
ARG 0 profile
METHOD a deserializeEntityTag (Lnone/dt;)V
METHOD b serializeEntityTag (Lnone/dt;)V
METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq;
METHOD bC getSoundCategory ()Lnone/nm;
METHOD cP getGameProfile ()Lcom/mojang/authlib/GameProfile;
METHOD d getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID;

View File

@ -1,5 +0,0 @@
CLASS none/boe net/minecraft/entity/player/EntityPlayerClient
FIELD d networkHandler Lnone/bmc;
METHOD a onTrackedDataSet (Lnone/kj;)V
METHOD c getBlockPos ()Lnone/cn;
METHOD m update ()V

View File

@ -1 +0,0 @@
CLASS none/bob net/minecraft/entity/player/EntityPlayerClientAbstract

View File

@ -1,6 +1,8 @@
CLASS none/lw net/minecraft/entity/player/EntityPlayerServer
FIELD a networkHandler Lnone/mg;
METHOD a deserializeEntityTag (Lnone/dt;)V
METHOD a swingHand (Lnone/qz;)V
ARG 0 hand
METHOD b serializeEntityTag (Lnone/dt;)V
METHOD c getBlockPos ()Lnone/cn;
METHOD m update ()V

View File

@ -45,6 +45,7 @@ CLASS none/aeq net/minecraft/item/ItemStack
ARG 0 stackSize
METHOD e setDisplayName (Ljava/lang/String;)Lnone/aeq;
ARG 0 name
METHOD f hasDurability ()Z
METHOD f addStackSize (I)V
ARG 0 amount
METHOD g subtractStackSize (I)V

View File

@ -2,6 +2,7 @@ CLASS none/caj net/minecraft/server/IntegratedServer
FIELD k LOGGER Lorg/apache/logging/log4j/Logger;
FIELD l mc Lnone/bdo;
METHOD A getRunDirectory ()Ljava/io/File;
METHOD Z isSnooperEnabled ()Z
METHOD a (Lnone/qx;)V
METHOD aa isDedicated ()Z
METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b;

View File

@ -27,6 +27,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD O getKeyPair ()Ljava/security/KeyPair;
METHOD P getServerPort ()I
METHOD V isDemo ()Z
METHOD Z isSnooperEnabled ()Z
METHOD a getWorld (I)Lnone/lu;
ARG 0 dimensionId
METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;

View File

@ -1,5 +1,6 @@
CLASS none/lf net/minecraft/server/dedicated/DedicatedServer
FIELD k LOGGER Lorg/apache/logging/log4j/Logger;
METHOD Z isSnooperEnabled ()Z
METHOD aa isDedicated ()Z
METHOD d setPlayerIdleTimeout (I)V
METHOD n getGameMode ()Lnone/ais;

View File

@ -2,6 +2,9 @@ CLASS none/sn net/minecraft/sortme/EntitySomethingBase
FIELD aQ headPitch F
METHOD a deserializeEntityTag (Lnone/dt;)V
METHOD a onTrackedDataSet (Lnone/kj;)V
METHOD a swingHand (Lnone/qz;)V
ARG 0 hand
METHOD b serializeEntityTag (Lnone/dt;)V
METHOD b getStackInHand (Lnone/qz;)Lnone/aeq;
METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq;
METHOD m update ()V

View File

@ -1,11 +1,16 @@
CLASS none/aiu net/minecraft/world/World
FIELD C profiler Lnone/os;
FIELD E isRemote Z
FIELD N border Lnone/atd;
FIELD r rand Ljava/util/Random;
FIELD v chunkProvider Lnone/ath;
METHOD E isValidHeight (Lnone/cn;)Z
ARG 0 pos
METHOD U getGameRules ()Lnone/air;
METHOD a getEntityById (I)Lnone/se;
METHOD a (II)Lnone/atm;
ARG 0 chunkX
ARG 1 chunkZ
METHOD a getEntitiesIn (Ljava/lang/Class;Lnone/bcp;)Ljava/util/List;
METHOD a (Ljava/lang/Class;Lnone/bcp;Lcom/google/common/base/Predicate;)Ljava/util/List;
METHOD a playSound (Lnone/aak;DDDLnone/nk;Lnone/nm;FF)V
@ -34,6 +39,10 @@ CLASS none/aiu net/minecraft/world/World
METHOD ae getDifficulty ()Lnone/qx;
METHOD b getBiome (Lnone/cn;)Lnone/ajh;
METHOD d isAir (Lnone/cn;)Z
METHOD f (Lnone/cn;)Lnone/atm;
ARG 0 pos
METHOD g setBlockToAir (Lnone/cn;)Z
ARG 0 pos
METHOD k updateEntities ()V
METHOD o getBlockState (Lnone/cn;)Lnone/asj;
ARG 0 pos

View File

@ -1,3 +0,0 @@
CLASS none/ahj
METHOD a getTranslationKey ()Ljava/lang/String;
METHOD a isEqual (Lnone/ahm;)Z

View File

@ -1,2 +0,0 @@
CLASS none/aht
METHOD a isEqual (Lnone/ahm;)Z

View File

@ -1,2 +0,0 @@
CLASS none/ahv
METHOD a isEqual (Lnone/ahm;)Z

View File

@ -1,3 +0,0 @@
CLASS none/ahy
METHOD a getTranslationKey ()Ljava/lang/String;
METHOD a isEqual (Lnone/ahm;)Z

View File

@ -1,2 +0,0 @@
CLASS none/aia
METHOD a isEqual (Lnone/ahm;)Z

View File

@ -1,2 +0,0 @@
CLASS none/aib
METHOD a isEqual (Lnone/ahm;)Z

View File

@ -0,0 +1,3 @@
CLASS none/bjk
CLASS none/bjk$c
FIELD a isDemo Z

View File

@ -0,0 +1,3 @@
CLASS none/bww
FIELD a width I
FIELD b height I

2
mappings/none/rk.mapping Normal file
View File

@ -0,0 +1,2 @@
CLASS none/rk
METHOD Z isSnooperEnabled ()Z

View File

@ -2,4 +2,5 @@ CLASS none/so
METHOD a deserializeEntityTag (Lnone/dt;)V
METHOD b interact (Lnone/aak;Lnone/qz;)Z
METHOD b serializeEntityTag (Lnone/dt;)V
METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq;
METHOD m update ()V