mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Finalize resolution of merge conflicts & apply suggestions from copygirl

This commit is contained in:
Max Gurela 2016-08-25 08:08:49 -07:00
parent 97410a699e
commit da19a80079
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/server/IntegratedServer.mapping
View File

@ -11,7 +11,7 @@ CLASS none/caj net/minecraft/server/IntegratedServer
ARG 0 dontLog
METHOD aa isDedicated ()Z
METHOD ae isUsingNativeTransport ()Z
METHOD ah isCommandBlocksEnabled ()Z
METHOD ah areCommandBlocksEnabled ()Z
METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b;
METHOD i createCommandManager ()Lnone/bc;
METHOD j ()Z

6
mappings/net/minecraft/server/MinecraftServer.mapping
View File

@ -52,7 +52,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD a (Lnone/qx;)V
METHOD a saveWorlds (Z)V
ARG 0 dontLog
METHOD aD getMaximumWorldSize ()I
METHOD aD getMaxWorldBorderRadius ()I
METHOD aE isMainThread ()Z
METHOD aF getNetworkCompressionThreshold ()I
METHOD aH getMainThread ()Ljava/lang/Thread;
@ -65,7 +65,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD ae isUsingNativeTransport ()Z
METHOD af isPvpEnabled ()Z
METHOD ag isFlightEnabled ()Z
METHOD ah isCommandBlocksEnabled ()Z
METHOD ah areCommandBlocksEnabled ()Z
METHOD ai getMotd ()Ljava/lang/String;
METHOD am getNetworkManager ()Lnone/mf;
METHOD ar getSnooper ()Lnone/rj;
@ -120,9 +120,9 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD l generateTerrain ()V
METHOD l setMotd (Ljava/lang/String;)V
ARG 0 value
METHOD m shouldGenerateStructures ()Z
METHOD main ([Ljava/lang/String;)V
ARG 0 args
METHOD m shouldGenerateStructures ()Z
METHOD n getGameMode ()Lnone/ais;
METHOD o getDifficulty ()Lnone/qx;
METHOD p isHardcore ()Z

20
mappings/net/minecraft/server/dedicated/DedicatedServer.mapping
View File

@ -20,24 +20,22 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer
METHOD a getString (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
ARG 0 key
ARG 1 defaultValue
METHOD a setGameMode (Lnone/ais;)V
ARG 0 gameMode
METHOD aD getMaxWorldBorderRadius ()I
METHOD aF getNetworkCompressionThreshold ()I
METHOD aP getMaximumTickTime ()J
METHOD aa isDedicated ()Z
METHOD ae isUsingNativeTransport ()Z
METHOD ah areCommandBlocksEnabled ()Z
METHOD as isSpawnProtectionEnabled ()I
METHOD ax shouldAnnouncePlayerAchievements ()Z
METHOD b getPropertiesFilename ()Ljava/lang/String;
METHOD d setPlayerIdleTimeout (I)V
METHOD d_ getHostname ()Ljava/lang/String;
METHOD e_ getPort ()I
METHOD f_ getMOTD ()Ljava/lang/String;
METHOD j ()Z
METHOD a setGameMode (Lnone/ais;)V
ARG 0 gameMode
METHOD aD getMaximumWorldSize ()I
METHOD aF getNetworkCompressionThreshold ()I
METHOD aP getMaximumTickTime ()J
METHOD aa isDedicated ()Z
METHOD ae isUsingNativeTransport ()Z
METHOD ah isCommandBlocksEnabled ()Z
METHOD as isSpawnProtectionEnabled ()I
METHOD ax shouldAnnouncePlayerAchievements ()Z
METHOD d setPlayerIdleTimeout (I)V
METHOD m shouldGenerateStructures ()Z
METHOD n getGameMode ()Lnone/ais;
METHOD o getDifficulty ()Lnone/qx;