From 081cd51667d78df92c474d85ef72c7369549f638 Mon Sep 17 00:00:00 2001 From: i509VCB Date: Thu, 5 Nov 2020 17:40:31 -0600 Subject: [PATCH] Initial entity management mappings (#1845) There are a few unnamed classes but I feel those need a further look for their purpose or discussion on proper names. --- mappings/net/minecraft/class_5569.mapping | 4 +++ mappings/net/minecraft/class_5570.mapping | 13 ++++++++ mappings/net/minecraft/class_5579.mapping | 32 +++++++++++++++++++ mappings/net/minecraft/class_5582.mapping | 5 +++ mappings/net/minecraft/class_5584.mapping | 8 +++++ .../client/world/ClientWorld.mapping | 4 +++ .../server/world/ServerWorld.mapping | 5 +++ .../net/minecraft/world/EntityList.mapping | 14 ++++++++ .../net/minecraft/world/EntityLoader.mapping | 14 ++++++++ 9 files changed, 99 insertions(+) create mode 100644 mappings/net/minecraft/class_5569.mapping create mode 100644 mappings/net/minecraft/class_5570.mapping create mode 100644 mappings/net/minecraft/class_5579.mapping create mode 100644 mappings/net/minecraft/class_5582.mapping create mode 100644 mappings/net/minecraft/class_5584.mapping create mode 100644 mappings/net/minecraft/world/EntityList.mapping create mode 100644 mappings/net/minecraft/world/EntityLoader.mapping diff --git a/mappings/net/minecraft/class_5569.mapping b/mappings/net/minecraft/class_5569.mapping new file mode 100644 index 0000000000..2c597db68c --- /dev/null +++ b/mappings/net/minecraft/class_5569.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5569 + METHOD method_31749 updateEntityPosition ()V + METHOD method_31750 remove (Lnet/minecraft/class_1297$class_5529;)V + ARG 1 reason diff --git a/mappings/net/minecraft/class_5570.mapping b/mappings/net/minecraft/class_5570.mapping new file mode 100644 index 0000000000..da0f230e6d --- /dev/null +++ b/mappings/net/minecraft/class_5570.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_5570 + FIELD field_27244 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_27245 entitiesById Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_27246 entitiesByUuid Ljava/util/Map; + METHOD method_31752 getEntity (I)Lnet/minecraft/class_5568; + ARG 1 id + METHOD method_31753 addEntity (Lnet/minecraft/class_5568;)V + ARG 1 entity + METHOD method_31755 getEntity (Ljava/util/UUID;)Lnet/minecraft/class_5568; + ARG 1 uuid + METHOD method_31756 getEntityCount ()I + METHOD method_31757 removeEntity (Lnet/minecraft/class_5568;)V + ARG 1 entity diff --git a/mappings/net/minecraft/class_5579.mapping b/mappings/net/minecraft/class_5579.mapping new file mode 100644 index 0000000000..353dfaca51 --- /dev/null +++ b/mappings/net/minecraft/class_5579.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_5579 + FIELD field_27260 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_27261 entityUuids Ljava/util/Set; + FIELD field_27262 entityLoader Lnet/minecraft/class_5576; + FIELD field_27264 trackedEntities Lnet/minecraft/class_5570; + FIELD field_27270 loadingQueue Ljava/util/Queue; + METHOD (Ljava/lang/Class;Lnet/minecraft/class_5576;Lnet/minecraft/class_5571;)V + ARG 2 entityLoader + METHOD method_31818 addEntity (Lnet/minecraft/class_5568;)Z + ARG 1 entity + METHOD method_31820 addEntity (Lnet/minecraft/class_5568;Z)Z + ARG 1 entity + METHOD method_31831 canAddEntity (Lnet/minecraft/class_5568;)Z + ARG 1 entity + METHOD method_31838 (Lnet/minecraft/class_5568;)V + ARG 1 entity + METHOD method_31843 (Lnet/minecraft/class_5568;)V + ARG 1 entity + METHOD method_31847 (Lnet/minecraft/class_5568;)V + ARG 1 entity + METHOD method_31850 (Lnet/minecraft/class_5568;)V + ARG 1 entity + METHOD method_31852 (Lnet/minecraft/class_5568;)V + ARG 1 entity + METHOD method_31863 (Lnet/minecraft/class_5568;)V + ARG 1 entity + METHOD method_31864 (Lnet/minecraft/class_5568;)V + ARG 1 entity + CLASS class_5580 + FIELD field_27272 entity Lnet/minecraft/class_5568; + METHOD (Lnet/minecraft/class_5579;Lnet/minecraft/class_5568;JLnet/minecraft/class_5572;)V + ARG 2 entity diff --git a/mappings/net/minecraft/class_5582.mapping b/mappings/net/minecraft/class_5582.mapping new file mode 100644 index 0000000000..337c8bfdea --- /dev/null +++ b/mappings/net/minecraft/class_5582.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_5582 + CLASS class_5583 + FIELD field_27286 entity Lnet/minecraft/class_5568; + METHOD (Lnet/minecraft/class_5582;Lnet/minecraft/class_5568;JLnet/minecraft/class_5572;)V + ARG 2 entity diff --git a/mappings/net/minecraft/class_5584.mapping b/mappings/net/minecraft/class_5584.mapping new file mode 100644 index 0000000000..aaeff9f334 --- /dev/null +++ b/mappings/net/minecraft/class_5584.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_5584 + FIELD field_27292 tracked Z + FIELD field_27293 tick Z + METHOD (Ljava/lang/String;IZZ)V + ARG 3 tracked + ARG 4 tick + METHOD method_31883 shouldTick ()Z + METHOD method_31885 shouldTrack ()Z diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 24440f0ada..89fe87d9a6 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_24430 clientWorldProperties Lnet/minecraft/class_638$class_5271; FIELD field_24605 chunkManager Lnet/minecraft/class_631; FIELD field_24606 skyProperties Lnet/minecraft/class_5294; + FIELD field_27733 entityList Lnet/minecraft/class_5574; FIELD field_3727 netHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_3733 scoreboard Lnet/minecraft/class_269; @@ -101,6 +102,8 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 2 parameters ARG 3 shape ARG 4 y + METHOD method_32124 (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_8435 setTimeOfDay (J)V METHOD method_8441 tick (Ljava/util/function/BooleanSupplier;)V ARG 1 shouldKeepTicking @@ -131,3 +134,4 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 1 difficultyLocked METHOD method_28105 getSkyDarknessHeight ()D METHOD method_28106 getHorizonShadingRatio ()D + CLASS class_5612 EntityLoader diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 211202c926..9b14747393 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_25142 enderDragonFight Lnet/minecraft/class_2881; FIELD field_25143 shouldTickTime Z FIELD field_25144 END_SPAWN_POS Lnet/minecraft/class_2338; + FIELD field_26933 dragonParts Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_26934 entityList Lnet/minecraft/class_5574; METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;Lnet/minecraft/class_2794;ZJLjava/util/List;Z)V ARG 1 server ARG 2 workerExecutor @@ -180,6 +182,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_29203 tickTime ()V METHOD method_30630 getSpawnAngle ()F METHOD method_30736 shouldCreateNewEntityWithPassenger (Lnet/minecraft/class_1297;)Z + METHOD method_31420 (Lnet/minecraft/class_3695;Lnet/minecraft/class_1297;)V + ARG 2 entity METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; ARG 1 feature @@ -189,3 +193,4 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_8554 setSpawnPos (Lnet/minecraft/class_2338;F)V ARG 1 pos ARG 2 angle + CLASS class_5526 EntityLoader diff --git a/mappings/net/minecraft/world/EntityList.mapping b/mappings/net/minecraft/world/EntityList.mapping new file mode 100644 index 0000000000..5ca6a18f4b --- /dev/null +++ b/mappings/net/minecraft/world/EntityList.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_5574 net/minecraft/world/EntityList + FIELD field_27254 entities Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_27256 cachedEntityList Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + METHOD method_31790 addEntity (Lnet/minecraft/class_1297;)V + ARG 1 entity + METHOD method_31791 forEachEntity (Ljava/util/function/Consumer;)V + COMMENT Runs an action on every single entity. + COMMENT + COMMENT @throws UnsupportedOperationException if there is an attempt to have more than one concurrent iteration + ARG 1 action + METHOD method_31792 removeEntity (Lnet/minecraft/class_1297;)V + ARG 1 entity + METHOD method_31793 hasEntity (Lnet/minecraft/class_1297;)Z + ARG 1 entity diff --git a/mappings/net/minecraft/world/EntityLoader.mapping b/mappings/net/minecraft/world/EntityLoader.mapping new file mode 100644 index 0000000000..39bc865d00 --- /dev/null +++ b/mappings/net/minecraft/world/EntityLoader.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_5576 net/minecraft/world/EntityLoader + COMMENT Isolates client and server side specific logic when loading and unloading entities to and from a world. + METHOD method_31797 onUnloadEntity (Ljava/lang/Object;)V + ARG 1 entity + METHOD method_31798 onLoadEntity (Ljava/lang/Object;)V + ARG 1 entity + METHOD method_31799 removeEntity (Ljava/lang/Object;)V + ARG 1 entity + METHOD method_31800 addEntity (Ljava/lang/Object;)V + ARG 1 entity + METHOD method_31801 destroyEntity (Ljava/lang/Object;)V + ARG 1 entity + METHOD method_31802 (Ljava/lang/Object;)V + ARG 1 entity