From e1c2ee273f8e10303625b5bd3db44d7505c632de Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 4 Jun 2020 16:49:10 +0100 Subject: [PATCH] A handful of random mappings (#1417) * A handful of random mappings * follow the conventions lol * Review tweaks * and this --- mappings/net/minecraft/class_5304.mapping | 2 -- mappings/net/minecraft/class_5309.mapping | 2 ++ mappings/net/minecraft/class_5310.mapping | 2 ++ mappings/net/minecraft/class_5311.mapping | 2 ++ mappings/net/minecraft/class_5313.mapping | 2 ++ mappings/net/minecraft/class_5314.mapping | 2 ++ mappings/net/minecraft/item/ItemUsage.mapping | 2 ++ .../resource/ServerResourceManager.mapping | 20 +++++++++++++++++++ .../minecraft/server/MinecraftServer.mapping | 10 ++++++++++ .../server/command/CommandManager.mapping | 2 +- .../server/function/FunctionLoader.mapping | 20 +++++++++++++++++++ .../net/minecraft/tag/TagContainers.mapping | 16 +++++++++++++++ .../JsonSerializable.mapping} | 2 +- .../util/JsonSerializableType.mapping | 3 +++ .../minecraft/world/SaveProperties.mapping | 1 + mappings/net/minecraft/world/World.mapping | 9 +++++++++ .../world/gen/GeneratorOptions.mapping | 1 + .../net/minecraft/world/gen/Spawner.mapping | 2 ++ 18 files changed, 96 insertions(+), 4 deletions(-) delete mode 100644 mappings/net/minecraft/class_5304.mapping create mode 100644 mappings/net/minecraft/class_5309.mapping create mode 100644 mappings/net/minecraft/class_5310.mapping create mode 100644 mappings/net/minecraft/class_5311.mapping create mode 100644 mappings/net/minecraft/class_5313.mapping create mode 100644 mappings/net/minecraft/class_5314.mapping create mode 100644 mappings/net/minecraft/item/ItemUsage.mapping create mode 100644 mappings/net/minecraft/resource/ServerResourceManager.mapping create mode 100644 mappings/net/minecraft/server/function/FunctionLoader.mapping create mode 100644 mappings/net/minecraft/tag/TagContainers.mapping rename mappings/net/minecraft/{class_5335.mapping => util/JsonSerializable.mapping} (78%) create mode 100644 mappings/net/minecraft/util/JsonSerializableType.mapping create mode 100644 mappings/net/minecraft/world/gen/Spawner.mapping diff --git a/mappings/net/minecraft/class_5304.mapping b/mappings/net/minecraft/class_5304.mapping deleted file mode 100644 index 898f019b19..0000000000 --- a/mappings/net/minecraft/class_5304.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_5304 - METHOD method_6445 spawn (Lnet/minecraft/class_3218;ZZ)I diff --git a/mappings/net/minecraft/class_5309.mapping b/mappings/net/minecraft/class_5309.mapping new file mode 100644 index 0000000000..cee7cefc5f --- /dev/null +++ b/mappings/net/minecraft/class_5309.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5309 + FIELD field_24804 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/class_5310.mapping b/mappings/net/minecraft/class_5310.mapping new file mode 100644 index 0000000000..2c126b683b --- /dev/null +++ b/mappings/net/minecraft/class_5310.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5310 + FIELD field_24817 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/class_5311.mapping b/mappings/net/minecraft/class_5311.mapping new file mode 100644 index 0000000000..2109dcf63a --- /dev/null +++ b/mappings/net/minecraft/class_5311.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5311 + FIELD field_24821 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/class_5313.mapping b/mappings/net/minecraft/class_5313.mapping new file mode 100644 index 0000000000..ea01e1db85 --- /dev/null +++ b/mappings/net/minecraft/class_5313.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5313 + FIELD field_24913 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/class_5314.mapping b/mappings/net/minecraft/class_5314.mapping new file mode 100644 index 0000000000..59c8cfda89 --- /dev/null +++ b/mappings/net/minecraft/class_5314.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5314 + FIELD field_24917 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/item/ItemUsage.mapping b/mappings/net/minecraft/item/ItemUsage.mapping new file mode 100644 index 0000000000..de3411daa8 --- /dev/null +++ b/mappings/net/minecraft/item/ItemUsage.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5328 net/minecraft/item/ItemUsage + METHOD method_29282 consumeHeldItem (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; diff --git a/mappings/net/minecraft/resource/ServerResourceManager.mapping b/mappings/net/minecraft/resource/ServerResourceManager.mapping new file mode 100644 index 0000000000..be6dd8ce02 --- /dev/null +++ b/mappings/net/minecraft/resource/ServerResourceManager.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager + FIELD field_25335 resourceManager Lnet/minecraft/class_3296; + FIELD field_25336 commandManager Lnet/minecraft/class_2170; + FIELD field_25337 recipeManager Lnet/minecraft/class_1863; + FIELD field_25338 registryTagManager Lnet/minecraft/class_3505; + FIELD field_25339 lootConditionManager Lnet/minecraft/class_4567; + FIELD field_25340 lootManager Lnet/minecraft/class_60; + FIELD field_25341 serverAdvancementLoader Lnet/minecraft/class_2989; + FIELD field_25342 functionLoader Lnet/minecraft/class_5349; + METHOD (ZI)V + ARG 1 dedicated + METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349; + METHOD method_29466 reload (Ljava/util/List;ZILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + METHOD method_29468 getLootConditionManager ()Lnet/minecraft/class_4567; + METHOD method_29469 getLootManager ()Lnet/minecraft/class_60; + METHOD method_29470 getRegistryTagManager ()Lnet/minecraft/class_3505; + METHOD method_29471 getRecipeManager ()Lnet/minecraft/class_1863; + METHOD method_29472 getCommandManager ()Lnet/minecraft/class_2170; + METHOD method_29473 getServerAdvancementLoader ()Lnet/minecraft/class_2989; + METHOD method_29474 getResourceManager ()Lnet/minecraft/class_3300; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 597d34bd3f..a6b3bb5730 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -11,6 +11,9 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_22250 tickTimeTracker Lnet/minecraft/class_4757; FIELD field_23784 session Lnet/minecraft/class_32$class_5143; FIELD field_24370 structureManager Lnet/minecraft/class_3485; + FIELD field_24372 saveProperties Lnet/minecraft/class_5219; + FIELD field_25132 dimensionTracker Lnet/minecraft/class_5318$class_5319; + FIELD field_25318 serverResourceManager Lnet/minecraft/class_5350; FIELD field_4543 onlineMode Z FIELD field_4544 running Z FIELD field_4545 forceGameMode Z @@ -88,12 +91,19 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_24489 stopDebug ()Lnet/minecraft/class_3696; METHOD method_24490 endMonitor (Lnet/minecraft/class_4758;)V ARG 1 monitor + METHOD method_27050 getSavePath (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; METHOD method_27051 syncChunkWrites ()Z METHOD method_27725 convertLevel (Lnet/minecraft/class_32$class_5143;)V METHOD method_27727 getStructureManager ()Lnet/minecraft/class_3485; + METHOD method_27728 getSaveProperties ()Lnet/minecraft/class_5219; + METHOD method_27729 updateMobSpawnOptions ()V + METHOD method_27901 setupSpawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_5268;ZZZ)V METHOD method_27902 acceptsStatusQuery ()Z METHOD method_27903 adjustTrackingDistance (I)I ARG 1 initialDistance + METHOD method_29435 getWorldRegistryKeys ()Ljava/util/Set; + METHOD method_29438 createResourcePackManager (Ljava/nio/file/Path;Lnet/minecraft/class_5219;Z)Lnet/minecraft/class_3283; + METHOD method_29439 reloadResources (Ljava/util/Collection;)Ljava/util/concurrent/CompletableFuture; METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3717 start ()V METHOD method_3718 isFlightEnabled ()Z diff --git a/mappings/net/minecraft/server/command/CommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping index f91efea667..b045723d7a 100644 --- a/mappings/net/minecraft/server/command/CommandManager.mapping +++ b/mappings/net/minecraft/server/command/CommandManager.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager FIELD field_9832 dispatcher Lcom/mojang/brigadier/CommandDispatcher; FIELD field_9833 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Z)V - ARG 1 isDedicatedServer + ARG 1 dedicated METHOD method_23917 getException (Lcom/mojang/brigadier/ParseResults;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; ARG 0 parse METHOD method_9235 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; diff --git a/mappings/net/minecraft/server/function/FunctionLoader.mapping b/mappings/net/minecraft/server/function/FunctionLoader.mapping new file mode 100644 index 0000000000..381136a204 --- /dev/null +++ b/mappings/net/minecraft/server/function/FunctionLoader.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader + FIELD field_25326 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_25327 PATH_PREFIX_LENGHT I + FIELD field_25328 PATH_SUFFIX_LENGHT I + FIELD field_25329 functions Ljava/util/Map; + FIELD field_25330 tags Lnet/minecraft/class_3503; + FIELD field_25331 level I + FIELD field_25332 commandDispatcher Lcom/mojang/brigadier/CommandDispatcher; + METHOD (ILcom/mojang/brigadier/CommandDispatcher;)V + ARG 1 level + ARG 2 commandDispatcher + METHOD method_29447 getFunctions ()Ljava/util/Map; + METHOD method_29450 readLines (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)Ljava/util/List; + ARG 0 resourceManager + ARG 1 id + METHOD method_29456 get (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 id + METHOD method_29458 getTags ()Lnet/minecraft/class_3503; + METHOD method_29459 getOrCreateTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494; + ARG 1 id diff --git a/mappings/net/minecraft/tag/TagContainers.mapping b/mappings/net/minecraft/tag/TagContainers.mapping new file mode 100644 index 0000000000..32c9fbe916 --- /dev/null +++ b/mappings/net/minecraft/tag/TagContainers.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_5323 net/minecraft/tag/TagContainers + FIELD field_25149 instance Lnet/minecraft/class_5323; + FIELD field_25150 blocks Lnet/minecraft/class_3503; + FIELD field_25151 items Lnet/minecraft/class_3503; + FIELD field_25152 fluids Lnet/minecraft/class_3503; + FIELD field_25153 entityTypes Lnet/minecraft/class_3503; + METHOD (Lnet/minecraft/class_3503;Lnet/minecraft/class_3503;Lnet/minecraft/class_3503;Lnet/minecraft/class_3503;)V + ARG 1 blocks + ARG 2 items + ARG 3 fluids + ARG 4 entityTypes + METHOD method_29218 blocks ()Lnet/minecraft/class_3503; + METHOD method_29220 items ()Lnet/minecraft/class_3503; + METHOD method_29221 fluids ()Lnet/minecraft/class_3503; + METHOD method_29222 entityTypes ()Lnet/minecraft/class_3503; + METHOD method_29223 instance ()Lnet/minecraft/class_5323; diff --git a/mappings/net/minecraft/class_5335.mapping b/mappings/net/minecraft/util/JsonSerializable.mapping similarity index 78% rename from mappings/net/minecraft/class_5335.mapping rename to mappings/net/minecraft/util/JsonSerializable.mapping index 24bd8b93c5..300bcc7598 100644 --- a/mappings/net/minecraft/class_5335.mapping +++ b/mappings/net/minecraft/util/JsonSerializable.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_5335 +CLASS net/minecraft/class_5335 net/minecraft/util/JsonSerializable METHOD method_516 toJson (Lcom/google/gson/JsonObject;Ljava/lang/Object;Lcom/google/gson/JsonSerializationContext;)V METHOD method_517 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/JsonSerializableType.mapping b/mappings/net/minecraft/util/JsonSerializableType.mapping new file mode 100644 index 0000000000..090e4c2029 --- /dev/null +++ b/mappings/net/minecraft/util/JsonSerializableType.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5336 net/minecraft/util/JsonSerializableType + FIELD field_25204 jsonSerializer Lnet/minecraft/class_5335; + METHOD method_29312 getJsonSerializer ()Lnet/minecraft/class_5335; diff --git a/mappings/net/minecraft/world/SaveProperties.mapping b/mappings/net/minecraft/world/SaveProperties.mapping index ed65a044c4..e0099927ae 100644 --- a/mappings/net/minecraft/world/SaveProperties.mapping +++ b/mappings/net/minecraft/world/SaveProperties.mapping @@ -31,3 +31,4 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties METHOD method_27440 getFormatName (I)Ljava/lang/String; ARG 1 id METHOD method_27859 getMainWorldProperties ()Lnet/minecraft/class_5268; + METHOD method_28057 getGeneratorOptions ()Lnet/minecraft/class_5285; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 34c4673c5c..4c366acf47 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -3,6 +3,13 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_17086 thread Ljava/lang/Thread; FIELD field_18139 unloadedBlockEntities Ljava/util/List; FIELD field_20639 biomeAccess Lnet/minecraft/class_4543; + FIELD field_24496 debugWorld Z + FIELD field_25176 registryKey Lnet/minecraft/class_5321; + FIELD field_25177 dimensionRegistryKey Lnet/minecraft/class_5321; + FIELD field_25178 CODEC Lcom/mojang/serialization/Codec; + FIELD field_25179 OVERWORLD Lnet/minecraft/class_5321; + FIELD field_25180 NETHER Lnet/minecraft/class_5321; + FIELD field_25181 END Lnet/minecraft/class_5321; FIELD field_9223 border Lnet/minecraft/class_2784; FIELD field_9224 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_9226 ambientDarkness I @@ -64,6 +71,8 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_26372 getCollisionHeightAt (Lnet/minecraft/class_2338;)D ARG 1 pos METHOD method_27982 isDebugWorld ()Z + METHOD method_27983 getRegistryKey ()Lnet/minecraft/class_5321; + METHOD method_29287 getDimensionRegistryKey ()Lnet/minecraft/class_5321; METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping index 79fbc59390..bec341c48a 100644 --- a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping +++ b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping @@ -32,3 +32,4 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions METHOD method_28036 withBonusChest ()Lnet/minecraft/class_5285; METHOD method_28037 toggleGenerateStructures ()Lnet/minecraft/class_5285; METHOD method_28038 toggleBonusChest ()Lnet/minecraft/class_5285; + METHOD method_28609 getDimensionMap ()Ljava/util/LinkedHashMap; diff --git a/mappings/net/minecraft/world/gen/Spawner.mapping b/mappings/net/minecraft/world/gen/Spawner.mapping new file mode 100644 index 0000000000..bca4420494 --- /dev/null +++ b/mappings/net/minecraft/world/gen/Spawner.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5304 net/minecraft/world/gen/Spawner + METHOD method_6445 spawn (Lnet/minecraft/class_3218;ZZ)I