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

This commit is contained in:
asiekierka 2016-10-16 13:39:15 +02:00
commit f5f7fefbd8
24 changed files with 110 additions and 8 deletions

View File

@ -7,6 +7,7 @@ CLASS none/brs net/minecraft/client/render/chunk/ChunkRenderer
FIELD h chunkRenderDataTask Lnone/brm;
FIELD i blockEntities Ljava/util/Set;
FIELD l buffers [Lnone/bxn;
FIELD r chunkCache Lnone/ajf;
METHOD <init> (Lnone/aiw;Lnone/bpb;I)V
ARG 0 world
ARG 1 renderer

View File

@ -13,6 +13,8 @@ CLASS none/sg net/minecraft/entity/Entity
CLASS none/sg$5
METHOD a call ()Ljava/lang/String;
FIELD F invalid Z
FIELD G width F
FIELD H height F
FIELD L fallDistance F
FIELD M prevRenderX D
FIELD N prevRenderY D
@ -86,6 +88,9 @@ CLASS none/sg net/minecraft/entity/Entity
ARG 2 z
ARG 3 yaw
ARG 4 pitch
METHOD a setSize (FF)V
ARG 0 width
ARG 1 height
METHOD a hasPermission (ILjava/lang/String;)Z
ARG 0 permissionLevel
ARG 1 commandName
@ -177,6 +182,7 @@ CLASS none/sg net/minecraft/entity/Entity
METHOD aP isInvisible ()Z
METHOD aQ getScoreboardTeam ()Lnone/bdd;
METHOD aR getBreath ()I
METHOD aT getParts ()[Lnone/sg;
METHOD aU getHeadPitch ()F
METHOD aa getSoundSwim ()Lnone/nk;
METHOD ab getSoundSplash ()Lnone/nk;
@ -185,6 +191,7 @@ CLASS none/sg net/minecraft/entity/Entity
METHOD aj isSwimming ()Z
METHOD ak updateSwimming ()Z
METHOD al onSwimmingStart ()V
METHOD aq doesCollide ()Z
METHOD au isValid ()Z
METHOD av isInsideWall ()Z
METHOD az removeAllPassengers ()V
@ -322,6 +329,8 @@ CLASS none/sg net/minecraft/entity/Entity
ARG 0 entity
METHOD r isTeammate (Lnone/sg;)Z
ARG 0 entity
METHOD s isPartOf (Lnone/sg;)Z
ARG 0 other
METHOD u setPositionAndAngles (Lnone/sg;)V
ARG 0 other
METHOD w hasPassenger (Lnone/sg;)Z

View File

@ -20,6 +20,7 @@ CLASS none/yz net/minecraft/entity/EntityFallingBlock
ARG 0 tag
METHOD a setHurtEntities (Z)V
ARG 0 value
METHOD aq doesCollide ()Z
METHOD b serializeCustomData (Lnone/dt;)V
ARG 0 tag
METHOD b registerTagUpgraders (Lnone/pf;)V

View File

@ -63,6 +63,7 @@ CLASS none/sp net/minecraft/entity/EntityLiving
METHOD aU getHeadPitch ()F
METHOD a_ onEquipStack (Lnone/aes;)V
ARG 0 stack
METHOD aq doesCollide ()Z
METHOD au isValid ()Z
METHOD b heal (F)V
ARG 0 amount

View File

@ -14,6 +14,7 @@ CLASS none/zb net/minecraft/entity/EntityTNTPrimed
ARG 0 tag
METHOD a onTrackedDataSet (Lnone/kj;)V
ARG 0 data
METHOD aq doesCollide ()Z
METHOD b serializeCustomData (Lnone/dt;)V
ARG 0 tag
METHOD bq getEyeHeight ()F

View File

@ -10,6 +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 deserializeCustomData (Lnone/dt;)V
ARG 0 tag
METHOD a onTrackedDataSet (Lnone/kj;)V
@ -17,6 +18,12 @@ CLASS none/xr net/minecraft/entity/boss/EntityEnderDragon
METHOD a damage (Lnone/rr;F)Z
ARG 0 source
ARG 1 damage
METHOD a damage (Lnone/xp;Lnone/rr;F)Z
ARG 0 part
ARG 1 source
ARG 2 amount
METHOD aT getParts ()[Lnone/sg;
METHOD aq doesCollide ()Z
METHOD b serializeCustomData (Lnone/dt;)V
ARG 0 tag
METHOD b registerTagUpgraders (Lnone/pf;)V

View File

@ -31,6 +31,9 @@ CLASS none/yn net/minecraft/entity/decoration/EntityArmorStand
ARG 0 value
ARG 1 bitField
ARG 2 on
METHOD a setSize (FF)V
ARG 0 width
ARG 1 height
METHOD a interact (Lnone/aam;Lnone/bcv;Lnone/rb;)Lnone/rd;
ARG 0 player
ARG 1 hitPos
@ -53,6 +56,7 @@ CLASS none/yn net/minecraft/entity/decoration/EntityArmorStand
ARG 0 newValue
METHOD aG getItemsHand ()Ljava/lang/Iterable;
METHOD aH getItemsArmor ()Ljava/lang/Iterable;
METHOD aq doesCollide ()Z
METHOD b setBodyRotation (Lnone/dh;)V
ARG 0 rotation
METHOD b serializeCustomData (Lnone/dt;)V

View File

@ -23,6 +23,7 @@ CLASS none/yo net/minecraft/entity/decoration/EntityDecorationBase
ARG 0 entity
METHOD a onStruckByLightning (Lnone/yx;)V
ARG 0 lightning
METHOD aq doesCollide ()Z
METHOD b setPosition (DDD)V
ARG 0 x
ARG 1 y

View File

@ -10,6 +10,7 @@ CLASS none/xq net/minecraft/entity/decoration/EntityEnderCrystal
ARG 1 damage
METHOD a setShowBottom (Z)V
ARG 0 value
METHOD aq doesCollide ()Z
METHOD b serializeCustomData (Lnone/dt;)V
ARG 0 tag
METHOD i initDataTracker ()V

View File

@ -3,6 +3,9 @@ CLASS none/aac net/minecraft/entity/mob/EntityZombie
FIELD bz ARMS_RAISED Lnone/kj;
METHOD G getSoundAmbient ()Lnone/nk;
METHOD J getLootTableId ()Lnone/kp;
METHOD a setSize (FF)V
ARG 0 width
ARG 1 height
METHOD a playStepSound (Lnone/cn;Lnone/aky;)V
METHOD a deserializeCustomData (Lnone/dt;)V
ARG 0 tag

View File

@ -1,12 +1,19 @@
CLASS none/xp net/minecraft/entity/boss/EntityEnderDragonPart
CLASS none/xp net/minecraft/entity/parts/EntityPart
FIELD a damageDelegate Lnone/xo;
FIELD b name Ljava/lang/String;
METHOD <init> (Lnone/xo;Ljava/lang/String;FF)V
ARG 0 damageDelegate
ARG 1 name
ARG 2 width
ARG 3 height
METHOD a deserializeCustomData (Lnone/dt;)V
ARG 0 tag
METHOD a damage (Lnone/rr;F)Z
ARG 0 source
ARG 1 damage
METHOD aq doesCollide ()Z
METHOD b serializeCustomData (Lnone/dt;)V
ARG 0 tag
METHOD i initDataTracker ()V
METHOD s isPartOf (Lnone/sg;)Z
ARG 0 other

View File

@ -0,0 +1,6 @@
CLASS none/xo net/minecraft/entity/parts/IEntityPartDamageDelegate
METHOD a getWorld ()Lnone/aiw;
METHOD a damage (Lnone/xp;Lnone/rr;F)Z
ARG 0 part
ARG 1 source
ARG 2 amount

View File

@ -1,6 +1,9 @@
CLASS none/sd net/minecraft/entity/passive/EntityPassive
FIELD a age I
FIELD bx CHILD Lnone/kj;
METHOD a setSize (FF)V
ARG 0 width
ARG 1 height
METHOD a interactMob (Lnone/aam;Lnone/rb;)Z
ARG 0 player
ARG 1 playerHand

View File

@ -4,5 +4,6 @@ CLASS none/aaq net/minecraft/entity/projectile/EntityDragonFireball
METHOD a damage (Lnone/rr;F)Z
ARG 0 source
ARG 1 damage
METHOD aq doesCollide ()Z
METHOD b registerTagUpgraders (Lnone/pf;)V
ARG 0 handler

View File

@ -24,6 +24,7 @@ CLASS none/abh net/minecraft/entity/projectile/EntityExplodingWitherSkull
METHOD a setCharged (Z)V
ARG 0 value
METHOD aJ isOnFire ()Z
METHOD aq doesCollide ()Z
METHOD b registerTagUpgraders (Lnone/pf;)V
ARG 0 handler
METHOD i initDataTracker ()V

View File

@ -15,6 +15,7 @@ CLASS none/aas net/minecraft/entity/projectile/EntityExplosiveProjectile
METHOD a damage (Lnone/rr;F)Z
ARG 0 source
ARG 1 damage
METHOD aq doesCollide ()Z
METHOD b serializeCustomData (Lnone/dt;)V
ARG 0 tag
METHOD i initDataTracker ()V

View File

@ -5,6 +5,7 @@ CLASS none/aax net/minecraft/entity/projectile/EntityShulkerBullet
ARG 0 source
ARG 1 damage
METHOD aJ isOnFire ()Z
METHOD aq doesCollide ()Z
METHOD b serializeCustomData (Lnone/dt;)V
ARG 0 tag
METHOD bC getSoundCategory ()Lnone/nm;

View File

@ -4,5 +4,6 @@ CLASS none/aay net/minecraft/entity/projectile/EntitySmallFireball
METHOD a damage (Lnone/rr;F)Z
ARG 0 source
ARG 1 damage
METHOD aq doesCollide ()Z
METHOD b registerTagUpgraders (Lnone/pf;)V
ARG 0 handler

View File

@ -39,6 +39,7 @@ CLASS none/abj net/minecraft/entity/vehicle/EntityBoat
ARG 1 damage
METHOD a (Lnone/sg;)V
ARG 0 entity
METHOD aq doesCollide ()Z
METHOD b interact (Lnone/aam;Lnone/rb;)Z
ARG 0 player
ARG 1 hand

View File

@ -59,6 +59,7 @@ CLASS none/abk net/minecraft/entity/vehicle/EntityMinecartBase
ARG 1 damage
METHOD a setCustomBlockPresent (Z)V
ARG 0 value
METHOD aq doesCollide ()Z
METHOD b setPosition (DDD)V
ARG 0 x
ARG 1 y

View File

@ -1,6 +1,10 @@
CLASS none/atp net/minecraft/world/chunk/Chunk
CLASS none/atp$1
METHOD a call ()Ljava/lang/String;
CLASS none/atp$a CreationMode
FIELD a IMMEDIATE Lnone/atp$a;
FIELD b QUEUED Lnone/atp$a;
FIELD c NEVER Lnone/atp$a;
FIELD a NULL_CHUNK_SECTION Lnone/atq;
FIELD b chunkX I
FIELD c chunkZ I
@ -19,6 +23,7 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
FIELD s dirty Z
FIELD u lastSavedTime J
FIELD w inhabitedTime J
FIELD y blockEntityCreationQueue Ljava/util/concurrent/ConcurrentLinkedQueue;
METHOD <init> (Lnone/aiw;II)V
ARG 0 world
ARG 1 x
@ -34,6 +39,11 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
ARG 0 x
ARG 1 y
ARG 2 z
METHOD a getEntitiesInArea (Ljava/lang/Class;Lnone/bcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
ARG 0 entityClass
ARG 1 area
ARG 2 entities
ARG 3 predicate
METHOD a (Lnone/ajc;Lnone/cn;)I
ARG 0 lightType
ARG 1 pos
@ -57,11 +67,12 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
METHOD a addBlockEntity (Lnone/cn;Lnone/are;)V
ARG 0 pos
ARG 1 blockEntity
METHOD a (Lnone/cn;Lnone/asm;)Lnone/asm;
METHOD a setBlockState (Lnone/cn;Lnone/asm;)Lnone/asm;
ARG 0 pos
ARG 1 state
METHOD a (Lnone/cn;Lnone/atp$a;)Lnone/are;
METHOD a getBlockEntity (Lnone/cn;Lnone/atp$a;)Lnone/are;
ARG 0 pos
ARG 1 mode
METHOD a (Lnone/es;IZ)V
ARG 0 buffer
METHOD a addEntity (Lnone/sg;)V
@ -69,6 +80,11 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
METHOD a removeEntity (Lnone/sg;I)V
ARG 0 entity
ARG 1 chunkY
METHOD a getEntitiesInArea (Lnone/sg;Lnone/bcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
ARG 0 excludedEntity
ARG 1 area
ARG 2 entities
ARG 3 predicate
METHOD a setBiomeMap ([B)V
ARG 0 biomeMap
METHOD a setHeightMap ([I)V
@ -80,17 +96,24 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
ARG 1 z
METHOD b setLastSavedTime (J)V
ARG 0 worldTime
METHOD b (Lnone/cn;)I
METHOD b getBlockLightOpacityLevel (Lnone/cn;)I
ARG 0 pos
METHOD b removeEntity (Lnone/sg;)V
ARG 0 entity
METHOD b update (Z)V
METHOD c addEntitiesToWorld ()V
METHOD c areChunkSectionsEmpty (II)Z
ARG 0 minY
ARG 1 maxY
METHOD c setInhabitedTime (J)V
ARG 0 inhabitedTime
METHOD c setEntitiesLoaded (Z)V
ARG 0 value
METHOD d dropEntitiesFromWorld ()V
METHOD d getBlockLightOpacityLevel (III)I
ARG 0 x
ARG 1 y
ARG 2 z
METHOD d invalidateBlockEntityAt (Lnone/cn;)V
ARG 0 pos
METHOD d setTerrainPopulated (Z)V
@ -104,6 +127,8 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
METHOD f setDirty (Z)V
ARG 0 dirty
METHOD g getLevelOfTopSection ()I
METHOD g createBlockEntity (Lnone/cn;)Lnone/are;
ARG 0 pos
METHOD h getSections ()[Lnone/atq;
METHOD i isReady ()Z
METHOD j hadFirstUpdate ()Z

View File

@ -1,4 +1,14 @@
CLASS none/ajf
CLASS none/ajf net/minecraft/world/chunk/ChunkCache
FIELD a minX I
FIELD b minZ I
FIELD c chunks [[Lnone/atp;
FIELD d allChunksEmpty Z
FIELD e world Lnone/aiw;
METHOD <init> (Lnone/aiw;Lnone/cn;Lnone/cn;I)V
ARG 0 world
ARG 1 minPos
ARG 2 maxPos
ARG 3 offset
METHOD L getWorldGenerator ()Lnone/ajb;
METHOD a (Lnone/ajc;Lnone/cn;)I
ARG 0 lightType
@ -6,6 +16,7 @@ CLASS none/ajf
METHOD a getEmittedStrongRedstonePower (Lnone/cn;Lnone/cu;)I
ARG 0 pos
ARG 1 facing
METHOD aa areAllChunksEmpty ()Z
METHOD b getBiome (Lnone/cn;)Lnone/ajj;
ARG 0 pos
METHOD d isAir (Lnone/cn;)Z

View File

@ -7,7 +7,7 @@ CLASS none/atq net/minecraft/world/chunk/ChunkSection
METHOD <init> (IZ)V
ARG 0 level
ARG 1 hasSky
METHOD a hasBlocks ()Z
METHOD a isEmpty ()Z
METHOD a getBlockState (III)Lnone/asm;
ARG 0 x
ARG 1 y

View File

@ -2,6 +2,11 @@ CLASS none/atm net/minecraft/world/chunk/EmptyChunk
METHOD a matchesPos (II)Z
ARG 0 chunkX
ARG 1 chunkZ
METHOD a getEntitiesInArea (Ljava/lang/Class;Lnone/bcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
ARG 0 entityClass
ARG 1 area
ARG 2 entities
ARG 3 predicate
METHOD a (Lnone/ajc;Lnone/cn;)I
ARG 0 lightType
ARG 1 pos
@ -18,21 +23,30 @@ CLASS none/atm net/minecraft/world/chunk/EmptyChunk
METHOD a addBlockEntity (Lnone/cn;Lnone/are;)V
ARG 0 pos
ARG 1 blockEntity
METHOD a (Lnone/cn;Lnone/atp$a;)Lnone/are;
METHOD a getBlockEntity (Lnone/cn;Lnone/atp$a;)Lnone/are;
ARG 0 pos
ARG 1 mode
METHOD a addEntity (Lnone/sg;)V
ARG 0 entity
METHOD a removeEntity (Lnone/sg;I)V
ARG 0 entity
ARG 1 chunkY
METHOD a getEntitiesInArea (Lnone/sg;Lnone/bcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
ARG 0 excludedEntity
ARG 1 area
ARG 2 entities
ARG 3 predicate
METHOD b getHeightAt (II)I
ARG 0 x
ARG 1 z
METHOD b (Lnone/cn;)I
METHOD b getBlockLightOpacityLevel (Lnone/cn;)I
ARG 0 pos
METHOD b removeEntity (Lnone/sg;)V
ARG 0 entity
METHOD c addEntitiesToWorld ()V
METHOD c areChunkSectionsEmpty (II)Z
ARG 0 minY
ARG 1 maxY
METHOD d dropEntitiesFromWorld ()V
METHOD d invalidateBlockEntityAt (Lnone/cn;)V
ARG 0 pos