From 104490a2e267ec5bdf366918db5dbf1c7a70ab97 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Thu, 30 Apr 2020 05:32:20 -0500 Subject: [PATCH] Entity type missing stuff, new server properties (#1312) Signed-off-by: liach Co-authored-by: liach --- .../client/options/GameOptions.mapping | 1 + .../minecraft/client/options/Option.mapping | 3 +++ .../net/minecraft/entity/EntityType.mapping | 27 ++++++++++++++++++- .../minecraft/server/MinecraftServer.mapping | 3 +++ .../dedicated/ServerPropertiesHandler.mapping | 2 ++ .../ServerHandshakeNetworkHandler.mapping | 1 + .../world/ThreadedAnvilChunkStorage.mapping | 2 ++ 7 files changed, 38 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping index 13adba515f..4c88ac2932 100644 --- a/mappings/net/minecraft/client/options/GameOptions.mapping +++ b/mappings/net/minecraft/client/options/GameOptions.mapping @@ -101,6 +101,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions FIELD field_21840 skipMultiplayerWarning Z FIELD field_23932 chatLineSpacing D FIELD field_23933 chatDelay D + FIELD field_24214 entityDistanceScaling F METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile diff --git a/mappings/net/minecraft/client/options/Option.mapping b/mappings/net/minecraft/client/options/Option.mapping index 439fa8acf2..9844103e0a 100644 --- a/mappings/net/minecraft/client/options/Option.mapping +++ b/mappings/net/minecraft/client/options/Option.mapping @@ -44,6 +44,9 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option FIELD field_20307 RAW_MOUSE_INPUT Lnet/minecraft/class_4062; FIELD field_21330 SNEAK_TOGGLED Lnet/minecraft/class_4064; FIELD field_21331 SPRINT_TOGGLED Lnet/minecraft/class_4064; + FIELD field_23930 CHAT_LINE_SPACING Lnet/minecraft/class_4067; + FIELD field_23931 CHAT_DELAY_INSTANT Lnet/minecraft/class_4067; + FIELD field_24213 ENTITY_DISTANCE_SCALING Lnet/minecraft/class_4067; METHOD (Ljava/lang/String;)V ARG 1 key METHOD method_18518 getDisplayPrefix ()Lnet/minecraft/class_5250; diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 23e3a76830..847e7075ac 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_18070 dimensions Lnet/minecraft/class_4048; FIELD field_18981 fireImmune Z FIELD field_19423 spawnableFarFromPlayer Z + FIELD field_22469 immediateDespawnRange I + FIELD field_22470 despawnStartRange I + FIELD field_24085 maxTrackDistance I + FIELD field_24086 trackTickInterval I FIELD field_6056 saveable Z FIELD field_6072 summonable Z FIELD field_6088 LOGGER Lorg/apache/logging/log4j/Logger; @@ -17,7 +21,11 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 4 summonable ARG 5 fireImmune ARG 6 spawnableFarFromPlayer + ARG 7 immediateDespawnRange + ARG 8 despawnStartRange ARG 9 dimensions + ARG 10 maxTrackDistance + ARG 11 trackTickInterval METHOD method_16351 getLootTableId ()Lnet/minecraft/class_2960; METHOD method_17683 createSimpleBoundingBox (DDD)Lnet/minecraft/class_238; ARG 1 feetX @@ -36,20 +44,27 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 world METHOD method_18386 getDimensions ()Lnet/minecraft/class_4048; METHOD method_18387 getMaxTrackDistance ()I + COMMENT Returns the tracking distance, in chunks, of this type of entity + COMMENT for clients. This will be then modified by the server's tracking + COMMENT distance multiplier. METHOD method_18388 getTrackTickInterval ()I METHOD method_18389 alwaysUpdateVelocity ()Z METHOD method_19946 isFireImmune ()Z METHOD method_20210 isIn (Lnet/minecraft/class_3494;)Z ARG 1 tag METHOD method_20814 isSpawnableFarFromPlayer ()Z + METHOD method_24908 getImmediateDespawnRange ()I + METHOD method_24909 getDespawnStartRange ()I METHOD method_5881 loadFromEntityTag (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_2487;)V ARG 0 world ARG 1 player + ARG 2 entity ARG 3 itemTag METHOD method_5882 getTranslationKey ()Ljava/lang/String; METHOD method_5883 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world METHOD method_5884 getOriginY (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;ZLnet/minecraft/class_238;)D + ARG 0 world ARG 1 pos ARG 2 invertY ARG 3 boundingBox @@ -100,9 +115,13 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 7 alignPosition ARG 8 invertY CLASS class_1300 Builder - FIELD field_18071 size Lnet/minecraft/class_4048; + FIELD field_18071 dimensions Lnet/minecraft/class_4048; FIELD field_18982 fireImmune Z FIELD field_19424 spawnableFarFromPlayer Z + FIELD field_22471 immediateDespawnRange I + FIELD field_22472 despawnStartRange I + FIELD field_24087 maxTrackingRange I + FIELD field_24088 trackingTickInterval I FIELD field_6148 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6149 category Lnet/minecraft/class_1311; FIELD field_6150 summonable Z @@ -115,6 +134,12 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 2 height METHOD method_19947 makeFireImmune ()Lnet/minecraft/class_1299$class_1300; METHOD method_20815 spawnableFarFromPlayer ()Lnet/minecraft/class_1299$class_1300; + METHOD method_24910 immediateDespawnRange (I)Lnet/minecraft/class_1299$class_1300; + ARG 1 immediateDespawnRange + METHOD method_27299 maxTrackingRange (I)Lnet/minecraft/class_1299$class_1300; + ARG 1 maxTrackingRange + METHOD method_27300 trackingTickInterval (I)Lnet/minecraft/class_1299$class_1300; + ARG 1 trackingTickInterval METHOD method_5901 disableSummon ()Lnet/minecraft/class_1299$class_1300; METHOD method_5902 create (Lnet/minecraft/class_1311;)Lnet/minecraft/class_1299$class_1300; ARG 0 category diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index eae47cf9b1..faf4ff831b 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -100,6 +100,9 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_24490 endMonitor (Lnet/minecraft/class_4758;)V ARG 1 monitor METHOD method_27051 syncChunkWrites ()Z + METHOD method_27902 acceptsStatusQuery ()Z + METHOD method_27903 adjustTrackingDistance (I)I + ARG 1 initialDistance METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3717 start ()V METHOD method_3718 isFlightEnabled ()Z diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index d8100ee8f7..1c5e4dc158 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -47,5 +47,7 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_20324 functionPermissionLevel I FIELD field_23785 syncChunkWrites Z FIELD field_24056 enableJmxMonitoring Z + FIELD field_24453 enableStatus Z + FIELD field_24454 entityBroadcastRangePercentage I METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806; ARG 0 path diff --git a/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping index 3da63068ff..acf0c45870 100644 --- a/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3246 net/minecraft/server/network/ServerHandshakeNetworkHandler FIELD field_14153 connection Lnet/minecraft/class_2535; FIELD field_14154 server Lnet/minecraft/server/MinecraftServer; + FIELD field_24457 IGNORING_STATUS_REQUEST_MESSAGE Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V ARG 1 server ARG 2 connection diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 10f59953e3..24333fece8 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -141,6 +141,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_18736 updateCameraPosition (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_22844 getMaxTrackDistance ()I + METHOD method_27906 adjustTrackingDistance (I)I + ARG 1 initialDistance CLASS class_3216 TicketManager METHOD (Lnet/minecraft/class_3898;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V ARG 1 workerExecutor