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
This commit is contained in:
NikkyAI 2018-11-15 17:57:32 +01:00 committed by Adrian Siekierka
parent cc751075a5
commit 39350084a7
13 changed files with 56 additions and 13 deletions

5
.editorconfig Normal file
View File

@ -0,0 +1,5 @@
[*.gradle]
indent_style = tab
[*.java]
indent_style = tab

6
.gitignore vendored
View File

@ -3,4 +3,10 @@
*-mapped.jar
*.DS_Store
build/
out/
# idea
.idea/
*.iml
*.iws
*.ipr

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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 <init> (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

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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