Map resources (pack, reload) stuff (#674)

* Map resources (pack, reload) stuff

some tag stuff
command suggestion window in both chat and command block ui
(mojang should just unify those instead of copy pasta)

Signed-off-by: liach <liach@users.noreply.github.com>

* Unify the names to complete for completion of one suggestion

Signed-off-by: liach <liach@users.noreply.github.com>

* Initial feedback from runemoro

Signed-off-by: liach <liach@users.noreply.github.com>

* Missed a few things. Thanks rune for pointing out

Simplified name for abstract file resource pack

Signed-off-by: liach <liach@users.noreply.github.com>

* fileNameFilter -> pathFilter (id path filter)

Signed-off-by: liach <liach@users.noreply.github.com>

* creator -> factory

Signed-off-by: liach <liach@users.noreply.github.com>

* main thread and caching tags

Signed-off-by: liach <liach@users.noreply.github.com>

* TagManager -> RegistryTagManager (only manages registry tags)

Also named prepared data for application "Intermediate"

Signed-off-by: liach <liach@users.noreply.github.com>

* Save some stuff

Signed-off-by: liach <liach@users.noreply.github.com>

* Fix inferred name missing in named jar

Signed-off-by: liach <liach@users.noreply.github.com>

* Revert auto mapping addition

Signed-off-by: liach <liach@users.noreply.github.com>
This commit is contained in:
liach 2019-05-07 08:56:34 -07:00 committed by Modmuss50
parent 892d4afb41
commit 000b032f15
43 changed files with 342 additions and 89 deletions

View File

@ -8,7 +8,7 @@ buildscript {
}
dependencies {
classpath "net.fabricmc:weave:0.3.1.17+"
classpath "net.fabricmc:stitch:0.1.2.49"
classpath "net.fabricmc:stitch:0.1.2.49+"
classpath "commons-io:commons-io:1.4"
classpath "com.google.guava:guava:19.0"
classpath 'de.undercouch:gradle-download-task:3.4.3'
@ -49,7 +49,7 @@ configurations {
}
dependencies {
enigmaRuntime "net.fabricmc:stitch:0.1.1.39+"
enigmaRuntime "net.fabricmc:stitch:0.1.2.49+"
enigmaRuntime "cuchaz:enigma:0.13.1.+:all"
}
@ -70,6 +70,7 @@ import org.apache.commons.io.FileUtils
import com.google.common.hash.Hashing
import com.google.common.io.Files
import net.fabricmc.stitch.commands.CommandMergeTiny
import net.fabricmc.stitch.commands.CommandProposeFieldNames
import net.fabricmc.stitch.commands.CommandRewriteIntermediary
import net.fabricmc.stitch.merge.JarMerger
import net.fabricmc.tinyremapper.OutputConsumerPath
@ -238,7 +239,7 @@ task patchIntermediary(dependsOn: ["mergeJars", "downloadIntermediary"], type: F
outputs.file(outputFile)
fileOutput = outputFile
outputs.upToDateWhen {return false}
outputs.upToDateWhen {false}
doLast {
logger.lifecycle(":patching intermediary")
@ -262,7 +263,7 @@ task buildYarnTiny(dependsOn: "mergeJars",type: FileOutput) {
def yarnTiny = new File(tempDir, "yarn-mappings.tiny")
fileOutput = yarnTiny
outputs.upToDateWhen {return false}
outputs.upToDateWhen {false}
doLast {
logger.lifecycle(":generating tiny mappings")
@ -283,18 +284,18 @@ task mergeTiny(dependsOn: ["buildYarnTiny", "patchIntermediary"], type: FileOutp
def yarnTinyInput = buildYarnTiny.fileOutput
def intermediaryTinyInput = patchIntermediary.fileOutput
def outputFile = new File(tempDir, "mappings.tiny")
outputs.file(outputFile)
fileOutput = outputFile
def resultMappings = new File(tempDir, "mappings.tiny")
outputs.file(resultMappings)
fileOutput = resultMappings
outputs.upToDateWhen {return false}
outputs.upToDateWhen {false}
doLast {
logger.lifecycle(":merging yarn and intermediary")
String[] args = [
yarnTinyInput.getAbsolutePath(),
intermediaryTinyInput.getAbsolutePath(),
outputFile.getAbsolutePath(),
resultMappings.getAbsolutePath(),
"intermediary",
"official"
]
@ -304,7 +305,7 @@ task mergeTiny(dependsOn: ["buildYarnTiny", "patchIntermediary"], type: FileOutp
}
task tinyJar(type: Jar, dependsOn: "mergeTiny") {
outputs.upToDateWhen {return false}
outputs.upToDateWhen {false}
archiveName = "yarn-${yarnVersion}.jar"
destinationDir(file("build/libs"))
classifier = ""
@ -320,7 +321,7 @@ task compressTiny(dependsOn: ["tinyJar", "mergeTiny"], type: FileOutput){
def inputFile = mergeTiny.fileOutput
outputs.upToDateWhen {return false}
outputs.upToDateWhen {false}
doLast {
logger.lifecycle(":compressing tiny mappings")
@ -355,9 +356,7 @@ task downloadMcLibs(dependsOn: downloadWantedVersionManifest) {
outputs.file(libraries)
outputs.upToDateWhen {
return false
}
outputs.upToDateWhen {false}
doLast {
if (!versionFile.exists()) {
@ -389,9 +388,7 @@ task mapIntermediaryJar(dependsOn: [downloadMcLibs, build]) {
outputs.file(intermediaryJar)
//Force the task to always run
outputs.upToDateWhen {
return false
}
outputs.upToDateWhen {false}
doLast {
logger.lifecycle(":mapping minecraft to intermdiary")
@ -405,9 +402,7 @@ task mapNamedJar(dependsOn: mapIntermediaryJar) {
outputs.file(namedJar)
//Force the task to always run
outputs.upToDateWhen {
return false
}
outputs.upToDateWhen {false}
doLast {
logger.lifecycle(":mapping minecraft to named")

View File

@ -104,6 +104,7 @@ CLASS cvi net/minecraft/client/MinecraftClient
METHOD F getNetworkProxy ()Ljava/net/Proxy;
METHOD G getTextureManager ()Lduh;
METHOD H getResourceManager ()Lxe;
METHOD I getResourcePackContainerManager ()Lwt;
METHOD J getResourcePackDownloader ()Lduo;
METHOD K getResourcePackDir ()Ljava/io/File;
METHOD L getLanguageManager ()Ldve;

View File

@ -1,21 +1,61 @@
CLASS dak net/minecraft/client/gui/AbstractCommandBlockScreen
CLASS dak$a SuggestionWindow
FIELD b area Ldkt;
FIELD c suggestions Lcom/mojang/brigadier/suggestion/Suggestions;
FIELD d typedText Ljava/lang/String;
FIELD e inWindowIndex I
FIELD f selection I
FIELD g mouse Lcru;
FIELD h completed Z
METHOD <init> (Ldak;IIILcom/mojang/brigadier/suggestion/Suggestions;)V
ARG 2 x
ARG 3 y
ARG 4 width
ARG 5 suggestions
METHOD a complete ()V
METHOD a mouseScrolled (D)Z
ARG 1 amount
METHOD a scroll (I)V
ARG 1 offset
METHOD a draw (II)V
ARG 1 mouseX
ARG 2 mouseY
METHOD a mouseClicked (III)Z
ARG 1 x
ARG 2 y
ARG 3 button
METHOD b discard ()V
METHOD b select (I)V
ARG 1 index
METHOD b keyPressed (III)Z
ARG 1 keyCode
ARG 2 scanCode
ARG 3 modifiers
FIELD a consoleCommandTextField Lcwu;
FIELD b previousOutputTextField Lcwu;
FIELD c doneButton Lcwo;
FIELD d cancelButton Lcwo;
FIELD e toggleTrackingOutputButton Lcwo;
FIELD f trackingOutput Z
FIELD g exceptions Ljava/util/List;
FIELD j parsedCommand Lcom/mojang/brigadier/ParseResults;
FIELD m suggestionsDisabled Z
FIELD k suggestionsFuture Ljava/util/concurrent/CompletableFuture;
FIELD l suggestionWindow Ldak$a;
FIELD m completingSuggestion Z
METHOD a getCommandExecutor ()Lbgn;
METHOD a syncSettingsToServer (Lbgn;)V
ARG 1 commandExecutor
METHOD a setCommand (Ljava/lang/String;)V
ARG 1 command
METHOD b onCommandChanged (Ljava/lang/String;)V
METHOD b suggestSuffix (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
ARG 0 typed
ARG 1 suggestion
METHOD c updateTrackedOutput ()V
METHOD d commitAndClose ()V
METHOD e updateCommand ()V
METHOD f showSuggestions ()V
METHOD g updateCommandFeedback ()V
METHOD keyPressed (III)Z
ARG 1 keyCode
ARG 2 scanCode

View File

@ -29,6 +29,7 @@ CLASS czv net/minecraft/client/gui/MainMenuScreen
METHOD a initWidgetsNormal (II)V
ARG 1 y
ARG 2 spacingY
METHOD a loadTexturesAsync (Lduh;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
METHOD b switchToRealms ()V
METHOD b initWidgetsDemo (II)V
ARG 1 y

View File

@ -1,31 +1,46 @@
CLASS cyr net/minecraft/client/gui/ingame/ChatScreen
CLASS cyr$a SuggestionWindow
FIELD b area Ldkt;
FIELD c suggestions Lcom/mojang/brigadier/suggestion/Suggestions;
FIELD d typedText Ljava/lang/String;
FIELD f selectedSuggestionIndex I
FIELD g lastMousePos Lcru;
METHOD a useSuggestion ()V
METHOD a scrollSelectedSuggestion (I)V
FIELD d input Ljava/lang/String;
FIELD e inWindowIndex I
FIELD f selection I
FIELD g mouse Lcru;
FIELD h completed Z
METHOD <init> (Lcyr;IIILcom/mojang/brigadier/suggestion/Suggestions;)V
ARG 2 x
ARG 3 y
ARG 4 width
ARG 5 suggestions
METHOD a complete ()V
METHOD a mouseScrolled (D)Z
ARG 1 amount
METHOD a scroll (I)V
ARG 1 offset
METHOD a draw (II)V
ARG 1 mouseX
ARG 2 mouseY
METHOD a mouseClicked (III)Z
ARG 1 x
ARG 2 y
ARG 3 button
METHOD b close ()V
METHOD b setSelectedSuggestionIndex (I)V
ARG 1 selectedSuggestionIndex
METHOD b handleKeyPress (III)Z
METHOD b select (I)V
ARG 1 index
METHOD b keyPressed (III)Z
ARG 1 keyCode
ARG 2 scanCode
ARG 3 modifiers
FIELD a chatField Lcwu;
FIELD b commandExceptions Ljava/util/List;
FIELD c commandExceptionsX I
FIELD d commandExceptionsWidth I
FIELD e WHITESPACE_PATTERN Ljava/util/regex/Pattern;
FIELD i parseResults Lcom/mojang/brigadier/ParseResults;
FIELD j suggestionsFuture Ljava/util/concurrent/CompletableFuture;
FIELD k suggestionsWindow Lcyr$a;
FIELD m suggestionsTemporarilyDisabled Z
METHOD a openSuggestionsWindow ()V
FIELD m completingSuggestion Z
METHOD a showSuggestions ()V
METHOD a getRenderText (Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;I)Ljava/lang/String;
ARG 0 parseResults
ARG 1 typedText
@ -37,7 +52,10 @@ CLASS cyr net/minecraft/client/gui/ingame/ChatScreen
METHOD b updateCommand ()V
METHOD b getLastWhitespaceIndex (Ljava/lang/String;)I
ARG 0 string
METHOD c updateSuggestionsAndExceptions ()V
METHOD b suggestSuffix (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
ARG 0 typed
ARG 1 suggestion
METHOD c updateCommandFeedback ()V
METHOD c setText (Ljava/lang/String;)V
ARG 1 text
METHOD keyPressed (III)Z

View File

@ -1,10 +1,27 @@
CLASS dcr net/minecraft/client/gui/widget/ResourcePackListWidget
CLASS dcr$a ResourcePackItem
FIELD a client Lcvi;
FIELD b screen Ldco;
FIELD c widget Ldcr;
FIELD d packContainer Ldvb;
METHOD a drawIcon ()V
METHOD b getCompatibility ()Lws;
METHOD c getDescription ()Ljava/lang/String;
METHOD d getDisplayName ()Ljava/lang/String;
METHOD e getPackContainer ()Ldvb;
METHOD i canSortUp ()Z
METHOD j canSortDown ()Z
METHOD k getScreen ()Ldco;
METHOD mouseClicked (DDI)Z
ARG 1 mouseX
ARG 3 mouseY
ARG 5 button
FIELD a client Lcvi;
FIELD b RESOURCE_PACKS_LOCATION Lqs;
FIELD c INCOMPATIBLE Ljm;
FIELD d INCOMPATIBLE_CONFIRM Ljm;
FIELD e title Ljm;
METHOD <init> (Lcvi;IILjm;)V
ARG 1 client
ARG 4 title
METHOD a addEntry (Ldcr$a;)V

View File

@ -55,6 +55,8 @@ CLASS cwu net/minecraft/client/gui/widget/TextFieldWidget
ARG 3 mouseY
METHOD j getMaxLength ()I
METHOD k hasBorder ()Z
METHOD k getCharacterX (I)I
ARG 1 index
METHOD keyPressed (III)Z
ARG 1 keyCode
ARG 2 scanCode

View File

@ -7,8 +7,8 @@ CLASS dun net/minecraft/client/resource/ResourceIndex
METHOD a findFile (Ljava/lang/String;)Ljava/io/File;
ARG 1 path
METHOD a getFilesRecursively (Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection;
ARG 1 dir
ARG 2 unused
ARG 1 namespace
ARG 2 maxDepth
ARG 3 filter
METHOD a getResource (Lqs;)Ljava/io/File;
ARG 1 identifier

View File

@ -1,4 +1,5 @@
CLASS duh net/minecraft/client/texture/TextureManager
FIELD a MISSING_IDENTIFIER Lqs;
FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
FIELD c textures Ljava/util/Map;
FIELD d tickListeners Ljava/util/List;

View File

@ -1,11 +1,20 @@
CLASS we net/minecraft/resource/AbstractFilenameResourcePack
CLASS we net/minecraft/resource/AbstractFileResourcePack
FIELD a base Ljava/io/File;
FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
METHOD <init> (Ljava/io/File;)V
ARG 1 base
METHOD a relativize (Ljava/io/File;Ljava/io/File;)Ljava/lang/String;
METHOD a openFilename (Ljava/lang/String;)Ljava/io/InputStream;
ARG 0 base
ARG 1 target
METHOD a openFile (Ljava/lang/String;)Ljava/io/InputStream;
ARG 1 name
METHOD a parseMetadata (Lwl;Ljava/io/InputStream;)Ljava/lang/Object;
METHOD c containsFilename (Ljava/lang/String;)Z
ARG 0 metaReader
ARG 1 inputStream
METHOD c containsFile (Ljava/lang/String;)Z
ARG 1 name
METHOD c getFilename (Lwi;Lqs;)Ljava/lang/String;
ARG 0 type
ARG 1 id
METHOD d warnNonLowercaseNamespace (Ljava/lang/String;)V
ARG 1 namespace

View File

@ -3,12 +3,15 @@ CLASS wk net/minecraft/resource/DefaultResourcePack
FIELD b RESOURCE_CLASS Ljava/lang/Class;
FIELD c namespaces Ljava/util/Set;
FIELD d LOGGER Lorg/apache/logging/log4j/Logger;
FIELD e typeToFileSystem Ljava/util/Map;
METHOD <init> ([Ljava/lang/String;)V
ARG 1 namespaces
METHOD a getIdentifiers (ILjava/lang/String;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection;
ARG 1 maxDepth
ARG 2 namespace
ARG 3 path
ARG 4 searchLocation
ARG 5 filter
ARG 5 pathFilter
METHOD a getInputStream (Ljava/lang/String;)Ljava/io/InputStream;
ARG 1 path
METHOD c findInputStream (Lwi;Lqs;)Ljava/io/InputStream;

View File

@ -1,8 +1,16 @@
CLASS wg net/minecraft/resource/DirectoryResourcePack
FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
FIELD c IS_WINDOWS Z
FIELD d BACKSLASH_MATCHER Lcom/google/common/base/CharMatcher;
METHOD a findFiles (Ljava/io/File;ILjava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/util/function/Predicate;)V
ARG 1 file
ARG 2 maxDepth
ARG 3 namespace
ARG 4 found
ARG 5 prefix
ARG 6 pathFilter
METHOD a isValidPath (Ljava/io/File;Ljava/lang/String;)Z
ARG 0 file
ARG 1 filename
METHOD e getFile (Ljava/lang/String;)Ljava/io/File;
ARG 1 name

View File

@ -3,10 +3,21 @@ CLASS wy net/minecraft/resource/NamespaceResourceManager
FIELD a parent Ljava/io/InputStream;
FIELD b leakMessage Ljava/lang/String;
FIELD c closed Z
METHOD <init> (Ljava/io/InputStream;Lqs;Ljava/lang/String;)V
ARG 1 parent
ARG 2 id
ARG 3 packName
FIELD a packList Ljava/util/List;
FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
FIELD c type Lwi;
METHOD <init> (Lwi;)V
ARG 1 type
METHOD a open (Lqs;Lwh;)Ljava/io/InputStream;
ARG 1 id
ARG 2 pack
METHOD d getMetadataPath (Lqs;)Lqs;
ARG 0 id
METHOD e validate (Lqs;)V
ARG 1 id
METHOD f isPathAbsolute (Lqs;)Z
ARG 1 id

View File

@ -1,10 +0,0 @@
CLASS xa net/minecraft/resource/ProfilingResourceReloadHandler
CLASS xa$a ProfilingInformation
FIELD a name Ljava/lang/String;
FIELD b prepareProfile Lagd;
FIELD c applyProfile Lagd;
FIELD d prepareTimeMs Ljava/util/concurrent/atomic/AtomicLong;
FIELD e applyTimeMs Ljava/util/concurrent/atomic/AtomicLong;
FIELD d LOGGER Lorg/apache/logging/log4j/Logger;
FIELD e reloadTimer Lcom/google/common/base/Stopwatch;
METHOD a finish (Ljava/util/List;)V

View File

@ -0,0 +1,25 @@
CLASS xa net/minecraft/resource/ProfilingResourceReloader
CLASS xa$a Summary
FIELD a name Ljava/lang/String;
FIELD b prepareProfile Lagd;
FIELD c applyProfile Lagd;
FIELD d prepareTimeMs Ljava/util/concurrent/atomic/AtomicLong;
FIELD e applyTimeMs Ljava/util/concurrent/atomic/AtomicLong;
METHOD <init> (Ljava/lang/String;Lagd;Lagd;Ljava/util/concurrent/atomic/AtomicLong;Ljava/util/concurrent/atomic/AtomicLong;)V
ARG 1 name
ARG 2 prepareProfile
ARG 3 applyProfile
ARG 4 prepareTimeMs
ARG 5 applyTimeMs
FIELD d LOGGER Lorg/apache/logging/log4j/Logger;
FIELD e reloadTimer Lcom/google/common/base/Stopwatch;
METHOD <init> (Lxe;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 manager
ARG 2 listeners
ARG 3 prepareExecutor
ARG 4 applyExecutor
METHOD a finish (Ljava/util/List;)V
ARG 1 summaries
METHOD a (Ljava/util/concurrent/Executor;Lwz$a;Lxe;Lwz;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 4 prepareExecutor
ARG 5 applyExecutor

View File

@ -1,5 +1,17 @@
CLASS xc net/minecraft/resource/ReloadableResourceManager
METHOD a beginReload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;
ARG 1 prepareExecutor
ARG 2 applyExecutor
ARG 3 packs
ARG 4 initialStage
METHOD a beginInitialMonitoredReload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lxb;
ARG 1 prepareExecutor
ARG 2 applyExecutor
ARG 3 initialStage
METHOD a beginMonitoredReload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)Lxb;
ARG 1 prepareExecutor
ARG 2 applyExecutor
ARG 3 initialStage
ARG 4 packs
METHOD a registerListener (Lwz;)V
ARG 1 listener

View File

@ -5,5 +5,13 @@ CLASS xi net/minecraft/resource/ReloadableResourceManagerImpl
FIELD d initialListeners Ljava/util/List;
FIELD e namespaces Ljava/util/Set;
FIELD f type Lwi;
FIELD g mainThread Ljava/lang/Thread;
METHOD <init> (Lwi;Ljava/lang/Thread;)V
ARG 1 type
ARG 2 mainThread
METHOD b clear ()V
METHOD b beginReloadInner (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Lxb;
ARG 1 prepareExecutor
ARG 2 applyExecutor
ARG 3 listeners
ARG 4 initialStage

View File

@ -1,5 +1,6 @@
CLASS xd net/minecraft/resource/Resource
METHOD a getId ()Lqs;
METHOD a getMetadata (Lwl;)Ljava/lang/Object;
ARG 1 metaReader
METHOD b getInputStream ()Ljava/io/InputStream;
METHOD d getResourcePackName ()Ljava/lang/String;

View File

@ -4,9 +4,14 @@ CLASS xj net/minecraft/resource/ResourceImpl
FIELD c packName Ljava/lang/String;
FIELD d id Lqs;
FIELD e inputStream Ljava/io/InputStream;
FIELD f metadataInputStream Ljava/io/InputStream;
FIELD f metaInputStream Ljava/io/InputStream;
FIELD g readMetadata Z
FIELD h metadata Lcom/google/gson/JsonObject;
METHOD <init> (Ljava/lang/String;Lqs;Ljava/io/InputStream;Ljava/io/InputStream;)V
ARG 1 packName
ARG 2 id
ARG 3 inputStream
ARG 4 metaInputStream
METHOD c hasMetadata ()Z
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o

View File

@ -1,8 +1,13 @@
CLASS xe net/minecraft/resource/ResourceManager
METHOD a getAllNamespaces ()Ljava/util/Set;
METHOD a findResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection;
ARG 1 namespace
ARG 1 resourceType
ARG 2 pathPredicate
METHOD a getResource (Lqs;)Lxd;
ARG 1 id
METHOD a addPack (Lwh;)V
ARG 1 pack
METHOD b containsResource (Lqs;)Z
ARG 1 id
METHOD c getAllResources (Lqs;)Ljava/util/List;
ARG 1 id

View File

@ -1,3 +1,4 @@
CLASS wj net/minecraft/resource/ResourceNotFoundException
METHOD <init> (Ljava/io/File;Ljava/lang/String;)V
ARG 1 packSource
ARG 2 resource

View File

@ -1,12 +1,19 @@
CLASS wh net/minecraft/resource/ResourcePack
METHOD a getName ()Ljava/lang/String;
METHOD a getNamespaces (Lwi;)Ljava/util/Set;
ARG 1 type
METHOD a findResources (Lwi;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection;
ARG 1 type
ARG 2 namespace
ARG 3 maxDepth
ARG 4 pathFilter
METHOD a open (Lwi;Lqs;)Ljava/io/InputStream;
ARG 1 type
ARG 2 id
METHOD a parseMetadata (Lwl;)Ljava/lang/Object;
ARG 1 metaReader
METHOD b openRoot (Ljava/lang/String;)Ljava/io/InputStream;
ARG 1 fileName
METHOD b contains (Lwi;Lqs;)Z
ARG 1 type
ARG 2 id

View File

@ -3,7 +3,10 @@ CLASS ws net/minecraft/resource/ResourcePackCompatibility
FIELD b TOO_NEW Lws;
FIELD d notification Ljm;
FIELD e confirmMessage Ljm;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 translationSuffix
METHOD a isCompatible ()Z
METHOD a from (I)Lws;
ARG 0 packVersion
METHOD b getNotification ()Ljm;
METHOD c getConfirmMessage ()Ljm;

View File

@ -1,10 +1,19 @@
CLASS ww net/minecraft/resource/ResourcePackContainer
CLASS ww$a SortingDirection
CLASS ww$a InsertionPosition
METHOD a inverse ()Lww$a;
METHOD a locate (Ljava/util/List;Ljava/lang/Object;Ljava/util/function/Function;Z)I
METHOD a insert (Ljava/util/List;Ljava/lang/Object;Ljava/util/function/Function;Z)I
ARG 1 items
ARG 2 item
ARG 3 converter
ARG 4 inverse
CLASS ww$b Factory
METHOD create (Ljava/lang/String;ZLjava/util/function/Supplier;Lwh;Lwm;Lww$a;)Lww;
ARG 1 name
ARG 2 alwaysCreatePack
ARG 3 packFactory
ARG 4 pack
ARG 5 meta
ARG 6 insertionPosition
FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
FIELD b BROKEN_PACK_META Lwm;
FIELD c name Ljava/lang/String;
@ -12,9 +21,9 @@ CLASS ww net/minecraft/resource/ResourcePackContainer
FIELD e displayName Ljm;
FIELD f description Ljm;
FIELD g compatibility Lws;
FIELD h direction Lww$a;
FIELD h position Lww$a;
FIELD i notSorting Z
FIELD j tillEnd Z
FIELD j positionFixed Z
METHOD <init> (Ljava/lang/String;ZLjava/util/function/Supplier;Ljm;Ljm;Lws;Lww$a;Z)V
ARG 1 name
ARG 2 notSorting
@ -34,6 +43,10 @@ CLASS ww net/minecraft/resource/ResourcePackContainer
METHOD a getDisplayName ()Ljm;
METHOD a of (Ljava/lang/String;ZLjava/util/function/Supplier;Lww$b;Lww$a;)Lww;
ARG 0 name
ARG 1 alwaysCreatePack
ARG 2 packFactory
ARG 3 containerFactory
ARG 4 insertionPosition
METHOD a getInformationText (Z)Ljm;
METHOD b getDescription ()Ljm;
METHOD c getCompatibility ()Lws;
@ -42,5 +55,5 @@ CLASS ww net/minecraft/resource/ResourcePackContainer
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD f canBeSorted ()Z
METHOD g sortsTillEnd ()Z
METHOD h getSortingDirection ()Lww$a;
METHOD g isPositionFixed ()Z
METHOD h getInitialPosition ()Lww$a;

View File

@ -3,6 +3,8 @@ CLASS wt net/minecraft/resource/ResourcePackContainerManager
FIELD b nameToContainer Ljava/util/Map;
FIELD c enabledContainers Ljava/util/List;
FIELD d factory Lww$b;
METHOD <init> (Lww$b;)V
ARG 1 factory
METHOD a callCreators ()V
METHOD a getContainer (Ljava/lang/String;)Lww;
ARG 1 name

View File

@ -1,9 +0,0 @@
CLASS xh net/minecraft/resource/ResourceReloadHandler
FIELD a resourceManager Lxe;
FIELD b loadStageFuture Ljava/util/concurrent/CompletableFuture;
FIELD c applyStageFuture Ljava/util/concurrent/CompletableFuture;
FIELD d loadStageLoaders Ljava/util/Set;
FIELD e listenerCount I
METHOD <init> (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Lxe;Ljava/util/List;Lxh$a;Ljava/util/concurrent/CompletableFuture;)V
ARG 4 listeners
METHOD a create (Lxe;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lxh;

View File

@ -1,9 +1,10 @@
CLASS wz net/minecraft/resource/ResourceReloadListener
CLASS wz$a Helper
METHOD a waitForAll (Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture;
ARG 1 passedObject
METHOD a (Lwz$a;Lxe;Lage;Lage;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 1 helper
CLASS wz$a Synchronizer
METHOD a whenPrepared (Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture;
ARG 1 preparedObject
METHOD a reload (Lwz$a;Lxe;Lage;Lage;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 1 synchronizer
ARG 2 manager
ARG 3 prepareProfiler
ARG 4 applyProfiler
ARG 5 prepareExecutor

View File

@ -0,0 +1,30 @@
CLASS xh net/minecraft/resource/ResourceReloader
CLASS xh$a Factory
METHOD create (Lwz$a;Lxe;Lwz;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 1 helper
ARG 2 manager
ARG 3 listener
ARG 4 prepareExecutor
ARG 5 applyExecutor
FIELD a manager Lxe;
FIELD b prepareStageFuture Ljava/util/concurrent/CompletableFuture;
FIELD c applyStageFuture Ljava/util/concurrent/CompletableFuture;
FIELD d waitingListeners Ljava/util/Set;
FIELD e listenerCount I
FIELD f applyingCount I
FIELD g appliedCount I
FIELD h preparingCount Ljava/util/concurrent/atomic/AtomicInteger;
FIELD i preparedCount Ljava/util/concurrent/atomic/AtomicInteger;
METHOD <init> (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Lxe;Ljava/util/List;Lxh$a;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 prepareExecutor
ARG 2 applyExecutor
ARG 3 manager
ARG 4 listeners
ARG 5 creator
ARG 6 initialStage
METHOD a create (Lxe;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lxh;
ARG 0 manager
ARG 1 listeners
ARG 2 prepareExecutor
ARG 3 applyExecutor
ARG 4 initialStage

View File

@ -1,3 +1,5 @@
CLASS wi net/minecraft/resource/ResourceType
FIELD c name Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 name
METHOD a getName ()Ljava/lang/String;

View File

@ -1,10 +1,14 @@
CLASS xg net/minecraft/resource/SupplyingResourceReloadListener
CLASS xg net/minecraft/resource/SinglePreparationResourceReloadListener
METHOD a apply (Ljava/lang/Object;Lxe;Lage;)V
ARG 1 result
ARG 1 preparedObject
ARG 2 manager
ARG 3 profiler
METHOD a (Lwz$a;Lxe;Lage;Lage;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 1 helper
ARG 3 prepareProfiler
ARG 4 applyProfiler
ARG 5 prepareExecutor
ARG 6 applyExecutor
METHOD a load (Lxe;Lage;)Ljava/lang/Object;
METHOD a prepare (Lxe;Lage;)Ljava/lang/Object;
ARG 1 manager
ARG 2 profiler

View File

@ -2,5 +2,8 @@ CLASS wm net/minecraft/resource/metadata/PackResourceMetadata
FIELD a READER Lwn;
FIELD b description Ljm;
FIELD c packFormat I
METHOD <init> (Ljm;I)V
ARG 1 description
ARG 2 format
METHOD a getDescription ()Ljm;
METHOD b getPackFormat ()I

View File

@ -1,3 +1,4 @@
CLASS wl net/minecraft/resource/metadata/ResourceMetadataReader
METHOD a getKey ()Ljava/lang/String;
METHOD a fromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Object;
ARG 1 json

View File

@ -29,7 +29,7 @@ CLASS net/minecraft/server/MinecraftServer
FIELD aa timeReference J
FIELD ad iconFilePresent Z
FIELD ae dataManager Lxc;
FIELD af resourcePackContainerManager Lwt;
FIELD af dataPackContainerManager Lwt;
FIELD ag dataPackCreator Lwr;
FIELD ah commandManager Lce;
FIELD ai recipeManager Lbej;
@ -141,7 +141,7 @@ CLASS net/minecraft/server/MinecraftServer
METHOD aC getCommandFunctionManager ()Lre;
METHOD aD reload ()V
METHOD aE getDataManager ()Lxc;
METHOD aF getResourcePackContainerManager ()Lwt;
METHOD aF getDataPackContainerManager ()Lwt;
METHOD aH getCommandManager ()Lce;
METHOD aI getCommandSource ()Lcd;
METHOD aJ getRecipeManager ()Lbej;

View File

@ -12,6 +12,7 @@ CLASS re net/minecraft/server/function/CommandFunctionManager
FIELD f server Lnet/minecraft/server/MinecraftServer;
FIELD g idMap Ljava/util/Map;
FIELD h chain Ljava/util/ArrayDeque;
FIELD i executing Z
FIELD j tags Lzc;
FIELD k tickFunctions Ljava/util/List;
FIELD l needToRunLoadFunctions Z

View File

@ -1,6 +1,11 @@
CLASS yw net/minecraft/tag/BlockTags
CLASS yw$a CachingTag
FIELD a version I
FIELD b delegate Lzb;
FIELD Y container Lzc;
FIELD Z containerChanges I
FIELD Z latestVersion I
METHOD a getContainer ()Lzc;
METHOD a register (Ljava/lang/String;)Lzb;
ARG 0 id
METHOD a setContainer (Lzc;)V
ARG 0 container

View File

@ -1,5 +0,0 @@
CLASS yx net/minecraft/tag/EntityTags
FIELD c container Lzc;
METHOD a getContainer ()Lzc;
METHOD a register (Ljava/lang/String;)Lzb;
METHOD a setContainer (Lzc;)V

View File

@ -0,0 +1,11 @@
CLASS yx net/minecraft/tag/EntityTypeTags
CLASS yx$a CachingTag
FIELD a version I
FIELD b delegate Lzb;
FIELD c container Lzc;
FIELD d latestVersion I
METHOD a getContainer ()Lzc;
METHOD a register (Ljava/lang/String;)Lzb;
ARG 0 id
METHOD a setContainer (Lzc;)V
ARG 0 container

View File

@ -1,6 +1,10 @@
CLASS yy net/minecraft/tag/FluidTags
CLASS yy$a CachingTag
FIELD a version I
FIELD b delegate Lzb;
FIELD c container Lzc;
FIELD d containerChanges I
FIELD d latestVersion I
METHOD a register (Ljava/lang/String;)Lzb;
ARG 0 id
METHOD a setContainer (Lzc;)V
ARG 0 container

View File

@ -1,6 +1,11 @@
CLASS yz net/minecraft/tag/ItemTags
CLASS yz$a CachingTag
FIELD a version I
FIELD b delegate Lzb;
FIELD N container Lzc;
FIELD O containerChanges I
FIELD O latestVersion I
METHOD a getContainer ()Lzc;
METHOD a register (Ljava/lang/String;)Lzb;
ARG 0 id
METHOD a setContainer (Lzc;)V
ARG 0 container

View File

@ -1,8 +1,18 @@
CLASS zd net/minecraft/tag/TagManager
CLASS zd net/minecraft/tag/RegistryTagManager
CLASS zd$a BuilderHolder
FIELD a blocks Ljava/util/Map;
FIELD b items Ljava/util/Map;
FIELD c fluids Ljava/util/Map;
FIELD d entityTypes Ljava/util/Map;
METHOD <init> (Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
ARG 1 blocks
ARG 2 items
ARG 3 fluids
ARG 4 entityTypes
FIELD a blocks Lza;
FIELD b items Lza;
FIELD c fluids Lza;
FIELD d entities Lza;
FIELD d entityTypes Lza;
METHOD a blocks ()Lza;
METHOD a toPacket (Ljc;)V
ARG 1 buf
@ -16,5 +26,5 @@ CLASS zd net/minecraft/tag/TagManager
METHOD b fromPacket (Ljc;)Lzd;
ARG 0 buf
METHOD c fluids ()Lza;
METHOD d entities ()Lza;
METHOD d entityTypes ()Lza;
METHOD e clear ()V

View File

@ -27,11 +27,15 @@ CLASS zb net/minecraft/tag/Tag
FIELD a id Lqs;
FIELD b values Ljava/util/Set;
FIELD c entries Ljava/util/Collection;
METHOD <init> (Lqs;)V
ARG 1 id
METHOD <init> (Lqs;Ljava/util/Collection;Z)V
ARG 1 id
ARG 2 entries
ARG 3 ordered
METHOD a values ()Ljava/util/Collection;
METHOD a contains (Ljava/lang/Object;)Z
ARG 1 entry
METHOD a getRandom (Ljava/util/Random;)Ljava/lang/Object;
METHOD a toJson (Ljava/util/function/Function;)Lcom/google/gson/JsonObject;
METHOD b entries ()Ljava/util/Collection;

View File

@ -4,16 +4,24 @@ CLASS zc net/minecraft/tag/TagContainer
FIELD c JSON_EXTENSION_LENGTH I
FIELD d idMap Ljava/util/Map;
FIELD e getter Ljava/util/function/Function;
FIELD f path Ljava/lang/String;
FIELD f dataType Ljava/lang/String;
FIELD g ordered Z
FIELD h type Ljava/lang/String;
FIELD h entryType Ljava/lang/String;
METHOD <init> (Ljava/util/function/Function;Ljava/lang/String;ZLjava/lang/String;)V
ARG 1 getter
ARG 2 dataType
ARG 3 ordered
ARG 4 entryType
METHOD a getKeys ()Ljava/util/Collection;
METHOD a getTagsFor (Ljava/lang/Object;)Ljava/util/Collection;
ARG 1 object
METHOD a applyReload (Ljava/util/Map;)V
ARG 1 preparedBuilders
METHOD a get (Lqs;)Lzb;
ARG 1 id
METHOD a prepareReload (Lxe;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 1 manager
ARG 2 executor
METHOD a add (Lzb;)V
ARG 1 tag
METHOD b clear ()V

View File

@ -17,7 +17,7 @@ CLASS cor net/minecraft/world/loot/LootManager
ARG 2 supplier
ARG 3 supplierGetter
METHOD a (Ljava/lang/String;)Z
ARG 0 ressourcePath
ARG 0 resourcePath
METHOD a (Ljava/lang/String;Ljava/lang/String;)V
ARG 0 key
ARG 1 value