From f388749407f1f20d9c0ebc50183dd3c2f115a59e Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 11 Sep 2016 12:46:28 +0200 Subject: [PATCH] minor model, client cleanup work --- .../net/minecraft/client/Minecraft.mapping | 19 ++++++++++++++++++- mappings/net/minecraft/client/RunArgs.mapping | 1 + mappings/net/minecraft/client/gui/Gui.mapping | 3 +++ .../client/render/WorldRenderer.mapping | 1 + .../client/render/block/BlockColorMap.mapping | 13 +++++++++++++ .../render/block/BlockLiquidRenderer.mapping | 2 ++ .../block}/BlockRenderLayer.mapping | 4 +++- .../render/block/IBlockColorMapper.mapping | 1 + .../BakedModelManager.mapping} | 4 ++-- .../render/model/ModelElementRotation.mapping | 1 - .../client/render/model/ModelOverride.mapping | 1 - .../minecraft/client/render/model/bpx.mapping | 6 ++++++ .../minecraft/client/render/model/bqb.mapping | 1 - .../minecraft/client/render/model/bqc.mapping | 1 - .../render/model/{ => json}/Model.mapping | 3 ++- .../model/{ => json}/ModelElement.mapping | 2 +- .../model/{ => json}/ModelElementFace.mapping | 2 +- .../model/json/ModelElementRotation.mapping | 1 + .../render/model/json/ModelOverride.mapping | 1 + .../model/{ => json}/ModelVariant.mapping | 2 +- .../model/{ => json}/ModelVariantMap.mapping | 2 +- .../model/{ => json}/ModelVariantSet.mapping | 2 +- .../render/model/{ => json}/bpt.mapping | 2 +- .../client/render/model/json/bqb.mapping | 1 + .../client/render/model/json/bqc.mapping | 1 + .../client/sortme/LanguageDefinition.mapping | 2 ++ .../client/sortme/LanguageManager.mapping | 13 +++++++++++++ ...age.mapping => TranslationStorage.mapping} | 9 ++++++--- .../minecraft/item/impl/ItemSpawnEgg.mapping | 3 +++ .../net/minecraft/util/ServerEntry.mapping | 3 +++ mappings/none/byl.mapping | 3 --- mappings/none/byz.mapping | 5 +++++ 32 files changed, 94 insertions(+), 21 deletions(-) rename mappings/net/minecraft/client/{util => render/block}/BlockRenderLayer.mapping (52%) rename mappings/net/minecraft/client/render/{block/BlockModelManager.mapping => model/BakedModelManager.mapping} (81%) delete mode 100644 mappings/net/minecraft/client/render/model/ModelElementRotation.mapping delete mode 100644 mappings/net/minecraft/client/render/model/ModelOverride.mapping create mode 100644 mappings/net/minecraft/client/render/model/bpx.mapping delete mode 100644 mappings/net/minecraft/client/render/model/bqb.mapping delete mode 100644 mappings/net/minecraft/client/render/model/bqc.mapping rename mappings/net/minecraft/client/render/model/{ => json}/Model.mapping (85%) rename mappings/net/minecraft/client/render/model/{ => json}/ModelElement.mapping (82%) rename mappings/net/minecraft/client/render/model/{ => json}/ModelElementFace.mapping (75%) create mode 100644 mappings/net/minecraft/client/render/model/json/ModelElementRotation.mapping create mode 100644 mappings/net/minecraft/client/render/model/json/ModelOverride.mapping rename mappings/net/minecraft/client/render/model/{ => json}/ModelVariant.mapping (84%) rename mappings/net/minecraft/client/render/model/{ => json}/ModelVariantMap.mapping (82%) rename mappings/net/minecraft/client/render/model/{ => json}/ModelVariantSet.mapping (71%) rename mappings/net/minecraft/client/render/model/{ => json}/bpt.mapping (64%) create mode 100644 mappings/net/minecraft/client/render/model/json/bqb.mapping create mode 100644 mappings/net/minecraft/client/render/model/json/bqc.mapping create mode 100644 mappings/net/minecraft/client/sortme/LanguageDefinition.mapping create mode 100644 mappings/net/minecraft/client/sortme/LanguageManager.mapping rename mappings/net/minecraft/client/util/{Language.mapping => TranslationStorage.mapping} (60%) delete mode 100644 mappings/none/byl.mapping create mode 100644 mappings/none/byz.mapping diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index 75c65924c2..067696de1b 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -4,12 +4,15 @@ CLASS none/bdo net/minecraft/client/Minecraft FIELD J LOGGER Lorg/apache/logging/log4j/Logger; FIELD K RESOURCE_LOGO Lnone/kp; FIELD L DISPLAY_MODES Ljava/util/List; + FIELD P currentServerEntry Lnone/bmh; FIELD Q textureManager Lnone/bxc; FIELD R instance Lnone/bdo; + FIELD S migrationHandler Lnone/pf; FIELD T fullscreen Z FIELD Z snooper Lnone/rj; FIELD aB defaultResourcePacks Ljava/util/List; FIELD aC mcResourcePack Lnone/bxr; + FIELD aE languageManager Lnone/byl; FIELD aF blockColorMap Lnone/bdx; FIELD aG itemColorMap Lnone/bea; FIELD aI spriteAtlas Lnone/bxa; @@ -17,12 +20,16 @@ CLASS none/bdo net/minecraft/client/Minecraft FIELD aK musicTracker Lnone/car; FIELD aM sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD aP thread Ljava/lang/Thread; - FIELD aQ blockModelManager Lnone/bzn; + FIELD aQ bakedModelManager Lnone/bzn; + FIELD aR blockRenderManager Lnone/bpm; + FIELD a isSystemMac Z FIELD aa entityRenderManager Lnone/bta; FIELD ab itemRenderer Lnone/bto; FIELD ad cameraEntity Lnone/se; FIELD aj server Lnone/caj; + FIELD al gameVersion Ljava/lang/String; FIELD an netProxy Ljava/net/Proxy; + FIELD ao worldStorage Lnone/bau; FIELD ap fps I FIELD ar autoConnectServerIp Ljava/lang/String; FIELD as autoConnectServerPort I @@ -42,6 +49,8 @@ CLASS none/bdo net/minecraft/client/Minecraft FIELD t hitResult Lnone/bcq; FIELD u settings Lnone/bdq; FIELD w runDirectory Ljava/io/File; + METHOD B checkMaxTextureSize ()I + METHOD C getCurrentServerEntry ()Lnone/bmh; METHOD F getServer ()Lnone/caj; METHOD G onShutdown ()V METHOD H getSnooper ()Lnone/rj; @@ -50,6 +59,7 @@ CLASS none/bdo net/minecraft/client/Minecraft METHOD M getNetworkProxy ()Ljava/net/Proxy; METHOD N getTextureManager ()Lnone/bxc; METHOD O getResourceManager ()Lnone/bya; + METHOD Q getLanguageManager ()Lnone/byl; METHOD R getSpriteAtlas ()Lnone/bxa; METHOD S is64Bit ()Z METHOD U getSoundLoader ()Lnone/cau; @@ -65,6 +75,8 @@ CLASS none/bdo net/minecraft/client/Minecraft ARG 0 title METHOD a setGui (Lnone/bgk;)V ARG 0 screen + METHOD a setCurrentServerEntry (Lnone/bmh;)V + ARG 0 value METHOD a drawLogo (Lnone/bxc;)V ARG 0 tm METHOD a addSnooperInfo (Lnone/rj;)V @@ -73,10 +85,13 @@ CLASS none/bdo net/minecraft/client/Minecraft ARG 0 entity METHOD aB handleMouseEvents ()V METHOD aC doItemPick ()V + METHOD aD getCurrentAction ()Ljava/lang/String; METHOD aE isMainThread ()Z METHOD aa getCameraEntity ()Lnone/se; + METHOD ab getBlockRenderManager ()Lnone/bpm; METHOD ac getEntityRenderManager ()Lnone/bta; METHOD ad getItemRenderer ()Lnone/bto; + METHOD ai getMigrationHandler ()Lnone/pf; METHOD ak getBlockColorMap ()Lnone/bdx; METHOD am hasReducedDebugInfo ()Z METHOD an init ()V @@ -91,6 +106,8 @@ CLASS none/bdo net/minecraft/client/Minecraft METHOD az handleKeyboardEvents ()V METHOD b addSnooperInitialInfo (Lnone/rj;)V ARG 0 snooper + METHOD c getGameVersion ()Ljava/lang/String; + METHOD g getWorldStorage ()Lnone/bau; METHOD h stop ()V METHOD k getMaxFps ()I METHOD l limitFramerate ()Z diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index a2b7bd8ed1..0f8e7d55e2 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -7,6 +7,7 @@ CLASS none/bjk net/minecraft/client/RunArgs FIELD a runDirectory Ljava/io/File; CLASS none/bjk$c FIELD a isDemo Z + FIELD b gameVersion Ljava/lang/String; CLASS none/bjk$d AutoConnect FIELD a serverIp Ljava/lang/String; FIELD b serverPort I diff --git a/mappings/net/minecraft/client/gui/Gui.mapping b/mappings/net/minecraft/client/gui/Gui.mapping index bb46abb9e3..6dabd5ea37 100644 --- a/mappings/net/minecraft/client/gui/Gui.mapping +++ b/mappings/net/minecraft/client/gui/Gui.mapping @@ -67,3 +67,6 @@ CLASS none/bgk net/minecraft/client/gui/Gui METHOD m onClosed ()V METHOD o getClipboardContents ()Ljava/lang/String; METHOD p pollInputs ()V + METHOD q isControlDown ()Z + METHOD r isShiftDown ()Z + METHOD s isAltDown ()Z diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 06c855db10..2e443a45ee 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -5,6 +5,7 @@ CLASS none/boq net/minecraft/client/render/WorldRenderer FIELD g SNOW_LOC Lnone/kp; FIELD h mc Lnone/bdo; FIELD i resourceContainer Lnone/bya; + FIELD j rand Ljava/util/Random; METHOD (Lnone/bdo;Lnone/bya;)V ARG 0 mc ARG 1 resourceContainer diff --git a/mappings/net/minecraft/client/render/block/BlockColorMap.mapping b/mappings/net/minecraft/client/render/block/BlockColorMap.mapping index fdc3dad97d..7f047fbf03 100644 --- a/mappings/net/minecraft/client/render/block/BlockColorMap.mapping +++ b/mappings/net/minecraft/client/render/block/BlockColorMap.mapping @@ -4,61 +4,73 @@ CLASS none/bdx net/minecraft/client/render/block/BlockColorMap ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$2 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$3 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$4 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$5 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$6 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$7 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$8 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$9 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$10 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$11 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex CLASS none/bdx$12 METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex FIELD a mappers Lnone/cx; METHOD a create ()Lnone/bdx; METHOD a getMapColor (Lnone/asj;)I @@ -67,6 +79,7 @@ CLASS none/bdx net/minecraft/client/render/block/BlockColorMap ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex METHOD a register (Lnone/bdw;[Lnone/akw;)V ARG 0 mapper ARG 1 blocks diff --git a/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping index 0a98918aab..ff86495ead 100644 --- a/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping @@ -3,6 +3,8 @@ CLASS none/bpn net/minecraft/client/render/block/BlockLiquidRenderer FIELD b spritesLava [Lnone/bxb; FIELD c spritesWater [Lnone/bxb; FIELD d spriteWaterOverlay Lnone/bxb; + METHOD (Lnone/bdx;)V + ARG 0 colorMap METHOD a loadSprites ()V METHOD a render (Lnone/aiy;Lnone/asj;Lnone/cn;Lnone/bok;)Z ARG 0 view diff --git a/mappings/net/minecraft/client/util/BlockRenderLayer.mapping b/mappings/net/minecraft/client/render/block/BlockRenderLayer.mapping similarity index 52% rename from mappings/net/minecraft/client/util/BlockRenderLayer.mapping rename to mappings/net/minecraft/client/render/block/BlockRenderLayer.mapping index 57482048b9..cd96535638 100644 --- a/mappings/net/minecraft/client/util/BlockRenderLayer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderLayer.mapping @@ -1,6 +1,8 @@ -CLASS none/aim net/minecraft/client/util/BlockRenderLayer +CLASS none/aim net/minecraft/client/render/block/BlockRenderLayer FIELD a SOLID Lnone/aim; FIELD b MIPPED_CUTOUT Lnone/aim; FIELD c CUTOUT Lnone/aim; FIELD d TRANSLUCENT Lnone/aim; FIELD e name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 0 name diff --git a/mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping b/mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping index d0b8cd6b14..d23d600cc9 100644 --- a/mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping +++ b/mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping @@ -3,3 +3,4 @@ CLASS none/bdw net/minecraft/client/render/block/IBlockColorMapper ARG 0 state ARG 1 view ARG 2 pos + ARG 3 tintIndex diff --git a/mappings/net/minecraft/client/render/block/BlockModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping similarity index 81% rename from mappings/net/minecraft/client/render/block/BlockModelManager.mapping rename to mappings/net/minecraft/client/render/model/BakedModelManager.mapping index dcad7f9fd9..aadab8b77d 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -1,4 +1,4 @@ -CLASS none/bzn net/minecraft/client/render/block/BlockModelManager +CLASS none/bzn net/minecraft/client/render/model/BakedModelManager FIELD a modelRegistry Lnone/dg; FIELD b spriteMap Lnone/bxa; FIELD c blockStateMaps Lnone/bpl; @@ -9,6 +9,6 @@ CLASS none/bzn net/minecraft/client/render/block/BlockModelManager METHOD a onResourceReload (Lnone/bya;)V ARG 0 container METHOD a getModel (Lnone/bzo;)Lnone/bzj; - ARG 0 modelIdentifier + ARG 0 identifier METHOD b getSpriteMap ()Lnone/bxa; METHOD c getBlockStateMaps ()Lnone/bpl; diff --git a/mappings/net/minecraft/client/render/model/ModelElementRotation.mapping b/mappings/net/minecraft/client/render/model/ModelElementRotation.mapping deleted file mode 100644 index b8b2523858..0000000000 --- a/mappings/net/minecraft/client/render/model/ModelElementRotation.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bps net/minecraft/client/render/model/ModelElementRotation diff --git a/mappings/net/minecraft/client/render/model/ModelOverride.mapping b/mappings/net/minecraft/client/render/model/ModelOverride.mapping deleted file mode 100644 index 666e853c3e..0000000000 --- a/mappings/net/minecraft/client/render/model/ModelOverride.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bpz net/minecraft/client/render/model/ModelOverride diff --git a/mappings/net/minecraft/client/render/model/bpx.mapping b/mappings/net/minecraft/client/render/model/bpx.mapping new file mode 100644 index 0000000000..4d8ee8145d --- /dev/null +++ b/mappings/net/minecraft/client/render/model/bpx.mapping @@ -0,0 +1,6 @@ +CLASS none/bpx net/minecraft/client/render/model/bpx + METHOD a bake (Lorg/lwjgl/util/vector/Vector3f;Lorg/lwjgl/util/vector/Vector3f;Lnone/bpr;Lnone/bxb;Lnone/cu;Lnone/bzk;Lnone/bps;ZZ)Lnone/bpp; + ARG 0 from + ARG 1 to + ARG 2 face + ARG 3 texture diff --git a/mappings/net/minecraft/client/render/model/bqb.mapping b/mappings/net/minecraft/client/render/model/bqb.mapping deleted file mode 100644 index 8031016db7..0000000000 --- a/mappings/net/minecraft/client/render/model/bqb.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bqb net/minecraft/client/render/model/bqb diff --git a/mappings/net/minecraft/client/render/model/bqc.mapping b/mappings/net/minecraft/client/render/model/bqc.mapping deleted file mode 100644 index 79df9b3aa9..0000000000 --- a/mappings/net/minecraft/client/render/model/bqc.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bqc net/minecraft/client/render/model/bqc diff --git a/mappings/net/minecraft/client/render/model/Model.mapping b/mappings/net/minecraft/client/render/model/json/Model.mapping similarity index 85% rename from mappings/net/minecraft/client/render/model/Model.mapping rename to mappings/net/minecraft/client/render/model/json/Model.mapping index 33c2e002f5..9dc27a5d9b 100644 --- a/mappings/net/minecraft/client/render/model/Model.mapping +++ b/mappings/net/minecraft/client/render/model/json/Model.mapping @@ -1,4 +1,5 @@ -CLASS none/bpu net/minecraft/client/render/model/Model +CLASS none/bpu net/minecraft/client/render/model/json/Model + FIELD a GSON Lcom/google/gson/Gson; FIELD c textureMap Ljava/util/Map; FIELD d parentModel Lnone/bpu; FIELD e parentId Lnone/kp; diff --git a/mappings/net/minecraft/client/render/model/ModelElement.mapping b/mappings/net/minecraft/client/render/model/json/ModelElement.mapping similarity index 82% rename from mappings/net/minecraft/client/render/model/ModelElement.mapping rename to mappings/net/minecraft/client/render/model/json/ModelElement.mapping index ce0d970448..f944f3e8e3 100644 --- a/mappings/net/minecraft/client/render/model/ModelElement.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelElement.mapping @@ -1,4 +1,4 @@ -CLASS none/bpq net/minecraft/client/render/model/ModelElement +CLASS none/bpq net/minecraft/client/render/model/json/ModelElement FIELD a min Lorg/lwjgl/util/vector/Vector3f; FIELD b max Lorg/lwjgl/util/vector/Vector3f; FIELD c faces Ljava/util/Map; diff --git a/mappings/net/minecraft/client/render/model/ModelElementFace.mapping b/mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping similarity index 75% rename from mappings/net/minecraft/client/render/model/ModelElementFace.mapping rename to mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping index 916e3b908f..302f3e701c 100644 --- a/mappings/net/minecraft/client/render/model/ModelElementFace.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping @@ -1,4 +1,4 @@ -CLASS none/bpr net/minecraft/client/render/model/ModelElementFace +CLASS none/bpr net/minecraft/client/render/model/json/ModelElementFace FIELD a NULL_FACING Lnone/cu; FIELD b cullFace Lnone/cu; FIELD c tintIndex I diff --git a/mappings/net/minecraft/client/render/model/json/ModelElementRotation.mapping b/mappings/net/minecraft/client/render/model/json/ModelElementRotation.mapping new file mode 100644 index 0000000000..e4bf5e5d6d --- /dev/null +++ b/mappings/net/minecraft/client/render/model/json/ModelElementRotation.mapping @@ -0,0 +1 @@ +CLASS none/bps net/minecraft/client/render/model/json/ModelElementRotation diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping new file mode 100644 index 0000000000..3fa930aaf0 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping @@ -0,0 +1 @@ +CLASS none/bpz net/minecraft/client/render/model/json/ModelOverride diff --git a/mappings/net/minecraft/client/render/model/ModelVariant.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariant.mapping similarity index 84% rename from mappings/net/minecraft/client/render/model/ModelVariant.mapping rename to mappings/net/minecraft/client/render/model/json/ModelVariant.mapping index 3811aa7a90..746f086b65 100644 --- a/mappings/net/minecraft/client/render/model/ModelVariant.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariant.mapping @@ -1,4 +1,4 @@ -CLASS none/bqe net/minecraft/client/render/model/ModelVariant +CLASS none/bqe net/minecraft/client/render/model/json/ModelVariant FIELD a location Lnone/kp; FIELD b rotation Lnone/bzk; FIELD c uvLock Z diff --git a/mappings/net/minecraft/client/render/model/ModelVariantMap.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping similarity index 82% rename from mappings/net/minecraft/client/render/model/ModelVariantMap.mapping rename to mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping index 1afa3970f7..1f06622eec 100644 --- a/mappings/net/minecraft/client/render/model/ModelVariantMap.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping @@ -1,4 +1,4 @@ -CLASS none/bpv net/minecraft/client/render/model/ModelVariantMap +CLASS none/bpv net/minecraft/client/render/model/json/ModelVariantMap CLASS none/bpv$b VariantNotFoundException FIELD a GSON Lcom/google/gson/Gson; FIELD b variantMap Ljava/util/Map; diff --git a/mappings/net/minecraft/client/render/model/ModelVariantSet.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantSet.mapping similarity index 71% rename from mappings/net/minecraft/client/render/model/ModelVariantSet.mapping rename to mappings/net/minecraft/client/render/model/json/ModelVariantSet.mapping index 4f036e3183..2d11c0bcd8 100644 --- a/mappings/net/minecraft/client/render/model/ModelVariantSet.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantSet.mapping @@ -1,4 +1,4 @@ -CLASS none/bqd net/minecraft/client/render/model/ModelVariantSet +CLASS none/bqd net/minecraft/client/render/model/json/ModelVariantSet FIELD a variants Ljava/util/List; METHOD (Ljava/util/List;)V ARG 0 variants diff --git a/mappings/net/minecraft/client/render/model/bpt.mapping b/mappings/net/minecraft/client/render/model/json/bpt.mapping similarity index 64% rename from mappings/net/minecraft/client/render/model/bpt.mapping rename to mappings/net/minecraft/client/render/model/json/bpt.mapping index 0793211e4c..ccbeaeb610 100644 --- a/mappings/net/minecraft/client/render/model/bpt.mapping +++ b/mappings/net/minecraft/client/render/model/json/bpt.mapping @@ -1,4 +1,4 @@ -CLASS none/bpt net/minecraft/client/render/model/bpt +CLASS none/bpt net/minecraft/client/render/model/json/bpt FIELD a uvs [F FIELD b rotation I METHOD a (I)F diff --git a/mappings/net/minecraft/client/render/model/json/bqb.mapping b/mappings/net/minecraft/client/render/model/json/bqb.mapping new file mode 100644 index 0000000000..0a35612c25 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/json/bqb.mapping @@ -0,0 +1 @@ +CLASS none/bqb net/minecraft/client/render/model/json/bqb diff --git a/mappings/net/minecraft/client/render/model/json/bqc.mapping b/mappings/net/minecraft/client/render/model/json/bqc.mapping new file mode 100644 index 0000000000..c5e985c86e --- /dev/null +++ b/mappings/net/minecraft/client/render/model/json/bqc.mapping @@ -0,0 +1 @@ +CLASS none/bqc net/minecraft/client/render/model/json/bqc diff --git a/mappings/net/minecraft/client/sortme/LanguageDefinition.mapping b/mappings/net/minecraft/client/sortme/LanguageDefinition.mapping new file mode 100644 index 0000000000..21cc148b08 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/LanguageDefinition.mapping @@ -0,0 +1,2 @@ +CLASS none/byk net/minecraft/client/sortme/LanguageDefinition + METHOD a getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/sortme/LanguageManager.mapping b/mappings/net/minecraft/client/sortme/LanguageManager.mapping new file mode 100644 index 0000000000..6e4a5122b8 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/LanguageManager.mapping @@ -0,0 +1,13 @@ +CLASS none/byl net/minecraft/client/sortme/LanguageManager + FIELD a STORAGE Lnone/bym; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c packMetadata Lnone/byr; + FIELD d languageId Ljava/lang/String; + FIELD e languageDefs Ljava/util/Map; + METHOD (Lnone/byr;Ljava/lang/String;)V + ARG 0 metadata + ARG 1 languageId + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container + METHOD a setLanguage (Lnone/byk;)V + METHOD c getLanguage ()Lnone/byk; diff --git a/mappings/net/minecraft/client/util/Language.mapping b/mappings/net/minecraft/client/util/TranslationStorage.mapping similarity index 60% rename from mappings/net/minecraft/client/util/Language.mapping rename to mappings/net/minecraft/client/util/TranslationStorage.mapping index 23799e3774..8f39e390b9 100644 --- a/mappings/net/minecraft/client/util/Language.mapping +++ b/mappings/net/minecraft/client/util/TranslationStorage.mapping @@ -1,14 +1,17 @@ -CLASS none/bym net/minecraft/client/util/Language +CLASS none/bym net/minecraft/client/util/TranslationStorage FIELD a translations Ljava/util/Map; FIELD b EQUALS_SPLITTER Lcom/google/common/base/Splitter; - METHOD a load (Ljava/io/InputStream;)V + METHOD a loadTranslations (Ljava/io/InputStream;)V ARG 0 input METHOD a hasTranslation (Ljava/lang/String;)Z ARG 0 key METHOD a translate (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; ARG 0 key ARG 1 args - METHOD a (Lnone/bya;Ljava/util/List;)V + METHOD a loadTranslations (Ljava/util/List;)V + ARG 0 resources + METHOD a load (Lnone/bya;Ljava/util/List;)V + ARG 0 container ARG 1 languages METHOD b getTranslation (Ljava/lang/String;)Ljava/lang/String; ARG 0 key diff --git a/mappings/net/minecraft/item/impl/ItemSpawnEgg.mapping b/mappings/net/minecraft/item/impl/ItemSpawnEgg.mapping index 32e629526d..7ad94923f7 100644 --- a/mappings/net/minecraft/item/impl/ItemSpawnEgg.mapping +++ b/mappings/net/minecraft/item/impl/ItemSpawnEgg.mapping @@ -2,6 +2,9 @@ CLASS none/afu net/minecraft/item/impl/ItemSpawnEgg METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD a getTranslatedNameTrimmed (Lnone/aeq;)Ljava/lang/String; + METHOD a setContainedEntity (Lnone/aeq;Lnone/kp;)V + ARG 0 stack + ARG 1 entityId METHOD a onRightClick (Lnone/aiu;Lnone/aak;Lnone/qz;)Lnone/rc; ARG 0 world ARG 1 player diff --git a/mappings/net/minecraft/util/ServerEntry.mapping b/mappings/net/minecraft/util/ServerEntry.mapping index cc79ba8d51..68f68c3b38 100644 --- a/mappings/net/minecraft/util/ServerEntry.mapping +++ b/mappings/net/minecraft/util/ServerEntry.mapping @@ -13,9 +13,11 @@ CLASS none/bmh net/minecraft/util/ServerEntry FIELD g version Ljava/lang/String; FIELD j resourcePackState Lnone/bmh$a; FIELD k icon Ljava/lang/String; + FIELD l local Z METHOD (Ljava/lang/String;Ljava/lang/String;Z)V ARG 0 name ARG 1 address + ARG 2 local METHOD a serializeTag ()Lnone/dt; METHOD a setIcon (Ljava/lang/String;)V ARG 0 icon @@ -27,3 +29,4 @@ CLASS none/bmh net/minecraft/util/ServerEntry ARG 0 tag METHOD b getResourcePack ()Lnone/bmh$a; METHOD c getIcon ()Ljava/lang/String; + METHOD d isLocal ()Z diff --git a/mappings/none/byl.mapping b/mappings/none/byl.mapping deleted file mode 100644 index 31cf26521c..0000000000 --- a/mappings/none/byl.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/byl - METHOD a onResourceReload (Lnone/bya;)V - ARG 0 container diff --git a/mappings/none/byz.mapping b/mappings/none/byz.mapping new file mode 100644 index 0000000000..3645b4aa0a --- /dev/null +++ b/mappings/none/byz.mapping @@ -0,0 +1,5 @@ +CLASS none/byz + FIELD a defs Ljava/util/Collection; + METHOD (Ljava/util/Collection;)V + ARG 0 defs + METHOD a get ()Ljava/util/Collection;