diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index dbb4fc52ab..75c65924c2 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -60,6 +60,7 @@ CLASS none/bdo net/minecraft/client/Minecraft METHOD a swizzle (Ljava/io/InputStream;)Ljava/nio/ByteBuffer; ARG 0 stream METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; + ARG 0 runnable METHOD a checkGlError (Ljava/lang/String;)V ARG 0 title METHOD a setGui (Lnone/bgk;)V diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index 089ad92078..61c3f4b487 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -8,6 +8,8 @@ CLASS none/caj net/minecraft/server/IntegratedServer ARG 0 worldName METHOD a setGameMode (Lnone/ais;)V ARG 0 gameMode + METHOD a (Lnone/ais;Z)Ljava/lang/String; + ARG 0 gameMode METHOD a setDifficulty (Lnone/qx;)V ARG 0 difficulty METHOD a addSnooperInfo (Lnone/rj;)V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index fc0c5b4d72..a5088f2249 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -25,9 +25,11 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD e proxy Ljava/net/Proxy; FIELD f currentOperation Ljava/lang/String; FIELD g currentOperationPercent I + FIELD j jobs Ljava/util/Queue; FIELD k LOGGER Lorg/apache/logging/log4j/Logger; FIELD m snooper Lnone/rj; FIELD n gameDir Ljava/io/File; + FIELD o tickables Ljava/util/List; FIELD p networkManager Lnone/mf; FIELD q metadata Lnone/ke; FIELD r rand Ljava/util/Random; @@ -36,6 +38,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD v serverConfigManager Lnone/mr; FIELD w running Z FIELD x stopped Z + FIELD y ticks I FIELD z onlineMode Z METHOD (Ljava/io/File;Ljava/net/Proxy;Lnone/pf;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnone/mn;)V ARG 0 gameDir @@ -70,6 +73,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 permissionLevel ARG 1 commandName METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; + ARG 0 runnable METHOD a convertSave (Ljava/lang/String;)V METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/aiz;Ljava/lang/String;)V ARG 0 worldName @@ -80,12 +84,22 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 value METHOD a getEntityByUuid (Ljava/util/UUID;)Lnone/se; ARG 0 uuid + METHOD a scheduleOnMainThread (Ljava/util/concurrent/Callable;)Lcom/google/common/util/concurrent/ListenableFuture; + ARG 0 job METHOD a setGameMode (Lnone/ais;)V ARG 0 gameMode + METHOD a (Lnone/ais;Z)Ljava/lang/String; + ARG 0 gameMode + METHOD a (Lnone/aiu;Lnone/cn;Lnone/aak;)Z + ARG 0 world + ARG 1 pos + ARG 2 player METHOD a appendCommandFeedback (Lnone/fa;)V ARG 0 component METHOD a loadServerIcon (Lnone/ke;)V ARG 0 metadata + METHOD a addTickable (Lnone/ld;)V + ARG 0 tickable METHOD a getSpawnRadius (Lnone/lu;)I ARG 0 world METHOD a setConfigManager (Lnone/mr;)V @@ -124,6 +138,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD ak isStopped ()Z METHOD al getConfigManager ()Lnone/mr; METHOD am getNetworkManager ()Lnone/mf; + METHOD ao hasGui ()Z + METHOD ap getTicks ()I METHOD ar getSnooper ()Lnone/rj; METHOD as isSpawnProtectionEnabled ()I METHOD at shouldForceGameMode ()Z diff --git a/mappings/net/minecraft/server/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/ServerConfigurationManager.mapping index 93738605cc..4bfb2cc1b3 100644 --- a/mappings/net/minecraft/server/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/ServerConfigurationManager.mapping @@ -69,6 +69,8 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager ARG 0 profile METHOD f getPlayerNames ()[Ljava/lang/String; METHOD g getPlayerProfiles ()[Lcom/mojang/authlib/GameProfile; + METHOD h isOp (Lcom/mojang/authlib/GameProfile;)Z + ARG 0 profile METHOD j saveAllPlayerData ()V METHOD k getWhitelist ()Lnone/my; METHOD l getWhitelistedNames ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index b436880fe6..a87a6d6db9 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -5,6 +5,7 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer FIELD r eulaReader Lnone/kw; FIELD s generateStructures Z FIELD t gameMode Lnone/ais; + FIELD u gui Z METHOD (Ljava/io/File;Lnone/pf;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnone/mn;)V ARG 2 authService METHOD B exit ()V @@ -24,11 +25,18 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer ARG 1 defaultValue METHOD a setGameMode (Lnone/ais;)V ARG 0 gameMode + METHOD a (Lnone/ais;Z)Ljava/lang/String; + ARG 0 gameMode + METHOD a (Lnone/aiu;Lnone/cn;Lnone/aak;)Z + ARG 0 world + ARG 1 pos + ARG 2 player METHOD a addSnooperInfo (Lnone/rj;)V ARG 0 snooper METHOD aD getMaxWorldBorderRadius ()I METHOD aF getNetworkCompressionThreshold ()I METHOD aM getConfigManager ()Lnone/le; + METHOD aN startGui ()V METHOD aP getMaximumTickTime ()J METHOD a_ executeCommand (Ljava/lang/String;)Ljava/lang/String; ARG 0 command @@ -36,6 +44,7 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer METHOD ae isUsingNativeTransport ()Z METHOD ah areCommandBlocksEnabled ()Z METHOD al getConfigManager ()Lnone/mr; + METHOD ao hasGui ()Z METHOD as isSpawnProtectionEnabled ()I METHOD ax shouldAnnouncePlayerAchievements ()Z METHOD b getPropertiesFilename ()Ljava/lang/String; diff --git a/mappings/net/minecraft/sortme/GuiWorldSelectWorld.mapping b/mappings/net/minecraft/sortme/GuiWorldSelectWorld.mapping new file mode 100644 index 0000000000..a5ad6b04e4 --- /dev/null +++ b/mappings/net/minecraft/sortme/GuiWorldSelectWorld.mapping @@ -0,0 +1,13 @@ +CLASS none/biw net/minecraft/sortme/GuiWorldSelectWorld + CLASS none/biw$1 + METHOD a handle (ZI)V + CLASS none/biw$2 + METHOD a handle (ZI)V + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD e minecraft Lnone/bdo; + FIELD f guiWorldSelect Lnone/biv; + FIELD g worldSummary Lnone/bav; + FIELD j iconFile Ljava/io/File; + METHOD (Lnone/bix;Lnone/bav;Lnone/bau;)V + ARG 1 worldSummary + ARG 2 worldStorage diff --git a/mappings/net/minecraft/sortme/IMultiThreadedObject.mapping b/mappings/net/minecraft/sortme/IMultiThreadedObject.mapping index 7c43440b43..dc0ac78fdd 100644 --- a/mappings/net/minecraft/sortme/IMultiThreadedObject.mapping +++ b/mappings/net/minecraft/sortme/IMultiThreadedObject.mapping @@ -1,4 +1,4 @@ CLASS none/qp net/minecraft/sortme/IMultiThreadedObject METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; - ARG 0 task + ARG 0 runnable METHOD aE isMainThread ()Z diff --git a/mappings/net/minecraft/sortme/IWorldStorage.mapping b/mappings/net/minecraft/sortme/IWorldStorage.mapping new file mode 100644 index 0000000000..c5db651e6d --- /dev/null +++ b/mappings/net/minecraft/sortme/IWorldStorage.mapping @@ -0,0 +1,18 @@ +CLASS none/bau net/minecraft/sortme/IWorldStorage + METHOD a getName ()Ljava/lang/String; + METHOD a isConvertible (Ljava/lang/String;)Z + METHOD a rename (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 from + ARG 1 to + METHOD a convertLevel (Ljava/lang/String;Lnone/ot;)Z + METHOD a getSaveWorldHandler (Ljava/lang/String;Z)Lnone/bas; + METHOD b requiresConversion (Ljava/lang/String;)Z + METHOD b getFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; + METHOD c getWorldProperties (Ljava/lang/String;)Lnone/bar; + ARG 0 worldName + METHOD d clearAll ()V + METHOD d canCreate (Ljava/lang/String;)Z + ARG 0 worldName + METHOD e delete (Ljava/lang/String;)Z + ARG 0 name + METHOD f worldExists (Ljava/lang/String;)Z diff --git a/mappings/net/minecraft/sortme/SomeTextFormattingHelper.mapping b/mappings/net/minecraft/sortme/SomeTextFormattingHelper.mapping new file mode 100644 index 0000000000..d7d01204d5 --- /dev/null +++ b/mappings/net/minecraft/sortme/SomeTextFormattingHelper.mapping @@ -0,0 +1,4 @@ +CLASS none/ow net/minecraft/sortme/SomeTextFormattingHelper + FIELD a PATTERN Ljava/util/regex/Pattern; + METHOD a removeFormatting (Ljava/lang/String;)Ljava/lang/String; + ARG 0 text diff --git a/mappings/net/minecraft/sortme/WorldAnvilStorage.mapping b/mappings/net/minecraft/sortme/WorldAnvilStorage.mapping new file mode 100644 index 0000000000..79a3b11644 --- /dev/null +++ b/mappings/net/minecraft/sortme/WorldAnvilStorage.mapping @@ -0,0 +1,10 @@ +CLASS none/ban net/minecraft/sortme/WorldAnvilStorage + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Ljava/io/File;Lnone/pf;)V + ARG 0 gameDir + METHOD a getName ()Ljava/lang/String; + METHOD a isConvertible (Ljava/lang/String;)Z + METHOD a convertLevel (Ljava/lang/String;Lnone/ot;)Z + METHOD a getSaveWorldHandler (Ljava/lang/String;Z)Lnone/bas; + METHOD b requiresConversion (Ljava/lang/String;)Z + METHOD d clearAll ()V diff --git a/mappings/net/minecraft/sortme/WorldOldFormatStorage.mapping b/mappings/net/minecraft/sortme/WorldOldFormatStorage.mapping new file mode 100644 index 0000000000..4b927f44b2 --- /dev/null +++ b/mappings/net/minecraft/sortme/WorldOldFormatStorage.mapping @@ -0,0 +1,26 @@ +CLASS none/baq net/minecraft/sortme/WorldOldFormatStorage + FIELD a gameDir Ljava/io/File; + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Ljava/io/File;Lnone/pf;)V + ARG 0 gameDir + METHOD a getName ()Ljava/lang/String; + METHOD a getWorldProperties (Ljava/io/File;Lnone/pf;)Lnone/bar; + ARG 0 levelDat + METHOD a isConvertible (Ljava/lang/String;)Z + METHOD a rename (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 from + ARG 1 to + METHOD a convertLevel (Ljava/lang/String;Lnone/ot;)Z + METHOD a getSaveWorldHandler (Ljava/lang/String;Z)Lnone/bas; + METHOD a deleteRecursive ([Ljava/io/File;)Z + ARG 0 files + METHOD b requiresConversion (Ljava/lang/String;)Z + METHOD b getFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; + METHOD c getWorldProperties (Ljava/lang/String;)Lnone/bar; + ARG 0 worldName + METHOD d clearAll ()V + METHOD d canCreate (Ljava/lang/String;)Z + ARG 0 worldName + METHOD e delete (Ljava/lang/String;)Z + ARG 0 name + METHOD f worldExists (Ljava/lang/String;)Z diff --git a/mappings/net/minecraft/sortme/WorldSummary.mapping b/mappings/net/minecraft/sortme/WorldSummary.mapping new file mode 100644 index 0000000000..0078ec4634 --- /dev/null +++ b/mappings/net/minecraft/sortme/WorldSummary.mapping @@ -0,0 +1,23 @@ +CLASS none/bav net/minecraft/sortme/WorldSummary + FIELD a worldId Ljava/lang/String; + FIELD b name Ljava/lang/String; + FIELD c lastPlayed J + FIELD d getSizeOnDisk J + FIELD e requiresConversion Z + FIELD f gameMode Lnone/ais; + FIELD g hardcore Z + FIELD h commandsAllowed Z + METHOD (Lnone/bar;Ljava/lang/String;Ljava/lang/String;JZ)V + ARG 0 properties + ARG 1 worldId + METHOD a getWorldId ()Ljava/lang/String; + METHOD a compareTo (Lnone/bav;)I + ARG 0 to + METHOD b getName ()Ljava/lang/String; + METHOD c getSizeOnDisk ()J + METHOD d requiresConversion ()Z + METHOD e lastPlayed ()J + METHOD f getGameMode ()Lnone/ais; + METHOD g isHardcore ()Z + METHOD h areCommandsAllowed ()Z + METHOD i getDisplayName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index cea012940e..aa9c34c055 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -2,10 +2,12 @@ CLASS none/lu net/minecraft/world/WorldServer FIELD I server Lnet/minecraft/server/MinecraftServer; FIELD J entityTracker Lnone/lr; FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b disableAutoSave Z METHOD a isChunkLoaded (IIZ)Z ARG 0 chunkX ARG 1 chunkZ METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; + ARG 0 runnable METHOD a getEntityByUuid (Ljava/util/UUID;)Lnone/se; METHOD a spawnEntity (Lnone/se;)Z ARG 0 entity diff --git a/mappings/net/minecraft/world/generator/WorldGenerator.mapping b/mappings/net/minecraft/world/generator/WorldGenerator.mapping index bf6a310324..f9fc28b55c 100644 --- a/mappings/net/minecraft/world/generator/WorldGenerator.mapping +++ b/mappings/net/minecraft/world/generator/WorldGenerator.mapping @@ -6,3 +6,10 @@ CLASS none/aiz net/minecraft/world/generator/WorldGenerator FIELD f CUSTOMIZED Lnone/aiz; FIELD g DEBUG_ALL_BLOCK_STATES Lnone/aiz; FIELD h DEFAULT_1_1 Lnone/aiz; + FIELD j name Ljava/lang/String; + FIELD k version I + METHOD (ILjava/lang/String;I)V + ARG 1 name + ARG 2 version + METHOD a getName ()Ljava/lang/String; + METHOD d getVersion ()I diff --git a/mappings/none/biw.mapping b/mappings/none/biw.mapping deleted file mode 100644 index 6697c9c6ef..0000000000 --- a/mappings/none/biw.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS none/biw - CLASS none/biw$1 - METHOD a handle (ZI)V - CLASS none/biw$2 - METHOD a handle (ZI)V