From 874380340d3975bbb07595ab602028b0b42af3f7 Mon Sep 17 00:00:00 2001 From: Chloe Dawn Date: Sat, 11 May 2019 20:05:12 +0100 Subject: [PATCH] Cleanup Identifier mappings (#692) * Identifier * Fix param name --- .../client/util/ModelIdentifier.mapping | 5 ++- .../net/minecraft/util/Identifier.mapping | 45 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/mappings/net/minecraft/client/util/ModelIdentifier.mapping b/mappings/net/minecraft/client/util/ModelIdentifier.mapping index c21565b0d5..4d9f57eb7f 100644 --- a/mappings/net/minecraft/client/util/ModelIdentifier.mapping +++ b/mappings/net/minecraft/client/util/ModelIdentifier.mapping @@ -2,8 +2,9 @@ CLASS dwc net/minecraft/client/util/ModelIdentifier FIELD c variant Ljava/lang/String; METHOD (Lqs;Ljava/lang/String;)V ARG 1 id + ARG 2 variant METHOD c getVariant ()Ljava/lang/String; - METHOD c splitWithVariant (Ljava/lang/String;)[Ljava/lang/String; - ARG 0 str + METHOD c split (Ljava/lang/String;)[Ljava/lang/String; + ARG 0 id METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index d2b4972d86..743fda1705 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -1,30 +1,31 @@ CLASS qs net/minecraft/util/Identifier CLASS qs$a Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson - ARG 2 unused - ARG 3 context FIELD a namespace Ljava/lang/String; FIELD b path Ljava/lang/String; - FIELD c EXCEPTION_INVALID Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - METHOD (Ljava/lang/String;)V + FIELD c COMMAND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD ([Ljava/lang/String;)V ARG 1 id - METHOD (Ljava/lang/String;Ljava/lang/String;)V - ARG 1 namespace - ARG 2 name METHOD a getPath ()Ljava/lang/String; - METHOD a isValidChar (C)Z - ARG 0 chr - METHOD a parse (Lcom/mojang/brigadier/StringReader;)Lqs; - METHOD a create (Ljava/lang/String;)Lqs; - ARG 0 s - METHOD a createSplit (Ljava/lang/String;C)Lqs; - ARG 0 str - ARG 1 chr + METHOD a isCharValid (C)Z + ARG 0 c + METHOD a (I)Z + ARG 0 c + METHOD a fromCommandInput (Lcom/mojang/brigadier/StringReader;)Lqs; + ARG 0 reader + METHOD a ofNullable (Ljava/lang/String;)Lqs; + ARG 0 id + METHOD a splitOn (Ljava/lang/String;C)Lqs; + ARG 0 id + ARG 1 delimiter METHOD b getNamespace ()Ljava/lang/String; - METHOD b isValidIdentifier (Ljava/lang/String;)Z + METHOD b (I)Z + ARG 0 c + METHOD b isValid (Ljava/lang/String;)Z + ARG 0 id METHOD b split (Ljava/lang/String;C)[Ljava/lang/String; - METHOD c isValidPath (Ljava/lang/String;)Z - METHOD d isValidNamespace (Ljava/lang/String;)Z - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o + ARG 0 id + ARG 1 delimiter + METHOD c isPathValid (Ljava/lang/String;)Z + ARG 0 path + METHOD d isNamespaceValid (Ljava/lang/String;)Z + ARG 0 namespace