From e380edac443074d6f3a7e560048681f71ee757a6 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Wed, 11 Mar 2020 10:10:12 -0500 Subject: [PATCH] tiny works on model/blockstate data gen (#1169) * BlockStateVariantManager#register(2)[1 = ] -> properties * BlockStateVariantManager#register(2)[2 = ] -> possibleVariants * BlockStateModelGenerator#method_25681(1) -> registerWithSimpleModel * BlockStateModelGenerator#method_25543(2) -> registerWithLinkedModel * BlockStateModelGenerator#registerWithSimpleModel(1)[1 = ] -> block * BlockStateModelGenerator#registerWithLinkedModel(2)[1 = ] -> block * BlockStateModelGenerator#registerWithLinkedModel(2) -> registerModelReference * BlockStateModelGenerator#registerModelReference(2) -> registerStateWithModelReference * BlockStateModelGenerator#registerStateWithModelReference(2)[2 = ] -> modelReference * BlockStateModelGenerator#registerWithSimpleModel(1) -> registerSimpleState * +44 doc in net/minecraft/data/client/model/BlockStateSupplier * VariantsBlockStateSupplier#(2)[2 = ] -> variants * VariantsBlockStateSupplier%field_22862 -> variantManager * BlockStateVariantManager#register(2)[1 = properties] -> condition * +62 doc in net/minecraft/data/client/model/PropertiesEntry * +86 doc in net/minecraft/data/client/model/Properties * +30 doc in net/minecraft/data/client/model/Properties * +30 doc in net/minecraft/data/client/model/PropertiesEntry * +81 doc in PropertiesEntry#streamAllFor(1) * +62 doc in net/minecraft/data/client/model/BlockStateVariant * net/minecraft/data/client/model/BlockStateVariantManager -> net/minecraft/data/client/model/VariantMap * +96 doc in net/minecraft/data/client/model/VariantMap * +20 doc in net/minecraft/data/client/model/VariantMap * net/minecraft/data/client/model/VariantMap -> net/minecraft/data/client/model/BlockStateVariantMap * +1 doc in net/minecraft/data/client/model/BlockStateVariantMap * VariantsBlockStateSupplier%field_22861 -> definedProperties * VariantsBlockStateSupplier%variantManager -> variantMaps * net/minecraft/data/client/model/Properties -> net/minecraft/data/client/model/PropertiesMap * BlockStateModelGenerator#method_25690(1) -> registerCommandBlock * BlockStateModelGenerator#method_25692(1) -> registerAnvil * BlockStateModelGenerator#registerCommandBlock(1)[1 = ] -> block * BlockStateModelGenerator#registerAnvil(1)[1 = ] -> block * +50 doc in net/minecraft/data/client/model/TexturedModel * +47 doc in TexturedModel$Factory#get(4) * remove broken docs Co-authored-by: liach --- .../data/client/model/BlockStateModelGenerator.mapping | 9 +++++++++ .../data/client/model/BlockStateSupplier.mapping | 1 + .../data/client/model/BlockStateVariant.mapping | 1 + ...riantManager.mapping => BlockStateVariantMap.mapping} | 6 +++++- .../minecraft/data/client/model/PropertiesEntry.mapping | 5 +++++ .../model/{Properties.mapping => PropertiesMap.mapping} | 6 +++++- .../minecraft/data/client/model/TexturedModel.mapping | 1 + .../data/client/model/VariantsBlockStateSupplier.mapping | 3 +++ 8 files changed, 30 insertions(+), 2 deletions(-) rename mappings/net/minecraft/data/client/model/{BlockStateVariantManager.mapping => BlockStateVariantMap.mapping} (95%) rename mappings/net/minecraft/data/client/model/{Properties.mapping => PropertiesMap.mapping} (77%) diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping index 8867dcfab6..d23ef81e73 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGenerator FIELD field_22830 blockStateWriter Ljava/util/function/Consumer; FIELD field_22831 modelWriter Ljava/util/function/BiConsumer; + METHOD method_25543 registerStateWithModelReference (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 block + ARG 2 modelReference + METHOD method_25681 registerSimpleState (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_25690 registerCommandBlock (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_25692 registerAnvil (Lnet/minecraft/class_2248;)V + ARG 1 block diff --git a/mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping b/mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping index 713c338784..a822ea5107 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_4917 net/minecraft/data/client/model/BlockStateSupplier + COMMENT A supplier of a block state JSON definition. METHOD method_25743 getBlock ()Lnet/minecraft/class_2248; diff --git a/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping b/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping index 93848c7846..a47b36070d 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4935 net/minecraft/data/client/model/BlockStateVariant + COMMENT The supplier for a {@code ModelVariant}'s JSON representation. FIELD field_22884 properties Ljava/util/Map; METHOD method_25824 create ()Lnet/minecraft/class_4935; METHOD method_25827 union (Lnet/minecraft/class_4935;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4935; diff --git a/mappings/net/minecraft/data/client/model/BlockStateVariantManager.mapping b/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping similarity index 95% rename from mappings/net/minecraft/data/client/model/BlockStateVariantManager.mapping rename to mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping index 5a71c888c1..6c5263380b 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateVariantManager.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping @@ -1,4 +1,6 @@ -CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariantManager +CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariantMap + COMMENT An equivalence to the {@code Map} + COMMENT passed to the constructor of {@code ModelVariantMap}. FIELD field_22863 variants Ljava/util/Map; METHOD method_25782 getVariants ()Ljava/util/Map; METHOD method_25783 create (Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4927; @@ -7,6 +9,8 @@ CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariant METHOD method_25786 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4930; METHOD method_25787 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4931; METHOD method_25790 register (Lnet/minecraft/class_4934;Ljava/util/List;)V + ARG 1 condition + ARG 2 possibleVariants METHOD method_25791 getProperties ()Ljava/util/List; METHOD method_25792 checkAllPropertyDefinitions ()V CLASS class_4927 SingleProperty diff --git a/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping b/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping index 448f597b79..87717b4fab 100644 --- a/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping +++ b/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_4933 net/minecraft/data/client/model/PropertiesEntry + COMMENT Represents a property to value pair in block state definition. + COMMENT + COMMENT

This object is immutable. FIELD field_22879 property Lnet/minecraft/class_2769; FIELD field_22880 value Ljava/lang/Comparable; METHOD (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)V @@ -6,3 +9,5 @@ CLASS net/minecraft/class_4933 net/minecraft/data/client/model/PropertiesEntry ARG 2 value METHOD method_25815 getProperty ()Lnet/minecraft/class_2769; METHOD method_25816 streamAllFor (Lnet/minecraft/class_2769;)Ljava/util/stream/Stream; + COMMENT Returns a stream of all possible property to value pairs for a specific + COMMENT property. diff --git a/mappings/net/minecraft/data/client/model/Properties.mapping b/mappings/net/minecraft/data/client/model/PropertiesMap.mapping similarity index 77% rename from mappings/net/minecraft/data/client/model/Properties.mapping rename to mappings/net/minecraft/data/client/model/PropertiesMap.mapping index c8ed292d2d..5de87ee964 100644 --- a/mappings/net/minecraft/data/client/model/Properties.mapping +++ b/mappings/net/minecraft/data/client/model/PropertiesMap.mapping @@ -1,4 +1,8 @@ -CLASS net/minecraft/class_4934 net/minecraft/data/client/model/Properties +CLASS net/minecraft/class_4934 net/minecraft/data/client/model/PropertiesMap + COMMENT Represents a set of property to value pairs, used as conditions for model + COMMENT application. + COMMENT + COMMENT

This object is immutable. FIELD field_22881 EMPTY Lnet/minecraft/class_4934; FIELD field_22882 COMPARATOR Ljava/util/Comparator; FIELD field_22883 propertyValues Ljava/util/List; diff --git a/mappings/net/minecraft/data/client/model/TexturedModel.mapping b/mappings/net/minecraft/data/client/model/TexturedModel.mapping index a6e375564c..242a37944a 100644 --- a/mappings/net/minecraft/data/client/model/TexturedModel.mapping +++ b/mappings/net/minecraft/data/client/model/TexturedModel.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4946 net/minecraft/data/client/model/TexturedModel + COMMENT Represents a model with texture variables defined. FIELD field_23036 CUBE_ALL Lnet/minecraft/class_4946$class_4947; FIELD field_23037 CUBE_MIRRORED_ALL Lnet/minecraft/class_4946$class_4947; FIELD field_23038 CUBE_COLUMN Lnet/minecraft/class_4946$class_4947; diff --git a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping b/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping index e3889986a9..fb28b38639 100644 --- a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping +++ b/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_4925 net/minecraft/data/client/model/VariantsBlockStateSupplier FIELD field_22859 block Lnet/minecraft/class_2248; FIELD field_22860 variants Ljava/util/List; + FIELD field_22861 definedProperties Ljava/util/Set; + FIELD field_22862 variantMaps Ljava/util/List; METHOD (Lnet/minecraft/class_2248;Ljava/util/List;)V ARG 1 block + ARG 2 variants METHOD method_25769 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4925; ARG 0 block METHOD method_25770 create (Lnet/minecraft/class_2248;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4925;