From 3c56fa2ef629139682309191b202b439392968c2 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 19 Nov 2021 21:48:47 +1100 Subject: [PATCH] Server stuff (#2852) --- .../server/command/AdvancementCommand.mapping | 2 ++ .../server/command/WorldBorderCommand.mapping | 1 + .../dedicated/ServerPropertiesHandler.mapping | 2 ++ .../server/network/ServerPlayerEntity.mapping | 4 ++++ .../server/world/ChunkTicketManager.mapping | 6 +++++- .../net/minecraft/server/world/ServerWorld.mapping | 11 +++++++++++ .../server/world/ThreadedAnvilChunkStorage.mapping | 13 +++++++++++++ 7 files changed, 38 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/server/command/AdvancementCommand.mapping b/mappings/net/minecraft/server/command/AdvancementCommand.mapping index 642f4a1b9f..d7a3a6e9a3 100644 --- a/mappings/net/minecraft/server/command/AdvancementCommand.mapping +++ b/mappings/net/minecraft/server/command/AdvancementCommand.mapping @@ -56,6 +56,8 @@ CLASS net/minecraft/class_3008 net/minecraft/server/command/AdvancementCommand ARG 0 context CLASS class_3009 Operation FIELD field_13454 commandPrefix Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name METHOD method_12999 processAll (Lnet/minecraft/class_3222;Ljava/lang/Iterable;)I ARG 1 player ARG 2 advancements diff --git a/mappings/net/minecraft/server/command/WorldBorderCommand.mapping b/mappings/net/minecraft/server/command/WorldBorderCommand.mapping index 0da7a90f74..0d2e4b4ed8 100644 --- a/mappings/net/minecraft/server/command/WorldBorderCommand.mapping +++ b/mappings/net/minecraft/server/command/WorldBorderCommand.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_3158 net/minecraft/server/command/WorldBorderCommand FIELD field_13778 DAMAGE_BUFFER_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13779 SET_FAILED_BIG_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13780 SET_FAILED_NO_CHANGE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_36188 SET_FAILED_FAR_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_13854 executeSet (Lnet/minecraft/class_2168;DJ)I ARG 0 source ARG 1 distance diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index 4ceb7f6854..aec7d49588 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -51,8 +51,10 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_34883 simulationDistance I FIELD field_35564 hideOnlinePlayers Z METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806; + ARG 0 path METHOD method_16715 (Ljava/lang/Integer;)Ljava/lang/Integer; ARG 0 maxWorldSize METHOD method_27905 (Ljava/lang/Integer;)Ljava/lang/Integer; ARG 0 percentage METHOD method_37371 getGeneratorOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285; + ARG 1 registryManager diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 56c7fc2515..fbb9c8bfac 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -174,6 +174,10 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 2 direction METHOD method_26287 isBedTooFarAway (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_29777 (Lnet/minecraft/class_1308;)V + ARG 1 entity + METHOD method_29778 (Lnet/minecraft/class_1308;)Z + ARG 0 entity METHOD method_29779 forgiveMobAnger ()V METHOD method_30313 createEndSpawnPlatform (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 1 world diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index b1646fb768..c06de2f59d 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager ARG 2 forced METHOD method_14038 getChunkHolder (J)Lnet/minecraft/class_3193; ARG 1 pos + METHOD method_14040 (Lnet/minecraft/class_3228;)Z + ARG 0 ticket METHOD method_14042 addTicket (JLnet/minecraft/class_3228;)V ARG 1 position ARG 3 ticket @@ -46,8 +48,10 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager ARG 1 pos ARG 3 level ARG 4 holder + METHOD method_15891 (Lnet/minecraft/class_3898;Lnet/minecraft/class_3193;)V + ARG 2 holder METHOD method_15892 tick (Lnet/minecraft/class_3898;)Z - ARG 1 tacs + ARG 1 chunkStorage METHOD method_17290 addTicketWithLevel (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;ILjava/lang/Object;)V ARG 1 type ARG 2 pos diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index d7d19c1c7f..103ff97303 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -105,6 +105,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld COMMENT in the returned list or {@link ClassCastException} can occur. COMMENT COMMENT @return a list of entities of the given type + ARG 1 filter ARG 2 predicate COMMENT a predicate which returned entities must satisfy METHOD method_18199 (Lnet/minecraft/class_1309;)Z @@ -163,6 +164,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 pos METHOD method_19503 hasRaidAt (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_19535 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V + ARG 2 poiType METHOD method_20588 isNearOccupiedPointOfInterest (Lnet/minecraft/class_4076;)Z ARG 1 sectionPos METHOD method_21624 dumpEntities (Ljava/io/Writer;Ljava/lang/Iterable;)V @@ -174,6 +177,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 writer METHOD method_23658 clearUpdatesInArea (Lnet/minecraft/class_3341;)V ARG 1 box + METHOD method_23659 (Lnet/minecraft/class_3341;Lnet/minecraft/class_1919;)Z + ARG 1 event METHOD method_23660 wakeSleepingPlayers ()V METHOD method_24500 locateBiome (Lnet/minecraft/class_1959;Lnet/minecraft/class_2338;II)Lnet/minecraft/class_2338; ARG 1 biome @@ -193,10 +198,14 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 timeOfDay METHOD method_29200 createEndSpawnPlatform (Lnet/minecraft/class_3218;)V ARG 0 world + METHOD method_29201 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 pos METHOD method_29202 tickSpawners (ZZ)V ARG 1 spawnMonsters ARG 2 spawnAnimals METHOD method_29203 tickTime ()V + METHOD method_29204 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 pos METHOD method_30630 getSpawnAngle ()F METHOD method_30736 shouldCreateNewEntityWithPassenger (Lnet/minecraft/class_1297;)Z ARG 1 entity @@ -214,6 +223,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 2 entity METHOD method_31421 (Lnet/minecraft/class_4158;)Z ARG 0 poiType + METHOD method_31422 (Ljava/util/function/Predicate;Ljava/util/List;Lnet/minecraft/class_1297;)V + ARG 2 entity METHOD method_31423 loadEntities (Ljava/util/stream/Stream;)V ARG 1 entities METHOD method_31424 getDragonPart (I)Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index b3943b9602..0619b4ad9a 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -54,11 +54,16 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 pos ARG 3 level ARG 4 holder + METHOD method_17219 (Lnet/minecraft/class_1923;ILorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_3222;)V + ARG 4 player METHOD method_17220 getRegion (Lnet/minecraft/class_1923;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture; ARG 1 centerChunk ARG 2 margin ARG 3 distanceToStatus METHOD method_17226 convertToFullChunk (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunkHolder + METHOD method_17227 (Lnet/minecraft/class_3193;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791; + ARG 2 chunk METHOD method_17228 save (Lnet/minecraft/class_2791;)Z ARG 1 chunk METHOD method_17229 getRequiredStatusForGeneration (Lnet/minecraft/class_2806;I)Lnet/minecraft/class_2806; @@ -78,6 +83,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 5 newWithinViewDistance METHOD method_17242 save (Z)V ARG 1 flush + METHOD method_17243 (Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_2818;Lnet/minecraft/class_3222;)V + ARG 3 player METHOD method_17244 updateHolderMap ()Z METHOD method_17247 makeChunkEntitiesTickable (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; ARG 1 pos @@ -134,6 +141,12 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_20458 tryUnloadChunk (JLnet/minecraft/class_3193;)V ARG 1 pos ARG 3 holder + METHOD method_20582 (Lnet/minecraft/class_2791;)Z + ARG 0 chunk + METHOD method_20583 (Lnet/minecraft/class_3193;)V + ARG 1 chunkHolder + METHOD method_20584 (Lnet/minecraft/class_3193;)Lnet/minecraft/class_2791; + ARG 1 chunkHolder METHOD method_20605 unloadChunks (Ljava/util/function/BooleanSupplier;)V ARG 1 shouldKeepTicking METHOD method_20617 upgradeChunk (Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture;