From 184690578dc6d1e47b2bf02ea83db853c0e6c9f7 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 7 Sep 2016 11:54:55 +0200 Subject: [PATCH] world, network work --- .../net/minecraft/block/BlockFalling.mapping | 2 ++ .../block/state/BlockStateFactory.mapping | 3 +++ .../block/tile/impl/TileEntitySign.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 14 +++++++++- .../minecraft/entity/EntityRegistry.mapping | 11 +++++++- .../entity/impl/EntityFallingBlock.mapping | 12 +++++++++ .../entity/player/EntityPlayer.mapping | 3 ++- .../network/NetworkThreadUtils.mapping | 1 + .../INetworkQueryHandlerServer.mapping | 5 ++++ .../impl/NetworkQueryHandlerServer.mapping | 14 ++++++++++ .../server/SPacketCustomPayload.mapping | 7 +++++ .../SPacketQueryRequest.mapping | 2 +- .../minecraft/reference/LootTables.mapping | 8 ++++++ .../minecraft/util/math/BoundingBox.mapping | 14 ++++++++++ .../thread/IThreadContainer.mapping} | 2 +- .../thread/ThreadNotMainException.mapping | 2 ++ .../net/minecraft/world/GameRules.mapping | 6 +++++ .../minecraft/world/IWorldListener.mapping | 2 +- .../net/minecraft/world/WorldServer.mapping | 4 +-- .../net/minecraft/world/chunk/Chunk.mapping | 4 +++ .../world/entity/WorldEntityTracker.mapping | 26 ++++++++++++------- .../entity/WorldEntityTrackingManager.mapping | 25 ++++++++++++++++++ .../explosion}/Explosion.mapping | 2 +- mappings/none/boy.mapping | 2 +- mappings/none/lv.mapping | 2 +- mappings/none/ly.mapping | 7 ----- mappings/none/mj.mapping | 3 --- mappings/none/om.mapping | 4 ++- mappings/none/vv.mapping | 2 +- mappings/none/zo.mapping | 3 ++- 30 files changed, 159 insertions(+), 34 deletions(-) create mode 100644 mappings/net/minecraft/network/NetworkThreadUtils.mapping create mode 100644 mappings/net/minecraft/network/handler/INetworkQueryHandlerServer.mapping create mode 100644 mappings/net/minecraft/network/handler/impl/NetworkQueryHandlerServer.mapping rename mappings/net/minecraft/network/packet/{client => server}/SPacketQueryRequest.mapping (62%) create mode 100644 mappings/net/minecraft/reference/LootTables.mapping rename mappings/net/minecraft/{sortme/IMultiThreadedObject.mapping => util/thread/IThreadContainer.mapping} (72%) create mode 100644 mappings/net/minecraft/util/thread/ThreadNotMainException.mapping create mode 100644 mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping rename mappings/net/minecraft/{sortme => world/explosion}/Explosion.mapping (94%) delete mode 100644 mappings/none/ly.mapping delete mode 100644 mappings/none/mj.mapping diff --git a/mappings/net/minecraft/block/BlockFalling.mapping b/mappings/net/minecraft/block/BlockFalling.mapping index fe61e0fbab..3e7a976d85 100644 --- a/mappings/net/minecraft/block/BlockFalling.mapping +++ b/mappings/net/minecraft/block/BlockFalling.mapping @@ -1,4 +1,6 @@ CLASS none/aml net/minecraft/block/BlockFalling METHOD b randomTick (Lnone/aiu;Lnone/cn;Lnone/asj;Ljava/util/Random;)V + METHOD i canFallThrough (Lnone/asj;)Z + ARG 0 state METHOD x getColor (Lnone/asj;)I ARG 0 state diff --git a/mappings/net/minecraft/block/state/BlockStateFactory.mapping b/mappings/net/minecraft/block/state/BlockStateFactory.mapping index b7349ffa28..64647d20e0 100644 --- a/mappings/net/minecraft/block/state/BlockStateFactory.mapping +++ b/mappings/net/minecraft/block/state/BlockStateFactory.mapping @@ -75,6 +75,9 @@ CLASS none/ask net/minecraft/block/state/BlockStateFactory ARG 0 block ARG 1 properties METHOD a getValidStates ()Lcom/google/common/collect/ImmutableList; + METHOD a getProperty (Ljava/lang/String;)Lnone/asz; + ARG 0 name METHOD b getDefaultState ()Lnone/asj; METHOD c getBlock ()Lnone/akw; METHOD d getProperties ()Ljava/util/Collection; + METHOD e getValueIterators ()Ljava/util/List; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping b/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping index 479fa540f5..fa5a3a29eb 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntitySign.mapping @@ -36,6 +36,7 @@ CLASS none/art net/minecraft/block/tile/impl/TileEntitySign FIELD a text [Lnone/fa; METHOD C_ getUpdatePacket ()Lnone/fy; METHOD a deserializeTag (Lnone/dt;)V + METHOD a (Z)V METHOD b onLoad (Lnone/aiu;)V ARG 0 world METHOD b serializeTag (Lnone/dt;)Lnone/dt; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index cd0ad4f534..ad729f7e9c 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -4,13 +4,16 @@ CLASS none/se net/minecraft/entity/Entity FIELD S rand Ljava/util/Random; FIELD Z dataTracker Lnone/km; FIELD aB NAME_TRACKER Lnone/kj; + FIELD aC NAME_VISIBLE_TRACKER Lnone/kj; FIELD aF invulnerable Z + FIELD aG commandStats Lnone/o; FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD aa flags Lnone/kj; FIELD ac chunkX I FIELD ad chunkY I FIELD ae chunkZ I FIELD ak portalCooldown I + FIELD al inPortal Z FIELD an dimensionId I FIELD ar uuid Ljava/util/UUID; FIELD as uuidString Ljava/lang/String; @@ -66,6 +69,8 @@ CLASS none/se net/minecraft/entity/Entity ARG 4 power METHOD a setWorld (Lnone/aiu;)V ARG 0 world + METHOD a addCrashInformation (Lnone/c;)V + ARG 0 element METHOD a setPositionAndAngles (Lnone/cn;FF)V ARG 0 pos ARG 1 yaw @@ -94,10 +99,13 @@ CLASS none/se net/minecraft/entity/Entity ARG 0 values METHOD aG getItemsHand ()Ljava/lang/Iterable; METHOD aH getItemsArmor ()Ljava/lang/Iterable; + METHOD aI getItemsEquipped ()Ljava/lang/Iterable; + METHOD aK hasVehicle ()Z METHOD aL hasPassengers ()Z METHOD aO isGlowing ()Z METHOD aU getHeadPitch ()F - METHOD ab getSoundSwim ()Lnone/nk; + METHOD aa getSoundSwim ()Lnone/nk; + METHOD ab getSoundSplash ()Lnone/nk; METHOD au isValid ()Z METHOD b setPosition (DDD)V ARG 0 x @@ -133,6 +141,8 @@ CLASS none/se net/minecraft/entity/Entity METHOD c getBlockPos ()Lnone/cn; METHOD c changeDimension (I)Lnone/se; ARG 0 dimensionId + METHOD c setCustomName (Ljava/lang/String;)V + ARG 0 value METHOD c getSquaredDistanceTo (Lnone/cn;)D ARG 0 pos METHOD d getPos ()Lnone/bcs; @@ -170,6 +180,8 @@ CLASS none/se net/minecraft/entity/Entity ARG 0 entity METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; + METHOD j setCustomNameVisible (Z)V + ARG 0 value METHOD k getTrackedBoolean (I)Z ARG 0 id METHOD m update ()V diff --git a/mappings/net/minecraft/entity/EntityRegistry.mapping b/mappings/net/minecraft/entity/EntityRegistry.mapping index 77cf46b293..b250dc6967 100644 --- a/mappings/net/minecraft/entity/EntityRegistry.mapping +++ b/mappings/net/minecraft/entity/EntityRegistry.mapping @@ -1,11 +1,16 @@ CLASS none/sg net/minecraft/entity/EntityRegistry FIELD a LIGHTNING_BOLT_ID Lnone/kp; FIELD b CLASS_MAP Lnone/db; - FIELD d ID_LIST Ljava/util/Set; + FIELD d ID_SET Ljava/util/Set; FIELD e PLAYER_ID Lnone/kp; FIELD f LOGGER Lorg/apache/logging/log4j/Logger; + FIELD g NAME_LIST Ljava/util/List; METHOD a getIdList ()Ljava/util/Set; METHOD a registerEntity (ILjava/lang/String;Ljava/lang/Class;Ljava/lang/String;)V + ARG 0 rawId + ARG 1 id + ARG 2 entityClass + ARG 3 name METHOD a getIdByClass (Ljava/lang/Class;)Lnone/kp; ARG 0 entityClass METHOD a create (Ljava/lang/Class;Lnone/aiu;)Lnone/se; @@ -15,9 +20,13 @@ CLASS none/sg net/minecraft/entity/EntityRegistry METHOD a deserializeTag (Lnone/dt;Lnone/aiu;)Lnone/se; ARG 0 tag ARG 1 world + METHOD a getName (Lnone/kp;)Ljava/lang/String; + ARG 0 id METHOD a create (Lnone/kp;Lnone/aiu;)Lnone/se; ARG 0 id ARG 1 world METHOD a getId (Lnone/se;)Lnone/kp; ARG 0 entity METHOD b init ()V + METHOD b getName (Lnone/se;)Ljava/lang/String; + ARG 0 entity diff --git a/mappings/net/minecraft/entity/impl/EntityFallingBlock.mapping b/mappings/net/minecraft/entity/impl/EntityFallingBlock.mapping index 28101689ad..2eda3a2940 100644 --- a/mappings/net/minecraft/entity/impl/EntityFallingBlock.mapping +++ b/mappings/net/minecraft/entity/impl/EntityFallingBlock.mapping @@ -1,5 +1,9 @@ CLASS none/yx net/minecraft/entity/impl/EntityFallingBlock + FIELD b dropItem Z + FIELD c tileData Lnone/dt; + FIELD d BLOCK_POS Lnone/kj; FIELD e block Lnone/asj; + FIELD g hurtEntities Z METHOD (Lnone/aiu;)V ARG 0 world METHOD (Lnone/aiu;DDDLnone/asj;)V @@ -8,9 +12,17 @@ CLASS none/yx net/minecraft/entity/impl/EntityFallingBlock ARG 2 y ARG 3 z ARG 4 block + METHOD a addCrashInformation (Lnone/c;)V + ARG 0 element + METHOD a setBlockPos (Lnone/cn;)V + ARG 0 pos METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a setHurtEntities (Z)V + ARG 0 value METHOD b serializeEntityTag (Lnone/dt;)V METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD j getBlockPos ()Lnone/cn; + METHOD k getWorldClient ()Lnone/aiu; METHOD l getBlockState ()Lnone/asj; METHOD m update ()V diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index eaca13dbeb..597719034f 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -64,7 +64,8 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer METHOD a dropSelectedItem (Z)Lnone/yy; METHOD aG getItemsHand ()Ljava/lang/Iterable; METHOD aH getItemsArmor ()Ljava/lang/Iterable; - METHOD ab getSoundSwim ()Lnone/nk; + METHOD aa getSoundSwim ()Lnone/nk; + METHOD ab getSoundSplash ()Lnone/nk; METHOD b serializeEntityTag (Lnone/dt;)V METHOD b increaseStat (Lnone/nu;)V ARG 0 stat diff --git a/mappings/net/minecraft/network/NetworkThreadUtils.mapping b/mappings/net/minecraft/network/NetworkThreadUtils.mapping new file mode 100644 index 0000000000..c823f27d3d --- /dev/null +++ b/mappings/net/minecraft/network/NetworkThreadUtils.mapping @@ -0,0 +1 @@ +CLASS none/fn net/minecraft/network/NetworkThreadUtils diff --git a/mappings/net/minecraft/network/handler/INetworkQueryHandlerServer.mapping b/mappings/net/minecraft/network/handler/INetworkQueryHandlerServer.mapping new file mode 100644 index 0000000000..fd7abbbc07 --- /dev/null +++ b/mappings/net/minecraft/network/handler/INetworkQueryHandlerServer.mapping @@ -0,0 +1,5 @@ +CLASS none/kf net/minecraft/network/handler/INetworkQueryHandlerServer + METHOD a onQueryPing (Lnone/kg;)V + ARG 0 packet + METHOD a onQueryRequest (Lnone/kh;)V + ARG 0 packet diff --git a/mappings/net/minecraft/network/handler/impl/NetworkQueryHandlerServer.mapping b/mappings/net/minecraft/network/handler/impl/NetworkQueryHandlerServer.mapping new file mode 100644 index 0000000000..2e8dcd268f --- /dev/null +++ b/mappings/net/minecraft/network/handler/impl/NetworkQueryHandlerServer.mapping @@ -0,0 +1,14 @@ +CLASS none/mj net/minecraft/network/handler/impl/NetworkQueryHandlerServer + FIELD a SUCCESS_MESSAGE Lnone/fa; + FIELD b server Lnet/minecraft/server/MinecraftServer; + FIELD c connection Lnone/eq; + FIELD d responseSent Z + METHOD (Lnet/minecraft/server/MinecraftServer;Lnone/eq;)V + ARG 0 server + ARG 1 connection + METHOD a onConnectionLost (Lnone/fa;)V + ARG 0 reason + METHOD a onQueryPing (Lnone/kg;)V + ARG 0 packet + METHOD a onQueryRequest (Lnone/kh;)V + ARG 0 packet diff --git a/mappings/net/minecraft/network/packet/server/SPacketCustomPayload.mapping b/mappings/net/minecraft/network/packet/server/SPacketCustomPayload.mapping index a5aa7f2bd0..f0a025dd6a 100644 --- a/mappings/net/minecraft/network/packet/server/SPacketCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/server/SPacketCustomPayload.mapping @@ -1,5 +1,12 @@ CLASS none/iv net/minecraft/network/packet/server/SPacketCustomPayload + FIELD a channel Ljava/lang/String; + FIELD b data Lnone/es; + METHOD (Ljava/lang/String;Lnone/es;)V + ARG 0 channel + ARG 1 payload + METHOD a getChannel ()Ljava/lang/String; METHOD a readPacket (Lnone/es;)V ARG 0 packet + METHOD b getData ()Lnone/es; METHOD b writePacket (Lnone/es;)V ARG 0 packet diff --git a/mappings/net/minecraft/network/packet/client/SPacketQueryRequest.mapping b/mappings/net/minecraft/network/packet/server/SPacketQueryRequest.mapping similarity index 62% rename from mappings/net/minecraft/network/packet/client/SPacketQueryRequest.mapping rename to mappings/net/minecraft/network/packet/server/SPacketQueryRequest.mapping index c2f300880c..e8ede86a61 100644 --- a/mappings/net/minecraft/network/packet/client/SPacketQueryRequest.mapping +++ b/mappings/net/minecraft/network/packet/server/SPacketQueryRequest.mapping @@ -1,4 +1,4 @@ -CLASS none/kh net/minecraft/network/packet/client/SPacketQueryRequest +CLASS none/kh net/minecraft/network/packet/server/SPacketQueryRequest METHOD a readPacket (Lnone/es;)V ARG 0 packet METHOD b writePacket (Lnone/es;)V diff --git a/mappings/net/minecraft/reference/LootTables.mapping b/mappings/net/minecraft/reference/LootTables.mapping new file mode 100644 index 0000000000..e439b3c9b8 --- /dev/null +++ b/mappings/net/minecraft/reference/LootTables.mapping @@ -0,0 +1,8 @@ +CLASS none/bbb net/minecraft/reference/LootTables + FIELD aw LOOT_TABLES Ljava/util/Set; + FIELD ax LOOT_TABLES_READ_ONLY Ljava/util/Set; + METHOD a getAll ()Ljava/util/Set; + METHOD a registerMinecraftLootTable (Ljava/lang/String;)Lnone/kp; + ARG 0 id + METHOD a registerLootTable (Lnone/kp;)Lnone/kp; + ARG 0 id diff --git a/mappings/net/minecraft/util/math/BoundingBox.mapping b/mappings/net/minecraft/util/math/BoundingBox.mapping index 39645e2ae9..6226f6433b 100644 --- a/mappings/net/minecraft/util/math/BoundingBox.mapping +++ b/mappings/net/minecraft/util/math/BoundingBox.mapping @@ -24,6 +24,18 @@ CLASS none/bcp net/minecraft/util/math/BoundingBox ARG 0 x ARG 1 y ARG 2 z + METHOD a contains (DDDDDD)Z + ARG 0 minX + ARG 1 minY + ARG 2 minZ + ARG 3 maxX + ARG 4 maxY + ARG 5 maxZ + METHOD a contains (Lnone/bcs;)Z + ARG 0 point + METHOD a contains (Lnone/bcs;Lnone/bcs;)Z + ARG 0 a + ARG 1 b METHOD a offset (Lnone/cn;)Lnone/bcp; ARG 0 pos METHOD b isValid ()Z @@ -31,6 +43,8 @@ CLASS none/bcp net/minecraft/util/math/BoundingBox ARG 0 x ARG 1 y ARG 2 z + METHOD b contains (Lnone/bcp;)Z + ARG 0 box METHOD c getCenter ()Lnone/bcs; METHOD c offset (DDD)Lnone/bcp; ARG 0 x diff --git a/mappings/net/minecraft/sortme/IMultiThreadedObject.mapping b/mappings/net/minecraft/util/thread/IThreadContainer.mapping similarity index 72% rename from mappings/net/minecraft/sortme/IMultiThreadedObject.mapping rename to mappings/net/minecraft/util/thread/IThreadContainer.mapping index dc0ac78fdd..fb756c7707 100644 --- a/mappings/net/minecraft/sortme/IMultiThreadedObject.mapping +++ b/mappings/net/minecraft/util/thread/IThreadContainer.mapping @@ -1,4 +1,4 @@ -CLASS none/qp net/minecraft/sortme/IMultiThreadedObject +CLASS none/qp net/minecraft/util/thread/IThreadContainer METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; ARG 0 runnable METHOD aE isMainThread ()Z diff --git a/mappings/net/minecraft/util/thread/ThreadNotMainException.mapping b/mappings/net/minecraft/util/thread/ThreadNotMainException.mapping new file mode 100644 index 0000000000..42b5ff8001 --- /dev/null +++ b/mappings/net/minecraft/util/thread/ThreadNotMainException.mapping @@ -0,0 +1,2 @@ +CLASS none/kz net/minecraft/util/thread/ThreadNotMainException + FIELD a INSTANCE Lnone/kz; diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index 36239a947d..26f3ab85db 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -19,6 +19,7 @@ CLASS none/air net/minecraft/world/GameRules FIELD b BOOLEAN Lnone/air$b; FIELD c INTEGER Lnone/air$b; FIELD a rules Ljava/util/TreeMap; + METHOD a serializeToTag ()Lnone/dt; METHOD a getString (Ljava/lang/String;)Ljava/lang/String; ARG 0 name METHOD a set (Ljava/lang/String;Ljava/lang/String;)V @@ -28,6 +29,11 @@ CLASS none/air net/minecraft/world/GameRules ARG 0 name ARG 1 value ARG 2 type + METHOD a (Ljava/lang/String;Lnone/air$b;)Z + ARG 0 name + ARG 1 type + METHOD a deserializeFromTag (Lnone/dt;)V + ARG 0 tag METHOD b getNames ()[Ljava/lang/String; METHOD b getBoolean (Ljava/lang/String;)Z ARG 0 name diff --git a/mappings/net/minecraft/world/IWorldListener.mapping b/mappings/net/minecraft/world/IWorldListener.mapping index ae8dd04bc8..8f7e9cb683 100644 --- a/mappings/net/minecraft/world/IWorldListener.mapping +++ b/mappings/net/minecraft/world/IWorldListener.mapping @@ -9,5 +9,5 @@ CLASS none/aiw net/minecraft/world/IWorldListener ARG 5 z ARG 6 volume ARG 7 pitch - METHOD a onEntitySpawn (Lnone/se;)V + METHOD a onSpawnEntity (Lnone/se;)V ARG 0 entity diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index 7ed02ccd4e..7c4eb75fef 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -1,6 +1,6 @@ CLASS none/lu net/minecraft/world/WorldServer FIELD I server Lnet/minecraft/server/MinecraftServer; - FIELD J entityTracker Lnone/lr; + FIELD J entityTrackingManager Lnone/lr; FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b disableAutoSave Z METHOD a isChunkLoaded (IIZ)Z @@ -30,4 +30,4 @@ CLASS none/lu net/minecraft/world/WorldServer METHOD n createChunkProvider ()Lnone/ath; METHOD r getServerChunkProvider ()Lnone/lt; METHOD t updateWeather ()V - METHOD v getEntityTracker ()Lnone/lr; + METHOD v getEntityTrackingManager ()Lnone/lr; diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 06ddba3b0c..5f34872662 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -73,8 +73,12 @@ CLASS none/atm net/minecraft/world/chunk/Chunk METHOD f isEmpty ()Z METHOD g getLevelOfTopSection ()I METHOD h getSections ()[Lnone/atn; + METHOD k getPos ()Lnone/ain; METHOD l getBiomeMap ()[B METHOD q getWorld ()Lnone/aiu; METHOD r getHeightMap ()[I METHOD s getTileEntityMap ()Ljava/util/Map; + METHOD t getEntitySets ()[Lnone/od; + METHOD u isTerrainPopulated ()Z + METHOD v isLightPopulated ()Z METHOD y getTopSection ()Lnone/atn; diff --git a/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping b/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping index bd4ab0ca82..0693518b26 100644 --- a/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping +++ b/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping @@ -1,11 +1,17 @@ -CLASS none/lr net/minecraft/world/entity/WorldEntityTracker - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b world Lnone/lu; - METHOD (Lnone/lu;)V - ARG 0 world - METHOD a sendToAllTracking (Lnone/se;Lnone/fl;)V +CLASS none/ly net/minecraft/world/entity/WorldEntityTracker + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + FIELD d entity Lnone/se; + FIELD e trackingRange I + FIELD g updateInterval I + METHOD (Lnone/se;IIIZ)V ARG 0 entity - ARG 1 packet - METHOD b sendToAllTrackingAndSelf (Lnone/se;Lnone/fl;)V - ARG 0 entity - ARG 1 packet + ARG 1 trackingRange + ARG 3 updateInterval + METHOD a sendToAllTracking (Lnone/fl;)V + ARG 0 packet + METHOD b getEntity ()Lnone/se; + METHOD b sendToAllTrackingAndSelf (Lnone/fl;)V + ARG 0 packet + METHOD e getSpawnPacket ()Lnone/fl; + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other diff --git a/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping b/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping new file mode 100644 index 0000000000..1f957984cf --- /dev/null +++ b/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping @@ -0,0 +1,25 @@ +CLASS none/lr net/minecraft/world/entity/WorldEntityTrackingManager + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b world Lnone/lu; + FIELD c TRACKERS Ljava/util/Set; + FIELD d TRACKERS_BY_ID Lnone/om; + METHOD (Lnone/lu;)V + ARG 0 world + METHOD a startTracking (Lnone/se;)V + ARG 0 entity + METHOD a startTracking (Lnone/se;II)V + ARG 0 entity + ARG 1 trackingRange + ARG 2 updateInterval + METHOD a startTracking (Lnone/se;IIZ)V + ARG 0 entity + ARG 1 trackingRange + ARG 2 updateInterval + METHOD a sendToAllTracking (Lnone/se;Lnone/fl;)V + ARG 0 entity + ARG 1 packet + METHOD b stopTracking (Lnone/se;)V + ARG 0 entity + METHOD b sendToAllTrackingAndSelf (Lnone/se;Lnone/fl;)V + ARG 0 entity + ARG 1 packet diff --git a/mappings/net/minecraft/sortme/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping similarity index 94% rename from mappings/net/minecraft/sortme/Explosion.mapping rename to mappings/net/minecraft/world/explosion/Explosion.mapping index 5a841ce32b..0e81367caf 100644 --- a/mappings/net/minecraft/sortme/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -1,4 +1,4 @@ -CLASS none/aip net/minecraft/sortme/Explosion +CLASS none/aip net/minecraft/world/explosion/Explosion FIELD a createFire Z FIELD b destroyBlocks Z FIELD c rand Ljava/util/Random; diff --git a/mappings/none/boy.mapping b/mappings/none/boy.mapping index da06235947..7189451e58 100644 --- a/mappings/none/boy.mapping +++ b/mappings/none/boy.mapping @@ -12,5 +12,5 @@ CLASS none/boy ARG 7 pitch METHOD a onResourceReload (Lnone/bya;)V ARG 0 container - METHOD a onEntitySpawn (Lnone/se;)V + METHOD a onSpawnEntity (Lnone/se;)V ARG 0 entity diff --git a/mappings/none/lv.mapping b/mappings/none/lv.mapping index dea3e2910f..b1d5fa7729 100644 --- a/mappings/none/lv.mapping +++ b/mappings/none/lv.mapping @@ -11,5 +11,5 @@ CLASS none/lv ARG 5 z ARG 6 volume ARG 7 pitch - METHOD a onEntitySpawn (Lnone/se;)V + METHOD a onSpawnEntity (Lnone/se;)V ARG 0 entity diff --git a/mappings/none/ly.mapping b/mappings/none/ly.mapping deleted file mode 100644 index db1a310f9d..0000000000 --- a/mappings/none/ly.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS none/ly - FIELD d entity Lnone/se; - FIELD z tracking Ljava/util/Set; - METHOD a sendToAllTracking (Lnone/fl;)V - ARG 0 packet - METHOD b sendToAllTrackingAndSelf (Lnone/fl;)V - ARG 0 packet diff --git a/mappings/none/mj.mapping b/mappings/none/mj.mapping deleted file mode 100644 index 61a15452c6..0000000000 --- a/mappings/none/mj.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/mj - METHOD a onConnectionLost (Lnone/fa;)V - ARG 0 reason diff --git a/mappings/none/om.mapping b/mappings/none/om.mapping index 9762bad447..48d2a13569 100644 --- a/mappings/none/om.mapping +++ b/mappings/none/om.mapping @@ -1,2 +1,4 @@ CLASS none/om - METHOD a (I)Ljava/lang/Object; + METHOD a get (I)Ljava/lang/Object; + METHOD a put (ILjava/lang/Object;)V + METHOD b containsKey (I)Z diff --git a/mappings/none/vv.mapping b/mappings/none/vv.mapping index 6d39200d93..faba373736 100644 --- a/mappings/none/vv.mapping +++ b/mappings/none/vv.mapping @@ -9,5 +9,5 @@ CLASS none/vv ARG 5 z ARG 6 volume ARG 7 pitch - METHOD a onEntitySpawn (Lnone/se;)V + METHOD a onSpawnEntity (Lnone/se;)V ARG 0 entity diff --git a/mappings/none/zo.mapping b/mappings/none/zo.mapping index 529d6b80f4..bf8e01fc1a 100644 --- a/mappings/none/zo.mapping +++ b/mappings/none/zo.mapping @@ -2,6 +2,7 @@ CLASS none/zo METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage - METHOD ab getSoundSwim ()Lnone/nk; + METHOD aa getSoundSwim ()Lnone/nk; + METHOD ab getSoundSplash ()Lnone/nk; METHOD bC getSoundCategory ()Lnone/nm; METHOD m update ()V