From e1303e0dc26392f7dc306191a9fd6e565d525bc9 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 18 Jan 2020 17:25:15 +0000 Subject: [PATCH] Map the 1.15.2 changes (#1063) * Map the 1.15.2 changes * Update mappings/net/minecraft/client/render/model/BakedModel.mapping Co-Authored-By: Juuxel <6596629+Juuxel@users.noreply.github.com> Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> --- .../net/minecraft/client/MinecraftClient.mapping | 3 +++ .../client/render/model/BakedModel.mapping | 8 +++++++- .../client/render/model/BasicBakedModel.mapping | 12 +++++++++--- .../render/model/json/JsonUnbakedModel.mapping | 15 +++++++++++++++ mappings/net/minecraft/client/util/Window.mapping | 1 + 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 351e5855a3..02a55d1719 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -222,3 +222,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_24043 createV4ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; METHOD method_24226 handleResourceReloadExecption (Ljava/lang/Throwable;)V ARG 1 throwable + METHOD method_24287 getWindowTitle ()Ljava/lang/String; + METHOD method_24288 updateWindowTitle ()V + METHOD method_24289 isModded ()Z diff --git a/mappings/net/minecraft/client/render/model/BakedModel.mapping b/mappings/net/minecraft/client/render/model/BakedModel.mapping index 05769297d2..82ec2f6aad 100644 --- a/mappings/net/minecraft/client/render/model/BakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModel.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_1087 net/minecraft/client/render/model/BakedModel + METHOD method_24304 isSideLit ()Z + COMMENT Allows control of the lighting when rendering a model in a GUI. + COMMENT

+ COMMENT True, the model will be lit from the side, like a block. + COMMENT

+ COMMENT False, the model will be lit from the front, like an item. METHOD method_4707 getQuads (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Ljava/util/Random;)Ljava/util/List; ARG 1 state ARG 2 face @@ -7,5 +13,5 @@ CLASS net/minecraft/class_1087 net/minecraft/client/render/model/BakedModel METHOD method_4709 getTransformation ()Lnet/minecraft/class_809; METHOD method_4710 getItemPropertyOverrides ()Lnet/minecraft/class_806; METHOD method_4711 getSprite ()Lnet/minecraft/class_1058; - METHOD method_4712 hasDepthInGui ()Z + METHOD method_4712 hasDepth ()Z METHOD method_4713 isBuiltin ()Z diff --git a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping index 2866861ce9..0ecdd6a714 100644 --- a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_1093 net/minecraft/client/render/model/BasicBakedModel + FIELD field_21864 isSideLit Z FIELD field_5411 quads Ljava/util/List; FIELD field_5412 itemPropertyOverrides Lnet/minecraft/class_806; - FIELD field_5413 depthInGui Z + FIELD field_5413 hasDepth Z FIELD field_5414 faceQuads Ljava/util/Map; FIELD field_5415 usesAo Z FIELD field_5416 sprite Lnet/minecraft/class_1058; @@ -10,10 +11,13 @@ CLASS net/minecraft/class_1093 net/minecraft/client/render/model/BasicBakedModel ARG 1 quads ARG 2 faceQuads ARG 3 usesAo + ARG 4 isSideLit + ARG 5 hasDepth CLASS class_1094 Builder + FIELD field_21865 hasDepth Z FIELD field_5418 transformation Lnet/minecraft/class_809; FIELD field_5419 quads Ljava/util/List; - FIELD field_5420 depthInGui Z + FIELD field_5420 isSideLit Z FIELD field_5421 usesAo Z FIELD field_5422 faceQuads Ljava/util/Map; FIELD field_5423 itemPropertyOverrides Lnet/minecraft/class_806; @@ -21,9 +25,11 @@ CLASS net/minecraft/class_1093 net/minecraft/client/render/model/BasicBakedModel METHOD (Lnet/minecraft/class_793;Lnet/minecraft/class_806;Z)V ARG 1 unbakedModel ARG 2 itemPropertyOverrides + ARG 3 hasDepth METHOD (ZZZLnet/minecraft/class_809;Lnet/minecraft/class_806;)V ARG 1 usesAo - ARG 2 depthInGui + ARG 2 isSideLit + ARG 3 hasDepth METHOD method_4745 addQuad (Lnet/minecraft/class_2350;Lnet/minecraft/class_777;)Lnet/minecraft/class_1093$class_1094; ARG 1 side ARG 2 quad diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index 06085943df..401007699e 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbakedModel + FIELD field_21857 guiLight Lnet/minecraft/class_793$class_4751; FIELD field_4244 ambientOcclusion Z FIELD field_4245 elements Ljava/util/List; FIELD field_4247 parentId Lnet/minecraft/class_2960; @@ -15,10 +16,12 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 2 elements ARG 3 textureMap ARG 4 ambientOcclusion + ARG 5 guiLight ARG 6 transformations ARG 7 overrides METHOD method_24077 resolveSprite (Ljava/lang/String;)Lnet/minecraft/class_4730; ARG 1 spriteName + METHOD method_24298 getGuiLight ()Lnet/minecraft/class_793$class_4751; METHOD method_3430 deserialize (Ljava/lang/String;)Lnet/minecraft/class_793; ARG 0 json METHOD method_3431 getRootModel ()Lnet/minecraft/class_793; @@ -45,6 +48,7 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 3 textureGetter ARG 4 settings ARG 5 id + ARG 6 hasDepth METHOD method_3447 createQuad (Lnet/minecraft/class_785;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;)Lnet/minecraft/class_777; ARG 0 element ARG 1 elementFace @@ -76,3 +80,14 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 2 object METHOD method_3453 deserializeAmbientOcclusion (Lcom/google/gson/JsonObject;)Z ARG 1 json + CLASS class_4751 GuiLight + FIELD field_21858 field_21858 Lnet/minecraft/class_793$class_4751; + COMMENT The model will be shaded from the front, like a basic item + FIELD field_21859 field_21859 Lnet/minecraft/class_793$class_4751; + COMMENT The model will be shaded from the side, like a block. + FIELD field_21860 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_24299 isSide ()Z + METHOD method_24300 deserialize (Ljava/lang/String;)Lnet/minecraft/class_793$class_4751; + ARG 0 value diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping index b22bb6380c..93e32370d7 100644 --- a/mappings/net/minecraft/client/util/Window.mapping +++ b/mappings/net/minecraft/client/util/Window.mapping @@ -41,6 +41,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window ARG 1 rawMouseMotion METHOD method_22092 getRefreshRate ()I METHOD method_22093 shouldClose ()Z + METHOD method_24286 setTitle (Ljava/lang/String;)V METHOD method_4474 setPhase (Ljava/lang/String;)V ARG 1 phase METHOD method_4475 applyVideoMode ()V