New inner classes in model overrides (#2013)

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

Co-authored-by: liach <liach@users.noreply.github.com>
This commit is contained in:
liach 2021-02-04 12:34:03 -06:00 committed by GitHub
parent d28e051684
commit 492292782d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 2 deletions

View File

@ -3,3 +3,4 @@ CLASS net/minecraft/class_1800 net/minecraft/client/item/ModelPredicateProvider
ARG 1 stack
ARG 2 world
ARG 3 entity
ARG 4 seed

View File

@ -21,6 +21,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
ARG 7 world
ARG 8 light
ARG 9 overlay
ARG 10 seed
METHOD method_23178 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;IILnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V
ARG 1 stack
ARG 2 transformationType
@ -28,6 +29,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
ARG 4 overlay
ARG 5 matrices
ARG 6 vertexConsumers
ARG 7 seed
METHOD method_23179 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;)V
ARG 1 stack
ARG 2 renderMode
@ -110,6 +112,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
ARG 1 stack
ARG 2 world
ARG 3 entity
ARG 4 seed
METHOD method_4021 renderGuiItemModel (Lnet/minecraft/class_1799;IILnet/minecraft/class_1087;)V
ARG 1 stack
ARG 2 x

View File

@ -1,13 +1,25 @@
CLASS net/minecraft/class_799 net/minecraft/client/render/model/json/ModelOverride
FIELD field_4268 modelId Lnet/minecraft/class_2960;
FIELD field_4269 predicateToThresholds Ljava/util/List;
FIELD field_4269 conditions Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/List;)V
ARG 1 modelId
ARG 2 conditions
METHOD method_33690 streamConditions ()Ljava/util/stream/Stream;
METHOD method_3472 getModelId ()Lnet/minecraft/class_2960;
CLASS class_800 Deserializer
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
METHOD method_33691 (Ljava/util/Map$Entry;)Lnet/minecraft/class_799$class_5826;
ARG 0 entry
METHOD method_3474 deserializeMinPropertyValues (Lcom/google/gson/JsonObject;)Ljava/util/List;
ARG 1 object
CLASS class_5826 Condition
FIELD field_28790 type Lnet/minecraft/class_2960;
FIELD field_28791 threshold F
METHOD <init> (Lnet/minecraft/class_2960;F)V
ARG 1 type
ARG 2 threshold
METHOD method_33692 getType ()Lnet/minecraft/class_2960;
METHOD method_33693 getThreshold ()F

View File

@ -1,11 +1,37 @@
CLASS net/minecraft/class_806 net/minecraft/client/render/model/json/ModelOverrideList
FIELD field_28792 overrides [Lnet/minecraft/class_806$class_5827;
FIELD field_28793 conditionTypes [Lnet/minecraft/class_2960;
FIELD field_4292 EMPTY Lnet/minecraft/class_806;
METHOD <init> (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Ljava/util/List;)V
ARG 1 modelLoader
ARG 2 unbakedModel
ARG 2 parent
ARG 3 unbakedModelGetter
ARG 4 overrides
METHOD method_33695 bakeOverridingModel (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Lnet/minecraft/class_799;)Lnet/minecraft/class_1087;
ARG 1 loader
ARG 2 parent
ARG 3 unbakedModelGetter
ARG 4 override
METHOD method_33696 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_799$class_5826;)Lnet/minecraft/class_806$class_5828;
ARG 0 map
ARG 1 condition
METHOD method_3495 apply (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087;
ARG 1 model
ARG 2 stack
ARG 3 world
ARG 4 entity
ARG 5 seed
CLASS class_5827 BakedOverride
FIELD field_28794 conditions [Lnet/minecraft/class_806$class_5828;
FIELD field_28795 model Lnet/minecraft/class_1087;
METHOD <init> ([Lnet/minecraft/class_806$class_5828;Lnet/minecraft/class_1087;)V
ARG 1 conditions
ARG 2 model
METHOD method_33700 test ([F)Z
ARG 1 values
CLASS class_5828 InlinedCondition
FIELD field_28796 index I
FIELD field_28797 threshold F
METHOD <init> (IF)V
ARG 1 index
ARG 2 threshold