Merge branch '16w33a' of github.com:FabricMC/pomf into darkhax-pr4

This commit is contained in:
asiekierka 2016-08-25 11:34:35 +02:00
commit 272da14070
10 changed files with 48 additions and 3 deletions

View File

@ -6,6 +6,7 @@ CLASS none/bdo net/minecraft/client/Minecraft
FIELD L DISPLAY_MODES Ljava/util/List;
FIELD Q textureManager Lnone/bxc;
FIELD R instance Lnone/bdo;
FIELD T fullscreen Z
FIELD Z snooper Lnone/rj;
FIELD aB defaultResourcePacks Ljava/util/List;
FIELD aC mcResourcePack Lnone/bxr;
@ -17,6 +18,7 @@ CLASS none/bdo net/minecraft/client/Minecraft
FIELD ab itemRenderer Lnone/bto;
FIELD aj server Lnone/caj;
FIELD an netProxy Ljava/net/Proxy;
FIELD ap fps I
FIELD av isDemo Z
FIELD az resourceManager Lnone/bxy;
FIELD d width I
@ -41,18 +43,34 @@ CLASS none/bdo net/minecraft/client/Minecraft
METHOD X getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService;
METHOD Z isSnooperEnabled ()Z
METHOD a start ()V
METHOD a swizzle (Ljava/io/InputStream;)Ljava/nio/ByteBuffer;
ARG 0 stream
METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;
METHOD a (Ljava/lang/String;)V
METHOD a setGuiScreen (Lnone/bgk;)V
ARG 0 screen
METHOD a checkGLError (Ljava/lang/String;)V
ARG 0 title
METHOD a drawLogo (Lnone/bxc;)V
ARG 0 tm
METHOD aB handleMouseEvents ()V
METHOD aC doItemPick ()V
METHOD aE isMainThread ()Z
METHOD ad getItemRenderer ()Lnone/bto;
METHOD ak getBlockColorMap ()Lnone/bdx;
METHOD an init ()V
METHOD ap createDisplay ()V
METHOD aq setDisplayMode ()V
METHOD ar setIcons ()V
METHOD as is64Bit ()Z
METHOD at startTimerHackThread ()V
METHOD au ()V
METHOD aw doAttack ()V
METHOD ax doItemUse ()V
METHOD az handleKeyboardEvents ()V
METHOD h stop ()V
METHOD k getMaxFps ()I
METHOD l limitFramerate ()Z
METHOD r toggleFullscreen ()V
METHOD u isDemo ()Z
METHOD v getNetworkHandler ()Lnone/bmc;
METHOD x isFancyGraphicsEnabled ()Z

View File

@ -3,10 +3,14 @@ CLASS none/caj net/minecraft/server/IntegratedServer
FIELD l mc Lnone/bdo;
METHOD A getRunDirectory ()Ljava/io/File;
METHOD Z isSnooperEnabled ()Z
METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/aiz;Ljava/lang/String;)V
METHOD a (Lnone/qx;)V
METHOD a saveWorlds (Z)V
ARG 0 dontLog
METHOD aa isDedicated ()Z
METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b;
METHOD i createCommandManager ()Lnone/bc;
METHOD j ()Z
METHOD n getGameMode ()Lnone/ais;
METHOD o getDifficulty ()Lnone/qx;
METHOD u shutdown ()V

View File

@ -8,9 +8,11 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
FIELD H keyPair Ljava/security/KeyPair;
FIELD L demo Z
FIELD M bonusChest Z
FIELD R currentTaskName Ljava/lang/String;
FIELD T forceGameMode Z
FIELD Z serverThread Ljava/lang/Thread;
FIELD a userCacheFile Ljava/io/File;
FIELD a USER_CACHE_FILE Ljava/io/File;
FIELD aa serverStartTime J
FIELD b commandManager Lnone/m;
FIELD c profiler Lnone/os;
FIELD d worlds [Lnone/lu;
@ -19,7 +21,9 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
FIELD p networkManager Lnone/mf;
FIELD q metadata Lnone/ke;
FIELD r rand Ljava/util/Random;
FIELD t serverIp Ljava/lang/String;
FIELD u serverPort I
FIELD v serverConfigManager Lnone/mr;
FIELD w running Z
FIELD z onlineMode Z
METHOD A getRunDirectory ()Ljava/io/File;
@ -33,12 +37,16 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD a getWorld (I)Lnone/lu;
ARG 0 dimensionId
METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;
METHOD a convertSave (Ljava/lang/String;)V
METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/aiz;Ljava/lang/String;)V
METHOD a setKeyPair (Ljava/security/KeyPair;)V
ARG 0 value
METHOD a loadServerIcon (Lnone/ke;)V
METHOD a getSpawnRadius (Lnone/lu;)I
ARG 0 world
METHOD a (Lnone/qx;)V
METHOD a saveWorlds (Z)V
ARG 0 dontLog
METHOD aE isMainThread ()Z
METHOD aH getMainThread ()Ljava/lang/Thread;
METHOD aJ getLogger ()Lorg/apache/logging/log4j/Logger;
@ -56,12 +64,15 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD aw getPlayerIdleTimeout ()I
METHOD b setServerPort (I)V
ARG 0 port
METHOD b setCurrentTaskName (Ljava/lang/String;)V
ARG 0 taskName
METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b;
ARG 0 report
METHOD b setDemo (Z)V
ARG 0 value
METHOD c getBlockPos ()Lnone/cn;
METHOD c setServerIp (Ljava/lang/String;)V
ARG 0 serverIp
METHOD c setBonusChest (Z)V
ARG 0 value
METHOD d getPos ()Lnone/bcs;
@ -92,8 +103,13 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD i setForceGameMode (Z)V
ARG 0 value
METHOD i_ getNameComponent ()Lnone/fa;
METHOD j ()Z
METHOD k getCurrentTaskName ()Ljava/lang/String;
METHOD l generateTerrain ()V
METHOD l setMotd (Ljava/lang/String;)V
ARG 0 value
METHOD main ([Ljava/lang/String;)V
ARG 0 args
METHOD n getGameMode ()Lnone/ais;
METHOD o getDifficulty ()Lnone/qx;
METHOD run run ()V

View File

@ -17,5 +17,6 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer
METHOD d_ getHostname ()Ljava/lang/String;
METHOD e_ getPort ()I
METHOD f_ getMOTD ()Ljava/lang/String;
METHOD j ()Z
METHOD n getGameMode ()Lnone/ais;
METHOD o getDifficulty ()Lnone/qx;

View File

@ -1,4 +1,4 @@
CLASS none/qp
CLASS none/qp net/minecraft/sortme/IMultiThreadedObject
METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;
ARG 0 task
METHOD aE isMainThread ()Z

View File

@ -0,0 +1,2 @@
CLASS none/lo net/minecraft/world/WorldServerDemo
FIELD I SEED J

View File

@ -1 +1,2 @@
CLASS none/auc net/minecraft/world/provider/DimensionProvider
METHOD p getDimensionType ()Lnone/aud;

View File

@ -1 +1,2 @@
CLASS none/aui net/minecraft/world/provider/impl/DimensionProviderEnd
METHOD p getDimensionType ()Lnone/aud;

View File

@ -2,3 +2,4 @@ CLASS none/aue net/minecraft/world/provider/impl/DimensionProviderNether
CLASS none/aue$1
METHOD f getCenterX ()D
METHOD g getCenterZ ()D
METHOD p getDimensionType ()Lnone/aud;

View File

@ -1 +1,2 @@
CLASS none/auf net/minecraft/world/provider/impl/DimensionProviderOverworld
METHOD p getDimensionType ()Lnone/aud;