From bd3143ae6380a40ba29a88b2f277e55027652a2b Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 15 Oct 2016 13:28:26 +0200 Subject: [PATCH] map ChunkPlayerTracker, some BlockState oddities --- .../block/state/BlockStateBase.mapping | 3 ++ .../block/state/BlockStateFactory.mapping | 4 ++ .../minecraft/block/state/IBlockState.mapping | 1 + .../client/world/WorldClient.mapping | 1 + .../entity/passive/EntityHorseBase.mapping | 2 +- .../world/ChunkPlayerTracker.mapping | 43 +++++++++++++++++++ .../world/ChunkPlayerTrackerMap.mapping | 41 ++++++++++++++++++ mappings/net/minecraft/world/World.mapping | 3 ++ .../net/minecraft/world/WorldServer.mapping | 6 +++ ...te.mapping => WorldVillageManager.mapping} | 5 ++- .../net/minecraft/world/chunk/Chunk.mapping | 3 ++ .../minecraft/world/chunk/ChunkPos.mapping | 2 +- .../entity/WorldEntityTrackingManager.mapping | 5 +++ 13 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 mappings/net/minecraft/world/ChunkPlayerTracker.mapping create mode 100644 mappings/net/minecraft/world/ChunkPlayerTrackerMap.mapping rename mappings/net/minecraft/world/{VillageState.mapping => WorldVillageManager.mapping} (52%) diff --git a/mappings/net/minecraft/block/state/BlockStateBase.mapping b/mappings/net/minecraft/block/state/BlockStateBase.mapping index f199e9b628..a47f0e2b33 100644 --- a/mappings/net/minecraft/block/state/BlockStateBase.mapping +++ b/mappings/net/minecraft/block/state/BlockStateBase.mapping @@ -1,3 +1,6 @@ CLASS none/asj net/minecraft/block/state/BlockStateBase FIELD a COMMA_JOINER Lcom/google/common/base/Joiner; FIELD b ENTRY_TO_NAME_FUNC Lcom/google/common/base/Function; + METHOD a getNext (Ljava/util/Collection;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 collection + ARG 1 current diff --git a/mappings/net/minecraft/block/state/BlockStateFactory.mapping b/mappings/net/minecraft/block/state/BlockStateFactory.mapping index e91040510a..5951ea97e9 100644 --- a/mappings/net/minecraft/block/state/BlockStateFactory.mapping +++ b/mappings/net/minecraft/block/state/BlockStateFactory.mapping @@ -2,10 +2,13 @@ CLASS none/asn net/minecraft/block/state/BlockStateFactory CLASS none/asn$a BlockState FIELD a block Lnone/aky; FIELD b values Lcom/google/common/collect/ImmutableMap; + FIELD c propertyDiffTable Lcom/google/common/collect/ImmutableTable; METHOD (Lnone/aky;Lcom/google/common/collect/ImmutableMap;)V ARG 0 block ARG 1 values METHOD a getMaterial ()Lnone/ayr; + METHOD a createPropertyDiffTable (Ljava/util/Map;)V + ARG 0 propertiesStateMap METHOD a (Lnone/aam;Lnone/aiw;Lnone/cn;)F ARG 0 player ARG 1 world @@ -59,6 +62,7 @@ CLASS none/asn net/minecraft/block/state/BlockStateFactory ARG 1 pos ARG 2 side METHOD c get (Lnone/atc;)Ljava/lang/Comparable; + ARG 0 property METHOD d getLightEmissionLevel ()I METHOD d getBoundingBox (Lnone/aja;Lnone/cn;)Lnone/bcs; ARG 0 view diff --git a/mappings/net/minecraft/block/state/IBlockState.mapping b/mappings/net/minecraft/block/state/IBlockState.mapping index 84f172ef2e..d6e231d11c 100644 --- a/mappings/net/minecraft/block/state/IBlockState.mapping +++ b/mappings/net/minecraft/block/state/IBlockState.mapping @@ -2,6 +2,7 @@ CLASS none/asm net/minecraft/block/state/IBlockState METHOD a (Lnone/atc;)Lnone/asm; METHOD a with (Lnone/atc;Ljava/lang/Comparable;)Lnone/asm; METHOD c get (Lnone/atc;)Ljava/lang/Comparable; + ARG 0 property METHOD r getProperties ()Ljava/util/Collection; METHOD s getValues ()Lcom/google/common/collect/ImmutableMap; METHOD t getBlock ()Lnone/aky; diff --git a/mappings/net/minecraft/client/world/WorldClient.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping index f6f202f7b0..a4099369bf 100644 --- a/mappings/net/minecraft/client/world/WorldClient.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -42,5 +42,6 @@ CLASS none/bmh net/minecraft/client/world/WorldClient METHOD c onEntityRemoved (Lnone/sg;)V ARG 0 entity METHOD d update ()V + METHOD j tickRandomBlocks ()V METHOD n createChunkProvider ()Lnone/atk; METHOD t updateWeather ()V diff --git a/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping index 22ac7c73f5..afbefbdf9d 100644 --- a/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping +++ b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping @@ -28,8 +28,8 @@ CLASS none/xd net/minecraft/entity/passive/EntityHorseBase METHOD c setHorseFlag (IZ)V ARG 0 index ARG 1 value - METHOD df getInventorySize ()I METHOD ch getSoundVolume ()F + METHOD df getInventorySize ()I METHOD dh isTame ()Z METHOD di getOwnerUuid ()Ljava/util/UUID; METHOD do isEating ()Z diff --git a/mappings/net/minecraft/world/ChunkPlayerTracker.mapping b/mappings/net/minecraft/world/ChunkPlayerTracker.mapping new file mode 100644 index 0000000000..061db636ae --- /dev/null +++ b/mappings/net/minecraft/world/ChunkPlayerTracker.mapping @@ -0,0 +1,43 @@ +CLASS none/lz net/minecraft/world/ChunkPlayerTracker + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b owner Lnone/ma; + FIELD c players Ljava/util/List; + FIELD d pos Lnone/aip; + FIELD e pendingUpdatePosCache [S + FIELD f chunk Lnone/atp; + FIELD g pendingUpdates I + FIELD h pendingUpdateStrips I + FIELD j initialized Z + METHOD (Lnone/ma;II)V + ARG 0 owner + ARG 1 chunkX + ARG 2 chunkZ + METHOD a getChunkPos ()Lnone/aip; + METHOD a matches (DLcom/google/common/base/Predicate;)Z + ARG 0 maxDistance + ARG 1 playerPredicate + METHOD a markBlockDirty (III)V + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a matches (Lcom/google/common/base/Predicate;)Z + ARG 0 playerPredicate + METHOD a sendBlockEntityUpdate (Lnone/are;)V + ARG 0 blockEntity + METHOD a sendPacket (Lnone/fl;)V + ARG 0 packet + METHOD a addPlayer (Lnone/lw;)V + ARG 0 player + METHOD a loadChunk (Z)Z + ARG 0 generate + METHOD b initialize ()Z + METHOD b removePlayer (Lnone/lw;)V + ARG 0 player + METHOD c sendChunkData (Lnone/lw;)V + ARG 0 player + METHOD d sendPendingUpdates ()V + METHOD d contains (Lnone/lw;)Z + ARG 0 player + METHOD e isInitialized ()Z + METHOD f getChunk ()Lnone/atp; + METHOD g getClosestDistanceToCenter ()D diff --git a/mappings/net/minecraft/world/ChunkPlayerTrackerMap.mapping b/mappings/net/minecraft/world/ChunkPlayerTrackerMap.mapping new file mode 100644 index 0000000000..65c6828a29 --- /dev/null +++ b/mappings/net/minecraft/world/ChunkPlayerTrackerMap.mapping @@ -0,0 +1,41 @@ +CLASS none/ma net/minecraft/world/ChunkPlayerTrackerMap + CLASS none/ma$1 + METHOD a test (Lnone/lw;)Z + ARG 0 player + CLASS none/ma$2 + METHOD a test (Lnone/lw;)Z + ARG 0 player + FIELD b CHUNK_GENERATING_PLAYERS Lcom/google/common/base/Predicate; + FIELD c world Lnone/lu; + FIELD d players Ljava/util/List; + FIELD e chunkManagerMap Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD f dirtyTrackers Ljava/util/Set; + FIELD j chunkDistance I + METHOD (Lnone/lu;)V + ARG 0 world + METHOD a getWorld ()Lnone/lu; + METHOD a setChunkDistance (I)V + ARG 0 chunkDistance + METHOD a contains (II)Z + ARG 0 chunkX + ARG 1 chunZ + METHOD a markBlockDirty (Lnone/cn;)V + ARG 0 pos + METHOD a registerPlayer (Lnone/lw;)V + ARG 0 player + METHOD a markTrackerDirty (Lnone/lz;)V + ARG 0 chunkManager + METHOD b get (II)Lnone/lz; + ARG 0 x + ARG 1 z + METHOD b unregisterPlayer (Lnone/lw;)V + METHOD b remove (Lnone/lz;)V + ARG 0 object + METHOD c update ()V + METHOD c getOrCreate (II)Lnone/lz; + ARG 0 x + ARG 1 z + METHOD d chunkPosAsLong (II)J + ARG 0 chunkX + ARG 1 chunkZ + METHOD e markMapDirty ()V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index d78a031f09..b035281cbc 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -7,6 +7,7 @@ CLASS none/aiw net/minecraft/world/World METHOD a call ()Ljava/lang/String; CLASS none/aiw$4 METHOD a call ()Ljava/lang/String; + FIELD A villageManager Lnone/wi; FIELD B lootTableHandler Lnone/bbm; FIELD C profiler Lnone/os; FIELD D scoreboard Lnone/bdb; @@ -207,6 +208,7 @@ CLASS none/aiw net/minecraft/world/World METHOD ad getScoreboard ()Lnone/bdb; METHOD ae getDifficulty ()Lnone/qz; METHOD af getAmbientDarkness ()I + METHOD ai getVillageManager ()Lnone/wi; METHOD aj getWorldBorder ()Lnone/atg; METHOD ak getLootTableHandler ()Lnone/bbm; METHOD b ()Lnone/aiw; @@ -291,6 +293,7 @@ CLASS none/aiw net/minecraft/world/World ARG 0 deltaTicks METHOD i setThunderGradient (F)V ARG 0 value + METHOD j tickRandomBlocks ()V METHOD j getRainGradient (F)F ARG 0 deltaTicks METHOD k updateEntities ()V diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index 6e31e9cdc2..58b97b7dd7 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -1,6 +1,7 @@ CLASS none/lu net/minecraft/world/WorldServer FIELD I server Lnet/minecraft/server/MinecraftServer; FIELD J entityTrackingManager Lnone/lr; + FIELD K chunkPlayerTrackerMap Lnone/ma; FIELD L blockTicksScheduled Ljava/util/Set; FIELD M blockTicksScheduledTreeSet Ljava/util/TreeSet; FIELD U blockTicksPending Ljava/util/List; @@ -61,6 +62,8 @@ CLASS none/lu net/minecraft/world/WorldServer METHOD am shouldSpawnAnimals ()Z METHOD an initDebugWorldProperties ()V METHOD b ()Lnone/aiw; + METHOD b (Lnone/aiz;)V + ARG 0 info METHOD b hasBlockTickScheduled (Lnone/cn;Lnone/aky;)Z ARG 0 pos ARG 1 block @@ -78,11 +81,14 @@ CLASS none/lu net/minecraft/world/WorldServer ARG 0 entity METHOD e updateSleepingStatus ()V METHOD h setDefaultSpawnClient ()V + METHOD j tickRandomBlocks ()V METHOD k updateEntities ()V METHOD n createChunkProvider ()Lnone/atk; + METHOD o generateBonusChest ()V METHOD q flushChunks ()V METHOD r getServerChunkProvider ()Lnone/lt; METHOD s saveRegions ()V METHOD t updateWeather ()V METHOD u getServer ()Lnet/minecraft/server/MinecraftServer; METHOD v getEntityTrackingManager ()Lnone/lr; + METHOD w getChunkPlayerTrackerMap ()Lnone/ma; diff --git a/mappings/net/minecraft/world/VillageState.mapping b/mappings/net/minecraft/world/WorldVillageManager.mapping similarity index 52% rename from mappings/net/minecraft/world/VillageState.mapping rename to mappings/net/minecraft/world/WorldVillageManager.mapping index ce077cf075..25bd093900 100644 --- a/mappings/net/minecraft/world/VillageState.mapping +++ b/mappings/net/minecraft/world/WorldVillageManager.mapping @@ -1,5 +1,8 @@ -CLASS none/wi net/minecraft/world/VillageState +CLASS none/wi net/minecraft/world/WorldVillageManager + FIELD b world Lnone/aiw; FIELD f tick I + METHOD (Lnone/aiw;)V + ARG 0 world METHOD a update ()V METHOD a deserialize (Lnone/dt;)V ARG 0 tag diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index b3422added..062fa83625 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -15,6 +15,7 @@ CLASS none/atp net/minecraft/world/chunk/Chunk FIELD o entities [Lnone/od; FIELD p terrainPopulated Z FIELD q lightPopulated Z + FIELD r didUpdate Z FIELD s dirty Z FIELD u lastSavedTime J FIELD w inhabitedTime J @@ -101,6 +102,8 @@ CLASS none/atp net/minecraft/world/chunk/Chunk ARG 0 dirty METHOD g getLevelOfTopSection ()I METHOD h getSections ()[Lnone/atq; + METHOD i isReady ()Z + METHOD j hadFirstUpdate ()Z METHOD k getPos ()Lnone/aip; METHOD l getBiomeMap ()[B METHOD p areEntitiesLoaded ()Z diff --git a/mappings/net/minecraft/world/chunk/ChunkPos.mapping b/mappings/net/minecraft/world/chunk/ChunkPos.mapping index 678fba7313..ab7db3940f 100644 --- a/mappings/net/minecraft/world/chunk/ChunkPos.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkPos.mapping @@ -16,7 +16,7 @@ CLASS none/aip net/minecraft/world/chunk/ChunkPos ARG 0 xOffset ARG 1 y ARG 2 zOffset - METHOD a distanceFromCenter (Lnone/sg;)D + METHOD a squaredDistanceFromCenter (Lnone/sg;)D ARG 0 entity METHOD b getZCenter ()I METHOD c getXStart ()I diff --git a/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping b/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping index b82f9a7df6..0f312feb3f 100644 --- a/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping +++ b/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping @@ -7,6 +7,9 @@ CLASS none/lr net/minecraft/world/entity/WorldEntityTrackingManager FIELD d trackersById Lnone/om; METHOD (Lnone/lu;)V ARG 0 world + METHOD a sendChunkEntityData (Lnone/lw;Lnone/atp;)V + ARG 0 player + ARG 1 chunk METHOD a startTracking (Lnone/sg;)V ARG 0 entity METHOD a startTracking (Lnone/sg;II)V @@ -21,6 +24,8 @@ CLASS none/lr net/minecraft/world/entity/WorldEntityTrackingManager METHOD a sendToAllTracking (Lnone/sg;Lnone/fl;)V ARG 0 entity ARG 1 packet + METHOD b (Lnone/lw;)V + ARG 0 player METHOD b stopTracking (Lnone/sg;)V ARG 0 entity METHOD b sendToAllTrackingAndSelf (Lnone/sg;Lnone/fl;)V