From 39350084a7da11807a63879beb4e78fc2fe94512 Mon Sep 17 00:00:00 2001 From: NikkyAI Date: Thu, 15 Nov 2018 17:57:32 +0100 Subject: [PATCH] more random mappings and other changes (#192) * CommandAdvancement and onPlayerConnect * chat message stuff * more chat and related methods * updated gitignore * more chat, commands and packets * fix compressTiny not being executed on publish format and simplify build.gradle * update * broadcast -> sendTo * add newline to editorconfig --- .editorconfig | 5 +++++ .gitignore | 6 ++++++ build.gradle | 18 ++++++------------ .../ServerAdvancementManager.mapping | 1 + .../command/CommandAdvancement.mapping | 4 ++++ .../command/ServerCommandManager.mapping | 7 +++++++ .../command/ServerCommandSource.mapping | 1 + .../network/NetworkThreadUtils.mapping | 1 + .../handler/ServerPlayNetworkHandler.mapping | 3 +++ .../handler/ServerPlayPacketListener.mapping | 1 + .../packet/server/SPacketChatMessage.mapping} | 2 +- .../scoreboard/ScoreboardTeamBase.mapping | 4 ++++ .../config/ServerConfigurationManager.mapping | 16 ++++++++++++++++ 13 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 .editorconfig create mode 100644 mappings/net/minecraft/command/CommandAdvancement.mapping rename mappings/{nb.mapping => net/minecraft/network/packet/server/SPacketChatMessage.mapping} (59%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..3e5f1504a6 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,5 @@ +[*.gradle] +indent_style = tab + +[*.java] +indent_style = tab diff --git a/.gitignore b/.gitignore index e604323d64..85cd984640 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,10 @@ *-mapped.jar *.DS_Store build/ +out/ + +# idea .idea/ +*.iml +*.iws +*.ipr diff --git a/build.gradle b/build.gradle index 948a6f6d54..653deea34a 100644 --- a/build.gradle +++ b/build.gradle @@ -21,13 +21,13 @@ apply plugin: 'maven' apply plugin: 'maven-publish' def minecraft_version = "18w45a" -def pomfVersion = "${minecraft_version}" def ENV = System.getenv() +// Fetch build number from Jenkins +def build_number = ENV.BUILD_NUMBER ?: "local" + +def pomfVersion = "${minecraft_version}.$build_number" -if (ENV.BUILD_NUMBER) { - pomfVersion = pomfVersion + "." + "${System.getenv().BUILD_NUMBER}" -} def mappingsDir = file("mappings") def cacheFilesMinecraft = file(".gradle/minecraft") @@ -42,7 +42,6 @@ def libs = new File("build/libs/") import groovy.json.JsonSlurper import org.apache.commons.io.FileUtils -import com.google.common.hash.HashCode import com.google.common.hash.Hashing import com.google.common.io.Files import net.fabricmc.stitch.commands.CommandMergeTiny @@ -52,14 +51,8 @@ import net.fabricmc.tinyremapper.TinyRemapper import net.fabricmc.tinyremapper.TinyUtils import net.fabricmc.weave.CommandTinyify import net.fabricmc.weave.CommandFindMappingErrors -import groovy.util.XmlSlurper import groovy.io.FileType -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.zip.GZIPOutputStream; -import java.io.File; -import java.nio.file.Paths; +import java.util.zip.GZIPOutputStream boolean validateChecksum(File file, String checksum) { if (file != null) { @@ -412,6 +405,7 @@ publishing { artifact (compressTiny.fileOutput) { classifier "tiny" + builtBy compressTiny } artifact (buildEnigma) { classifier "enigma" diff --git a/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping b/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping index 48a9739926..d063eef602 100644 --- a/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping +++ b/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping @@ -4,6 +4,7 @@ CLASS qg net/minecraft/advancement/ServerAdvancementManager FIELD c JSON_TYPE Lcom/google/gson/reflect/TypeToken; FIELD d server Lnet/minecraft/server/MinecraftServer; FIELD e advancementFile Ljava/io/File; + METHOD a onAdvancement (Lm;Ljava/lang/String;)Z METHOD b reload ()V METHOD c save ()V METHOD g load ()V diff --git a/mappings/net/minecraft/command/CommandAdvancement.mapping b/mappings/net/minecraft/command/CommandAdvancement.mapping new file mode 100644 index 0000000000..e777e64bcd --- /dev/null +++ b/mappings/net/minecraft/command/CommandAdvancement.mapping @@ -0,0 +1,4 @@ +CLASS qs net/minecraft/command/CommandAdvancement + CLASS qs$a + FIELD a SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; + METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/command/ServerCommandManager.mapping b/mappings/net/minecraft/command/ServerCommandManager.mapping index d217444483..2f075324a3 100644 --- a/mappings/net/minecraft/command/ServerCommandManager.mapping +++ b/mappings/net/minecraft/command/ServerCommandManager.mapping @@ -2,5 +2,12 @@ CLASS ca net/minecraft/command/ServerCommandManager CLASS ca$a CommandParser FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b dispatcher Lcom/mojang/brigadier/CommandDispatcher; + METHOD (Z)V + ARG 1 isDedicatedServer METHOD a getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; + METHOD a execute (Lbz;Ljava/lang/String;)I + ARG 1 commandSource + ARG 2 commandString METHOD a getCommandValidator (Lca$a;)Ljava/util/function/Predicate; + METHOD a writeCommandTree (Ljava/io/File;)V + METHOD a sendCommandTree (Luf;)V diff --git a/mappings/net/minecraft/command/ServerCommandSource.mapping b/mappings/net/minecraft/command/ServerCommandSource.mapping index b6c2acb07d..dc09e6d9d5 100644 --- a/mappings/net/minecraft/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/command/ServerCommandSource.mapping @@ -12,6 +12,7 @@ CLASS bz net/minecraft/command/ServerCommandSource METHOD a withEntity (Lafy;)Lbz; METHOD a withPosition (Lcis;)Lbz; METHOD a withConsumer (Lcom/mojang/brigadier/ResultConsumer;)Lbz; + METHOD a sendFeedback (Liz;)V METHOD a withWorldServer (Lud;)Lbz; METHOD c getName ()Ljava/lang/String; METHOD d getPosition ()Lcis; diff --git a/mappings/net/minecraft/network/NetworkThreadUtils.mapping b/mappings/net/minecraft/network/NetworkThreadUtils.mapping index b23cbecfe8..b8e60ade9f 100644 --- a/mappings/net/minecraft/network/NetworkThreadUtils.mapping +++ b/mappings/net/minecraft/network/NetworkThreadUtils.mapping @@ -3,3 +3,4 @@ CLASS jp net/minecraft/network/NetworkThreadUtils ARG 0 packet ARG 1 packetListener ARG 2 thread + METHOD a forceMainThread (Ljn;Lis;Lud;)V diff --git a/mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping index a9dce663a2..e60d92fb53 100644 --- a/mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping @@ -8,6 +8,9 @@ CLASS ut net/minecraft/network/handler/ServerPlayNetworkHandler METHOD a onConnectionLost (Liz;)V METHOD a sendPacket (Ljn;)V METHOD a sendPacket (Ljn;Lio/netty/util/concurrent/GenericFutureListener;)V + METHOD a onChatMessage (Lnb;)V METHOD a onGuiClose (Lni;)V METHOD a onCustomPayload (Lnj;)V METHOD a onBookUpdate (Lnk;)V + METHOD c executeCommand (Ljava/lang/String;)V + ARG 1 command diff --git a/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping index a930d4e5f2..873dc0375a 100644 --- a/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping @@ -1,4 +1,5 @@ CLASS my net/minecraft/network/handler/ServerPlayPacketListener + METHOD a onChatMessage (Lnb;)V METHOD a onGuiClose (Lni;)V METHOD a onCustomPayload (Lnj;)V METHOD a onBookUpdate (Lnk;)V diff --git a/mappings/nb.mapping b/mappings/net/minecraft/network/packet/server/SPacketChatMessage.mapping similarity index 59% rename from mappings/nb.mapping rename to mappings/net/minecraft/network/packet/server/SPacketChatMessage.mapping index 64a981b22e..a0b7b8eb16 100644 --- a/mappings/nb.mapping +++ b/mappings/net/minecraft/network/packet/server/SPacketChatMessage.mapping @@ -1,4 +1,4 @@ -CLASS nb +CLASS nb net/minecraft/network/packet/server/SPacketChatMessage METHOD a read (Lip;)V METHOD a apply (Lis;)V METHOD a apply (Lmy;)V diff --git a/mappings/net/minecraft/scoreboard/ScoreboardTeamBase.mapping b/mappings/net/minecraft/scoreboard/ScoreboardTeamBase.mapping index 5f1d83c72e..e84b3447cf 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardTeamBase.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardTeamBase.mapping @@ -1,6 +1,10 @@ CLASS cju net/minecraft/scoreboard/ScoreboardTeamBase CLASS cju$a CollisionRule CLASS cju$b VisibilityRule + FIELD a ALWAYS Lcju$b; + FIELD b NEVER Lcju$b; + FIELD c HIDDEN_FOR_OTHER_TEAMS Lcju$b; + FIELD d HIDDEN_FOR_TEAM Lcju$b; METHOD a isEqual (Lcju;)Z METHOD b getName ()Ljava/lang/String; METHOD g getPlayerList ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping index 7d1fdcc8e3..76a9673e2f 100644 --- a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping @@ -45,9 +45,25 @@ CLASS wg net/minecraft/server/config/ServerConfigurationManager FIELD v latencyUpdateTimer I METHOD a reloadWhitelist ()V METHOD a setViewDistance (I)V + METHOD a sendToTeam (Lapv;Liz;)V + ARG 1 source + ARG 3 scoreboardTeam + ARG 4 players METHOD a setGameMode (Lazv;)V METHOD a addToOperators (Lcom/mojang/authlib/GameProfile;)V + METHOD a onPlayerConnect (Lin;Luf;)V + ARG 1 connection + ARG 2 player + METHOD a sendToAll (Liz;)V + METHOD a broadcastChatMessage (Liz;Z)V + METHOD a sendToAll (Ljn;)V + ARG 1 packet + METHOD a sendToDimension (Ljn;Lbqp;)V + ARG 1 packet METHOD a setWhitelistEnabled (Z)V + METHOD b sendToOtherTeams (Lapv;Liz;)V + ARG 1 source + ARG 3 scoreboardTeam METHOD b removeFromOperators (Lcom/mojang/authlib/GameProfile;)V METHOD b getPlayersByIp (Ljava/lang/String;)Ljava/util/List; METHOD b savePlayerData (Luf;)V