From e2bbf83836166d8c70ced714ffe8c1848c3bf046 Mon Sep 17 00:00:00 2001 From: Ethan Brooks Date: Fri, 5 May 2017 04:26:01 -0400 Subject: [PATCH] net.minecraft.world mapping additions (#157) * Little changes to World * Lots of parameter changes * There are so many world mappings * Fix misnamed chunkZ * Change consultRemoteProvider to ingoreRemote * Named two constants * Whoops, wrong names --- mappings/net/minecraft/block/Block.mapping | 5 + .../minecraft/block/IBlockInfoProxy.mapping | 1 + .../client/world/WorldClient.mapping | 4 + .../sortme/WorldServerSomething.mapping | 1 + .../net/minecraft/world/IBlockView.mapping | 2 + mappings/net/minecraft/world/World.mapping | 102 ++++++++++++++++++ .../net/minecraft/world/WorldServer.mapping | 7 ++ .../net/minecraft/world/chunk/Chunk.mapping | 2 + .../minecraft/world/chunk/ChunkCache.mapping | 2 + 9 files changed, 126 insertions(+) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index f8ca1941f3..77ba058547 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -15,6 +15,7 @@ CLASS ank net/minecraft/block/Block FIELD m lightOpacityLevel I FIELD n allowsLightTransmission Z FIELD o lightEmissionLevel I + FIELD p transparent Z FIELD q hardness F FIELD r explosionResistance F FIELD s miningStats Z @@ -113,12 +114,16 @@ CLASS ank net/minecraft/block/Block METHOD l hasBlockEntity ()Z METHOD l isFullBoundsCube (Lave;)Z METHOD m getLightOpacityLevel (Lave;)I + ARG 0 state METHOD n shouldDropSilkTouch ()Z METHOD n allowsLightTransmission (Lave;)Z + ARG 0 state METHOD o hasMiningStats ()Z METHOD o getLightEmissionLevel (Lave;)I ARG 0 state METHOD p disableMiningStats ()Lank; + METHOD p isTransparent (Lave;)Z + ARG 0 state METHOD q getCreativeTab ()Lagf; METHOD q getMaterial (Lave;)Lbbk; ARG 0 state diff --git a/mappings/net/minecraft/block/IBlockInfoProxy.mapping b/mappings/net/minecraft/block/IBlockInfoProxy.mapping index e557641789..5741233843 100644 --- a/mappings/net/minecraft/block/IBlockInfoProxy.mapping +++ b/mappings/net/minecraft/block/IBlockInfoProxy.mapping @@ -21,6 +21,7 @@ CLASS avd net/minecraft/block/IBlockInfoProxy METHOD d getBoundingBox (Lalm;Ldx;)Lbfm; METHOD e allowsLightTransmission ()Z METHOD e getOffsetPos (Lalm;Ldx;)Lbfp; + METHOD f isTransparent ()Z METHOD g getMapColor ()Lbbl; METHOD h canBeConnectedTo ()Z METHOD j getRenderType ()Larx; diff --git a/mappings/net/minecraft/client/world/WorldClient.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping index 41e88f1628..f5c1f6d9b9 100644 --- a/mappings/net/minecraft/client/world/WorldClient.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -7,12 +7,16 @@ CLASS bqk net/minecraft/client/world/WorldClient METHOD a playSound (DDDLpb;Lpd;FFZ)V METHOD a getEntityById (I)Lub; METHOD a isChunkLoaded (IIZ)Z + ARG 0 chunkX + ARG 1 chunkZ + ARG 2 ignoreRemote METHOD a playSound (Lacu;DDDLpb;Lpd;FF)V METHOD a setScoreboardClient (Lbfv;)V METHOD a playSoundClient (Ldx;Lpb;Lpd;FFZ)V METHOD a sendPacket (Lgv;)V METHOD a spawnEntity (Lub;)Z METHOD b setTimeOfDay (J)V + ARG 0 time METHOD b onEntityAdded (Lub;)V METHOD c getGameInstance (Lbqk;)Lbgm; METHOD c onEntityRemoved (Lub;)V diff --git a/mappings/net/minecraft/sortme/WorldServerSomething.mapping b/mappings/net/minecraft/sortme/WorldServerSomething.mapping index baab6154be..a74ccdfa2a 100644 --- a/mappings/net/minecraft/sortme/WorldServerSomething.mapping +++ b/mappings/net/minecraft/sortme/WorldServerSomething.mapping @@ -9,3 +9,4 @@ CLASS nh net/minecraft/sortme/WorldServerSomething METHOD c onSetSafeZone (Lavy;D)V FIELD a parent Lnl; METHOD a saveLevel ()V + METHOD b getWorld ()Lali; diff --git a/mappings/net/minecraft/world/IBlockView.mapping b/mappings/net/minecraft/world/IBlockView.mapping index a1ad13f93f..c6cf2d1690 100644 --- a/mappings/net/minecraft/world/IBlockView.mapping +++ b/mappings/net/minecraft/world/IBlockView.mapping @@ -2,7 +2,9 @@ CLASS alm net/minecraft/world/IBlockView METHOD M getWorldGenerator ()Laln; METHOD a getEmittedStrongRedstonePower (Ldx;Lee;)I METHOD b getBiome (Ldx;)Lalv; + ARG 0 pos METHOD b getCombinedLight (Ldx;I)I METHOD d isAir (Ldx;)Z + ARG 0 pos METHOD o getBlockState (Ldx;)Lave; METHOD r getBlockEntity (Ldx;)Latu; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 61f19c1874..180576b981 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -7,6 +7,7 @@ CLASS ali net/minecraft/world/World FIELD F isRemote Z FIELD G spawnMonsters Z FIELD H spawnAnimals Z + FIELD J unusedWhite J FIELD K ambientDarkness I FIELD M calendar Ljava/util/Calendar; FIELD N tickingBlockEntities Z @@ -23,6 +24,7 @@ CLASS ali net/minecraft/world/World FIELD j globalEntities Ljava/util/List; FIELD k entitiesById Lqd; FIELD l randomLocationSeed I + FIELD m unusedIncrement I FIELD n rainGradientPrev F FIELD o rainGradient F FIELD p thunderGradientPrev F @@ -34,12 +36,20 @@ CLASS ali net/minecraft/world/World FIELD v chunkProvider Lawc; FIELD w saveHandler Lbdp; FIELD x properties Lbdo; + METHOD (Lbdp;Lbdo;Lawx;Lqi;Z)V + ARG 0 saveHandler + ARG 1 properties + ARG 2 provider + ARG 3 profiler + ARG 4 isRemote METHOD A getChunkProvider ()Lawc; METHOD A setSpawnPos (Ldx;)V + ARG 0 pos METHOD B getBiomeProvider ()Lalz; METHOD C isDaylight ()Z METHOD D getLocalDifficulty (Ldx;)Lsv; METHOD E isInvalidHeight (Ldx;)Z + ARG 0 pos METHOD F getPendingBlockEntity (Ldx;)Latu; METHOD G getEntityCountAsString ()Ljava/lang/String; METHOD G isWater (Ldx;)Z @@ -60,32 +70,74 @@ CLASS ali net/minecraft/world/World METHOD V getGameRules ()Lalf; METHOD W isThundering ()Z METHOD X isRaining ()Z + METHOD a isPlayerVisible (DDDD)Z + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 distance + METHOD a getPlayer (DDDDLcom/google/common/base/Predicate;)Lacu; + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 distance + ARG 4 visibilityPredicate + METHOD a getPlayer (DDDDZ)Lacu; + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 distance + ARG 4 visibilityLevel METHOD a playSound (DDDLpb;Lpd;FFZ)V METHOD a calculateAmbientDarkness (F)I METHOD a getEntityById (I)Lub; METHOD a getChunk (II)Lawh; + ARG 0 chunkX + ARG 1 chunkZ METHOD a isAreaLoaded (IIIIIIZ)Z + ARG 0 x1 + ARG 1 y1 + ARG 2 z1 + ARG 3 x2 + ARG 4 y2 + ARG 5 z2 + ARG 6 ignoreRemote METHOD a isChunkLoaded (IIZ)Z + ARG 0 chunkX + ARG 1 chunkZ + ARG 2 ignoreRemote METHOD a fireGlobalWorldEvent (ILdx;I)V METHOD a spawnParticle (IZDDDDDD[I)V METHOD a setTime (J)V + ARG 0 time METHOD a playSound (Lacu;DDDLpb;Lpd;FF)V METHOD a fireWorldEvent (Lacu;ILdx;I)V METHOD a playSound (Lacu;Ldx;Lpb;Lpd;FF)V METHOD a registerListener (Lalk;)V METHOD a init (Lall;)V + ARG 0 info METHOD a getLight (Lalo;Ldx;)I + ARG 0 lightType + ARG 1 pos METHOD a addBlockEntity (Latu;)Z METHOD a getScheduledBlockTicks (Lawh;Z)Ljava/util/List; METHOD a isAreaLoaded (Lazr;)Z + ARG 0 region METHOD a getScheduledBlockTicks (Lazr;Z)Ljava/util/List; METHOD a rayTrace (Lbfp;Lbfp;)Lbfn; METHOD a rayTrace (Lbfp;Lbfp;Z)Lbfn; METHOD a rayTrace (Lbfp;Lbfp;ZZZ)Lbfn; METHOD a isValidPos (Ldx;)Z + ARG 0 pos METHOD a isAreaLoaded (Ldx;I)Z + ARG 0 pos + ARG 1 range METHOD a isAreaLoaded (Ldx;IZ)Z + ARG 0 pos + ARG 1 range + ARG 2 ignoreRemote METHOD a hasBlockTickPending (Ldx;Lank;)Z + ARG 0 pos + ARG 1 block METHOD a scheduleBlockTick (Ldx;Lank;I)V METHOD a scheduleBlockTick (Ldx;Lank;II)V METHOD a updateBlock (Ldx;Lank;Ldx;)V @@ -98,13 +150,29 @@ CLASS ali net/minecraft/world/World ARG 2 omittedFace METHOD a setBlockEntity (Ldx;Latu;)V METHOD a setBlockState (Ldx;Lave;)Z + ARG 0 pos + ARG 1 state METHOD a setBlockState (Ldx;Lave;I)Z + ARG 0 pos + ARG 1 state + ARG 2 listenerMask METHOD a updateListeners (Ldx;Lave;Lave;I)V + ARG 0 pos + ARG 1 oldState + ARG 2 newState + ARG 3 listenerMask METHOD a tickBlockInstantly (Ldx;Lave;Ljava/util/Random;)V METHOD a isAreaLoaded (Ldx;Ldx;)Z + ARG 0 firstCorner + ARG 1 secondCorner METHOD a isAreaLoaded (Ldx;Ldx;Z)Z + ARG 0 firstCorner + ARG 1 secondCorner + ARG 2 ignoreRemote METHOD a getEmittedStrongRedstonePower (Ldx;Lee;)I METHOD a isBlockLoaded (Ldx;Z)Z + ARG 0 pos + ARG 1 ignoreRemote METHOD a spawnParticle (Len;DDDDDD[I)V METHOD a spawnParticle (Len;ZDDDDDD[I)V METHOD a sendPacket (Lgv;)V @@ -114,8 +182,12 @@ CLASS ali net/minecraft/world/World METHOD a getClosestVisibleEntityTo (Ljava/lang/Class;Lbfm;Lub;)Lub; METHOD a getEntities (Ljava/lang/Class;Lcom/google/common/base/Predicate;)Ljava/util/List; METHOD a getPlayerByName (Ljava/lang/String;)Lacu; + ARG 0 name METHOD a addEntities (Ljava/util/Collection;)V METHOD a spawnEntity (Lub;)Z + METHOD a getPlayerVisible (Lub;D)Lacu; + ARG 0 other + ARG 1 distance METHOD a createExplosion (Lub;DDDFZ)Lald; METHOD a createExplosion (Lub;DDDFZZ)Lald; METHOD a getEntitiesIn (Lub;Lbfm;Lcom/google/common/base/Predicate;)Ljava/util/List; @@ -129,14 +201,20 @@ CLASS ali net/minecraft/world/World METHOD aj getVillageManager ()Lyk; METHOD ak getWorldBorder ()Lavy; METHOD al getLootTableHandler ()Lbeg; + METHOD b getWorld ()Lali; METHOD b setSeaLevel (I)V ARG 0 seaLevel + METHOD b (II)Z METHOD b fireWorldEvent (ILdx;I)V METHOD b setTimeOfDay (J)V + ARG 0 time METHOD b unregisterListener (Lalk;)V METHOD b unloadBlockEntity (Latu;)V METHOD b isAreaLoaded (Lazr;Z)Z + ARG 0 region + ARG 1 ignoreRemote METHOD b getBiome (Ldx;)Lalv; + ARG 0 pos METHOD b getCombinedLight (Ldx;I)I METHOD b hasBlockTickScheduled (Ldx;Lank;)Z METHOD b scheduleBlockTickGuaranteedDelay (Ldx;Lank;II)V @@ -150,28 +228,44 @@ CLASS ali net/minecraft/world/World ARG 2 updateObservers METHOD b markDirty (Ldx;Latu;)V METHOD b isEmittingRedstonePower (Ldx;Lee;)Z + METHOD b destroyBlock (Ldx;Z)Z + ARG 0 pos + ARG 1 dropBlock METHOD b getPlayers (Ljava/lang/Class;Lcom/google/common/base/Predicate;)Ljava/util/List; METHOD b addBlockEntities (Ljava/util/Collection;)V METHOD b getPlayerByUuid (Ljava/util/UUID;)Lacu; + ARG 0 uuid METHOD b onEntityAdded (Lub;)V + METHOD b getPlayerMobVisible (Lub;D)Lacu; + ARG 0 other + ARG 1 distance METHOD b getVisibleEntitiesIn (Lub;Lbfm;)Ljava/util/List; METHOD c setAmbientDarkness (I)V METHOD c getHeightAt (II)I + ARG 0 x + ARG 1 z METHOD c setBlockBreakingProgress (ILdx;I)V METHOD c isAreaNotEmpty (Lbfm;)Z ARG 0 area METHOD c getTopNonAirState (Ldx;)Lave; + ARG 0 pos METHOD c updateNeighborObservers (Ldx;Lank;)V ARG 0 pos ARG 1 sourceBlock METHOD c getEmittedRedstonePower (Ldx;Lee;)I METHOD c getLightLevel (Ldx;Z)I + ARG 0 pos + ARG 1 checkTransparency METHOD c unloadEntities (Ljava/util/Collection;)V METHOD c onEntityRemoved (Lub;)V METHOD d update ()V + METHOD d getChunkHeight (II)I + ARG 0 x + ARG 1 z METHOD d doesAreaContainLiquid (Lbfm;)Z ARG 0 area METHOD d isAir (Ldx;)Z + ARG 0 pos METHOD d updateHorizontalAdjacent (Ldx;Lank;)V METHOD d addGlobalEntity (Lub;)Z METHOD e updateSleepingStatus ()V @@ -179,18 +273,26 @@ CLASS ali net/minecraft/world/World METHOD e doesAreaContainFireSource (Lbfm;)Z ARG 0 area METHOD e isBlockLoaded (Ldx;)Z + ARG 0 pos METHOD f getChunk (Ldx;)Lawh; + ARG 0 pos METHOD g setBlockToAir (Ldx;)Z + ARG 0 pos METHOD h setDefaultSpawnClient ()V METHOD h getThunderGradient (F)F METHOD h isSkyVisible (Ldx;)Z + ARG 0 pos METHOD i setThunderGradient (F)V METHOD j tickRandomBlocks ()V METHOD j getRainGradient (F)F METHOD j getSkyLightLevel (Ldx;)I + ARG 0 pos METHOD k updateEntities ()V METHOD k setRainGradient (F)V METHOD k getLightLevel (Ldx;)I + ARG 0 pos + METHOD l getTopBlock (Ldx;)Ldx; + ARG 0 pos METHOD n createChunkProvider ()Lawc; METHOD o getBlockState (Ldx;)Lave; METHOD r getBlockEntity (Ldx;)Latu; diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index 4e4fb29c7e..c0fcdd69f6 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -10,10 +10,16 @@ CLASS nl net/minecraft/world/WorldServer METHOD A getChunkProvider ()Lawc; METHOD a saveLevel ()V METHOD a isChunkLoaded (IIZ)Z + ARG 0 chunkX + ARG 1 chunkZ + ARG 2 ignoreRemote METHOD a init (Lall;)V + ARG 0 info METHOD a getScheduledBlockTicks (Lawh;Z)Ljava/util/List; METHOD a getScheduledBlockTicks (Lazr;Z)Ljava/util/List; METHOD a hasBlockTickPending (Ldx;Lank;)Z + ARG 0 pos + ARG 1 block METHOD a scheduleBlockTick (Ldx;Lank;I)V METHOD a scheduleBlockTick (Ldx;Lank;II)V METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; @@ -27,6 +33,7 @@ CLASS nl net/minecraft/world/WorldServer METHOD am shouldSpawnNpcs ()Z METHOD an shouldSpawnAnimals ()Z METHOD ao initDebugWorldProperties ()V + METHOD b getWorld ()Lali; METHOD b createSpawn (Lall;)V METHOD b hasBlockTickScheduled (Ldx;Lank;)Z METHOD b scheduleBlockTickGuaranteedDelay (Ldx;Lank;II)V diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 63704ce6a1..b0ce41b433 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -20,6 +20,7 @@ CLASS awh net/minecraft/world/chunk/Chunk FIELD r didUpdate Z FIELD s dirty Z FIELD u lastSavedTime J + FIELD v maxHeight I FIELD w inhabitedTime J FIELD y blockEntityCreationQueue Ljava/util/concurrent/ConcurrentLinkedQueue; METHOD a matchesPos (II)Z @@ -74,5 +75,6 @@ CLASS awh net/minecraft/world/chunk/Chunk METHOD t getEntitySets ()[Lpu; METHOD u isTerrainPopulated ()Z METHOD v isLightPopulated ()Z + METHOD w getHeight ()I METHOD x getInhabitedTime ()J METHOD y getTopSection ()Lawi; diff --git a/mappings/net/minecraft/world/chunk/ChunkCache.mapping b/mappings/net/minecraft/world/chunk/ChunkCache.mapping index 31e9b7985c..ec62560fd7 100644 --- a/mappings/net/minecraft/world/chunk/ChunkCache.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkCache.mapping @@ -8,7 +8,9 @@ CLASS alr net/minecraft/world/chunk/ChunkCache METHOD a getEmittedStrongRedstonePower (Ldx;Lee;)I METHOD ab areAllChunksEmpty ()Z METHOD b getBiome (Ldx;)Lalv; + ARG 0 pos METHOD b getCombinedLight (Ldx;I)I METHOD d isAir (Ldx;)Z + ARG 0 pos METHOD o getBlockState (Ldx;)Lave; METHOD r getBlockEntity (Ldx;)Latu;