From 23dce9491b757d5b805d6eb8b49c68ac857fc83e Mon Sep 17 00:00:00 2001 From: YanisBft Date: Mon, 28 Jun 2021 16:22:10 +0200 Subject: [PATCH] Random server mappings (#2512) * Random server mappings * Update mappings/net/minecraft/server/ServerConfigEntry.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * update enigma Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- gradle.properties | 2 +- .../net/minecraft/server/ServerConfigEntry.mapping | 2 +- .../net/minecraft/server/ServerMetadata.mapping | 2 ++ .../server/command/ServerCommandSource.mapping | 14 +++++++------- .../minecraft/server/dedicated/ServerMBean.mapping | 2 +- .../dedicated/ServerPropertiesLoader.mapping | 2 ++ .../minecraft/server/filter/TextFilterer.mapping | 10 ++++++++++ .../server/network/ServerPlayerEntity.mapping | 3 +++ .../server/world/ServerChunkManager.mapping | 6 ++++-- .../net/minecraft/server/world/ServerWorld.mapping | 2 +- .../server/world/ThreadedAnvilChunkStorage.mapping | 8 ++++++-- mappings/net/minecraft/structure/Structure.mapping | 2 ++ .../net/minecraft/util/math/BlockPointer.mapping | 2 +- 13 files changed, 41 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index de63cb4692..b35bab6831 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx4G -enigma_version=1.2.0 +enigma_version=1.3.2 stitch_version=0.6.1 unpick_version=2.2.0 cfr_version=0.0.3 diff --git a/mappings/net/minecraft/server/ServerConfigEntry.mapping b/mappings/net/minecraft/server/ServerConfigEntry.mapping index e7c392ec35..f34e06bc23 100644 --- a/mappings/net/minecraft/server/ServerConfigEntry.mapping +++ b/mappings/net/minecraft/server/ServerConfigEntry.mapping @@ -4,5 +4,5 @@ CLASS net/minecraft/class_3330 net/minecraft/server/ServerConfigEntry ARG 1 key METHOD method_14626 getKey ()Ljava/lang/Object; METHOD method_14627 isInvalid ()Z - METHOD method_24896 fromJson (Lcom/google/gson/JsonObject;)V + METHOD method_24896 write (Lcom/google/gson/JsonObject;)V ARG 1 json diff --git a/mappings/net/minecraft/server/ServerMetadata.mapping b/mappings/net/minecraft/server/ServerMetadata.mapping index 51ab6b6d31..227940cca0 100644 --- a/mappings/net/minecraft/server/ServerMetadata.mapping +++ b/mappings/net/minecraft/server/ServerMetadata.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_2926 net/minecraft/server/ServerMetadata FIELD field_13284 description Lnet/minecraft/class_2561; FIELD field_13285 players Lnet/minecraft/class_2926$class_2927; FIELD field_13286 version Lnet/minecraft/class_2926$class_2930; + FIELD field_33375 FAVICON_WIDTH I + FIELD field_33376 FAVICON_HEIGHT I METHOD method_12677 setFavicon (Ljava/lang/String;)V ARG 1 favicon METHOD method_12678 getFavicon ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 7bd83e00d4..851925eea8 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -13,8 +13,8 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource FIELD field_9822 rotation Lnet/minecraft/class_241; FIELD field_9823 silent Z FIELD field_9824 REQUIRES_PLAYER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_9825 name Lnet/minecraft/class_2561; - FIELD field_9826 simpleName Ljava/lang/String; + FIELD field_9825 displayName Lnet/minecraft/class_2561; + FIELD field_9826 name Ljava/lang/String; FIELD field_9827 REQUIRES_ENTITY_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_9828 world Lnet/minecraft/class_3218; METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;)V @@ -23,8 +23,8 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 3 rot ARG 4 world ARG 5 level - ARG 6 simpleName - ARG 7 name + ARG 6 name + ARG 7 displayName ARG 8 server ARG 9 entity METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLcom/mojang/brigadier/ResultConsumer;Lnet/minecraft/class_2183$class_2184;)V @@ -33,8 +33,8 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 3 rot ARG 4 world ARG 5 level - ARG 6 simpleName - ARG 7 name + ARG 6 name + ARG 7 displayName ARG 8 server ARG 9 entity ARG 10 silent @@ -52,7 +52,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 1 consumer ARG 2 merger METHOD method_9210 getRotation ()Lnet/minecraft/class_241; - METHOD method_9211 getMinecraftServer ()Lnet/minecraft/server/MinecraftServer; + METHOD method_9211 getServer ()Lnet/minecraft/server/MinecraftServer; METHOD method_9212 sendToOps (Lnet/minecraft/class_2561;)V ARG 1 message METHOD method_9213 sendError (Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/server/dedicated/ServerMBean.mapping b/mappings/net/minecraft/server/dedicated/ServerMBean.mapping index 2bb1bc7ff6..7253fe1b92 100644 --- a/mappings/net/minecraft/server/dedicated/ServerMBean.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerMBean.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_5169 net/minecraft/server/dedicated/ServerMBean COMMENT @see javax.management.DynamicMBean FIELD field_23970 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_23971 server Lnet/minecraft/server/MinecraftServer; - FIELD field_23972 beanInfo Ljavax/management/MBeanInfo; + FIELD field_23972 mBeanInfo Ljavax/management/MBeanInfo; FIELD field_23973 entries Ljava/util/Map; METHOD (Lnet/minecraft/server/MinecraftServer;)V ARG 1 server diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesLoader.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesLoader.mapping index 8092b1177f..04e3b3e447 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesLoader.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesLoader.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_3807 net/minecraft/server/dedicated/ServerPropertiesLoader FIELD field_16846 path Ljava/nio/file/Path; FIELD field_16847 propertiesHandler Lnet/minecraft/class_3806; + METHOD (Ljava/nio/file/Path;)V + ARG 1 path METHOD method_16717 getPropertiesHandler ()Lnet/minecraft/class_3806; METHOD method_16718 apply (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_3807; METHOD method_16719 store ()V diff --git a/mappings/net/minecraft/server/filter/TextFilterer.mapping b/mappings/net/minecraft/server/filter/TextFilterer.mapping index ef5ce68204..a4e7b2a655 100644 --- a/mappings/net/minecraft/server/filter/TextFilterer.mapping +++ b/mappings/net/minecraft/server/filter/TextFilterer.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer ARG 3 ruleId ARG 4 serverId ARG 5 ignorer + ARG 6 threadsNumber METHOD method_31295 sendJsonRequest (Lcom/google/gson/JsonObject;Ljava/net/URL;)Lcom/google/gson/JsonObject; ARG 1 payload ARG 2 endpoint @@ -43,8 +44,17 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer CLASS class_5515 HashIgnorer FIELD field_26834 NEVER_IGNORE Lnet/minecraft/class_5514$class_5515; FIELD field_26835 IGNORE_IF_MATCHES_ALL Lnet/minecraft/class_5514$class_5515; + METHOD method_31310 (Ljava/lang/String;I)Z + ARG 0 hashes + ARG 1 hashesSize + METHOD method_31312 (Ljava/lang/String;I)Z + ARG 0 hashes + ARG 1 hashesSize METHOD method_33806 internalDropHashes (I)Lnet/minecraft/class_5514$class_5515; ARG 0 hashesToDrop + METHOD method_33807 (ILjava/lang/String;I)Z + ARG 1 hashes + ARG 2 hashesSize METHOD method_33808 dropHashes (I)Lnet/minecraft/class_5514$class_5515; ARG 0 hashesToDrop METHOD shouldIgnore (Ljava/lang/String;I)Z diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 806348b06f..90b64c2c42 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -53,6 +53,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 oldPlayer ARG 2 alive METHOD method_14205 sendInitialChunkPackets (Lnet/minecraft/class_1923;Lnet/minecraft/class_2596;Lnet/minecraft/class_2596;)V + ARG 1 chunkPos + ARG 2 chunkDataPacket + ARG 3 lightUpdatePacket METHOD method_14206 getPlayerListName ()Lnet/minecraft/class_2561; METHOD method_14207 handleFall (DZ)V ARG 1 heightDifference diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 70cfc61159..a4703aa970 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager - FIELD field_13921 lightProvider Lnet/minecraft/class_3227; + FIELD field_13921 lightingProvider Lnet/minecraft/class_3227; FIELD field_13928 lastMobSpawningTime J FIELD field_13929 spawnMonsters Z FIELD field_13934 CHUNK_STATUSES Ljava/util/List; @@ -14,7 +14,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager FIELD field_19335 chunkPosCache [J FIELD field_19336 chunkStatusCache [Lnet/minecraft/class_2806; FIELD field_19337 chunkCache [Lnet/minecraft/class_2791; - FIELD field_24455 spawnEntry Lnet/minecraft/class_1948$class_5262; + FIELD field_24455 spawnInfo Lnet/minecraft/class_1948$class_5262; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;IZLnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;)V ARG 1 world ARG 2 session @@ -100,6 +100,8 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager ARG 1 pos ARG 3 chunkConsumer METHOD method_27908 getSpawnInfo ()Lnet/minecraft/class_1948$class_5262; + METHOD method_37114 isTickingFutureReady (J)Z + ARG 1 pos CLASS class_4212 MainThreadExecutor METHOD (Lnet/minecraft/class_3215;Lnet/minecraft/class_1937;)V ARG 2 world diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index cdf0acad68..f8d41ae43b 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_18811 raidManager Lnet/minecraft/class_3767; FIELD field_23787 structureAccessor Lnet/minecraft/class_5138; FIELD field_24456 worldProperties Lnet/minecraft/class_5268; - FIELD field_24624 serverChunkManager Lnet/minecraft/class_3215; + FIELD field_24624 chunkManager Lnet/minecraft/class_3215; FIELD field_25141 spawners Ljava/util/List; FIELD field_25142 enderDragonFight Lnet/minecraft/class_2881; FIELD field_25143 shouldTickTime Z diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 91613f39bd..1e43df65c6 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_17212 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_17213 currentChunkHolders Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; FIELD field_17214 world Lnet/minecraft/class_3218; - FIELD field_17215 serverLightingProvider Lnet/minecraft/class_3227; + FIELD field_17215 lightingProvider Lnet/minecraft/class_3227; FIELD field_17216 mainThreadExecutor Lnet/minecraft/class_1255; FIELD field_17218 chunkGenerator Lnet/minecraft/class_2794; FIELD field_17220 chunkHolders Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; @@ -42,7 +42,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 11 persistentStateManagerFactory ARG 12 viewDistance ARG 13 dsync - METHOD method_17212 getLightProvider ()Lnet/minecraft/class_3227; + METHOD method_17212 getLightingProvider ()Lnet/minecraft/class_3227; METHOD method_17214 setViewDistance (I)V ARG 1 watchDistance METHOD method_17216 getChunkHolder (J)Lnet/minecraft/class_3193; @@ -134,6 +134,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor COMMENT tracking status of those entities to all players. It then checks if any player COMMENT has changed chunk sections, and updates all entities tracking status to those COMMENT players. This ensures all possible updates are accounted for. + METHOD method_18843 (Lnet/minecraft/class_3193;Ljava/util/concurrent/CompletableFuture;JLnet/minecraft/class_2791;)V + ARG 5 chunk METHOD method_19488 getPointOfInterestStorage ()Lnet/minecraft/class_4153; METHOD method_20441 releaseLightTicket (Lnet/minecraft/class_1923;)V ARG 1 pos @@ -155,6 +157,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 player METHOD method_21619 dump (Ljava/io/Writer;)V ARG 1 writer + METHOD method_21620 (Lnet/minecraft/class_2791;)Ljava/util/Optional; + ARG 0 chunk METHOD method_21676 getFutureStatus (Ljava/util/concurrent/CompletableFuture;)Ljava/lang/String; METHOD method_23272 getChunkLoadingDebugInfo (Lnet/minecraft/class_1923;)Ljava/lang/String; ARG 1 chunkPos diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index b69c4ef46b..251d461d13 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 2 rotation ARG 3 offsetX ARG 4 offsetZ + METHOD method_15163 (Lnet/minecraft/class_1297;)Z + ARG 0 entity METHOD method_15164 addEntitiesFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 firstCorner diff --git a/mappings/net/minecraft/util/math/BlockPointer.mapping b/mappings/net/minecraft/util/math/BlockPointer.mapping index 3b5e419096..6fbb5d556a 100644 --- a/mappings/net/minecraft/util/math/BlockPointer.mapping +++ b/mappings/net/minecraft/util/math/BlockPointer.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2342 net/minecraft/util/math/BlockPointer METHOD method_10120 getBlockState ()Lnet/minecraft/class_2680; METHOD method_10121 getBlockEntity ()Lnet/minecraft/class_2586; - METHOD method_10122 getBlockPos ()Lnet/minecraft/class_2338; + METHOD method_10122 getPos ()Lnet/minecraft/class_2338; METHOD method_10207 getWorld ()Lnet/minecraft/class_3218;