From b573c98c68e1b28b81fa4280aea085f330e4ed0f Mon Sep 17 00:00:00 2001 From: i509VCB Date: Sat, 8 Aug 2020 10:11:21 -0500 Subject: [PATCH] Assorted mappings, mainly enchanting, some rendering params and generator type. --- .../item/BuiltinModelItemRenderer.mapping | 5 +++ .../client/render/item/ItemRenderer.mapping | 3 ++ .../client/world/ClientWorld.mapping | 10 ++++++ .../client/world/GeneratorType.mapping | 34 +++++++++++++++++++ .../enchantment/EnchantmentHelper.mapping | 32 ++++++++++++++--- .../util/registry/MutableRegistry.mapping | 2 ++ .../minecraft/util/registry/Registry.mapping | 12 +++++++ .../util/registry/SimpleRegistry.mapping | 3 ++ mappings/net/minecraft/world/World.mapping | 5 +++ .../world/dimension/DimensionType.mapping | 5 +++ 10 files changed, 106 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping index 396b56e4a1..88bdecf329 100644 --- a/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping @@ -12,3 +12,8 @@ CLASS net/minecraft/class_756 net/minecraft/client/render/item/BuiltinModelItemR FIELD field_3986 INSTANCE Lnet/minecraft/class_756; METHOD method_3166 render (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V ARG 1 stack + ARG 2 mode + ARG 3 matrices + ARG 4 vertexConsumers + ARG 5 light + ARG 6 overlay diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index ec77517abf..6c75dcb540 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -63,6 +63,9 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 3 x ARG 4 y METHOD method_27952 getArmorVertexConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588; + ARG 0 vertexConsumers + ARG 1 layer + ARG 2 solid ARG 3 glint METHOD method_27953 renderInGui (Lnet/minecraft/class_1799;II)V COMMENT Renders an item in a GUI without an attached entity. diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 0bc9ec2839..7f037f9b1e 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -11,6 +11,16 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_3727 netHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_3733 scoreboard Lnet/minecraft/class_269; + METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_5321;Lnet/minecraft/class_2874;ILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V + ARG 1 networkHandler + ARG 2 properties + ARG 3 worldRef + ARG 4 dimensionType + ARG 5 chunkLoadDistance + ARG 6 profiler + ARG 7 worldRenderer + ARG 8 debug + ARG 9 seed METHOD method_18107 addPlayer (ILnet/minecraft/class_742;)V ARG 1 id ARG 2 player diff --git a/mappings/net/minecraft/client/world/GeneratorType.mapping b/mappings/net/minecraft/client/world/GeneratorType.mapping index 7d043a15e5..1deadac50a 100644 --- a/mappings/net/minecraft/client/world/GeneratorType.mapping +++ b/mappings/net/minecraft/client/world/GeneratorType.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType FIELD field_25050 DEFAULT Lnet/minecraft/class_5317; FIELD field_25051 AMPLIFIED Lnet/minecraft/class_5317; FIELD field_25052 VALUES Ljava/util/List; + FIELD field_25053 SCREEN_PROVIDERS Ljava/util/Map; FIELD field_25054 FLAT Lnet/minecraft/class_5317; FIELD field_25055 LARGE_BIOMES Lnet/minecraft/class_5317; FIELD field_25056 SINGLE_BIOME_SURFACE Lnet/minecraft/class_5317; @@ -16,7 +17,40 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType ARG 1 biomeRegistry ARG 2 chunkGeneratorSettingsRegistry ARG 3 seed + METHOD method_29077 createDefaultOptions (Lnet/minecraft/class_5455$class_5457;JZZ)Lnet/minecraft/class_5285; + ARG 1 registryManager + ARG 2 seed + ARG 4 generateStructures + ARG 5 bonusChest + METHOD method_29079 createFixedBiomeOptions (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_5317;Lnet/minecraft/class_1959;)Lnet/minecraft/class_5285; + ARG 0 registryManager + ARG 1 generatorOptions + ARG 2 type + ARG 3 biome + METHOD method_29080 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; + ARG 0 screen + ARG 1 generatorOptions + METHOD method_29081 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;Lnet/minecraft/class_1959;)V + ARG 2 biome + METHOD method_29082 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;Lnet/minecraft/class_3232;)V + ARG 2 config METHOD method_29083 getFirstBiome (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)Lnet/minecraft/class_1959; ARG 0 registryManager ARG 1 options + METHOD method_29084 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; + ARG 0 screen + ARG 1 generatorOptions + METHOD method_29085 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;Lnet/minecraft/class_1959;)V + ARG 2 biome + METHOD method_29086 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; + ARG 0 screen + ARG 1 generatorOptions + METHOD method_29087 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;Lnet/minecraft/class_1959;)V + ARG 2 biome + METHOD method_29088 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; + ARG 0 screen + ARG 1 generatorOptions CLASS class_5293 ScreenProvider + METHOD createEditScreen (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; + ARG 1 screen + ARG 2 generatorOptions diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index b9dc3cb513..3ab835ca2e 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper + METHOD method_17883 (Lnet/minecraft/class_1890$class_1891;ILnet/minecraft/class_1887;)V + ARG 2 enchantment METHOD method_17884 (Ljava/util/Map;Lnet/minecraft/class_2487;Lnet/minecraft/class_1887;)V ARG 2 enchantment METHOD method_22445 fromTag (Lnet/minecraft/class_2499;)Ljava/util/Map; @@ -21,6 +23,9 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 stack METHOD method_25951 hasSoulSpeed (Lnet/minecraft/class_1309;)Z ARG 0 entity + METHOD method_8198 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_1887;I)V + ARG 2 enchantment + ARG 3 level METHOD method_8199 getFireAspect (Lnet/minecraft/class_1309;)I ARG 0 entity METHOD method_8200 hasAquaAffinity (Lnet/minecraft/class_1309;)Z @@ -53,14 +58,25 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 entity METHOD method_8206 getLoyalty (Lnet/minecraft/class_1799;)I ARG 0 stack - METHOD method_8209 forEachEnchantment (Lnet/minecraft/class_1890$class_1891;Ljava/lang/Iterable;)V - ARG 0 action + METHOD method_8207 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_1887;I)V + ARG 2 enchantment + ARG 3 level + METHOD method_8208 (Lorg/apache/commons/lang3/mutable/MutableFloat;Lnet/minecraft/class_1310;Lnet/minecraft/class_1887;I)V + ARG 2 enchantment + ARG 3 level + METHOD method_8209 acceptEnchantments (Lnet/minecraft/class_1890$class_1891;Ljava/lang/Iterable;)V + COMMENT Uses the supplied visitor to visit every enchantment on several item stacks. + ARG 0 visitor + COMMENT the visitor used to visit all enchantments ARG 1 stacks METHOD method_8210 onUserDamaged (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;)V ARG 0 user ARG 1 attacker METHOD method_8211 getRespiration (Lnet/minecraft/class_1309;)I ARG 0 entity + METHOD method_8212 (Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_1282;Lnet/minecraft/class_1887;I)V + ARG 2 enchantment + ARG 3 level METHOD method_8213 onTargetDamaged (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;)V ARG 0 user ARG 1 target @@ -86,9 +102,12 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper METHOD method_8219 getProtectionAmount (Ljava/lang/Iterable;Lnet/minecraft/class_1282;)I ARG 0 equipment ARG 1 source - METHOD method_8220 forEachEnchantment (Lnet/minecraft/class_1890$class_1891;Lnet/minecraft/class_1799;)V - ARG 0 action + METHOD method_8220 acceptEnchantments (Lnet/minecraft/class_1890$class_1891;Lnet/minecraft/class_1799;)V + COMMENT Uses the supplied visitor to visit every enchantment on an item stack. + ARG 0 visitor + COMMENT the visitor used to visit all enchantments ARG 1 stack + COMMENT the item stack METHOD method_8221 hasVanishingCurse (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_8222 get (Lnet/minecraft/class_1799;)Ljava/util/Map; @@ -156,7 +175,10 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper COMMENT whether treasure enchantments may appear METHOD method_8234 getEfficiency (Lnet/minecraft/class_1309;)I ARG 0 entity - CLASS class_1891 Consumer + CLASS class_1891 Visitor METHOD accept (Lnet/minecraft/class_1887;I)V + COMMENT Visits an enchantment. ARG 1 enchantment + COMMENT the enchantment ARG 2 level + COMMENT the level of the enchantment diff --git a/mappings/net/minecraft/util/registry/MutableRegistry.mapping b/mappings/net/minecraft/util/registry/MutableRegistry.mapping index 20c0fd61f5..d8288f2b9c 100644 --- a/mappings/net/minecraft/util/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/util/registry/MutableRegistry.mapping @@ -2,7 +2,9 @@ CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Ljava/lang/Object; ARG 1 key ARG 2 entry + ARG 3 lifecycle METHOD method_10273 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Ljava/lang/Object; ARG 1 rawId ARG 2 key ARG 3 entry + ARG 4 lifecycle diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 4410855eac..e29048fff4 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -102,6 +102,9 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_25297 LOOT_CONDITION_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_25299 LOOT_CONDITION_TYPE Lnet/minecraft/class_2378; FIELD field_25490 DIMENSION_OPTIONS Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V + ARG 1 key + ARG 2 lifecycle METHOD method_10220 stream ()Ljava/util/stream/Stream; METHOD method_10221 getId (Ljava/lang/Object;)Lnet/minecraft/class_2960; ARG 1 entry @@ -148,3 +151,12 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 1 value METHOD method_29722 getEntries ()Ljava/util/Set; METHOD method_30517 getKey ()Lnet/minecraft/class_5321; + METHOD method_31138 getLifecycle ()Lcom/mojang/serialization/Lifecycle; + METHOD method_31139 getEntryLifecycle (Ljava/lang/Object;)Lcom/mojang/serialization/Lifecycle; + METHOD method_31140 require (Lnet/minecraft/class_5321;)Ljava/lang/Object; + COMMENT Gets an entry from the registry. + COMMENT + COMMENT @throws IllegalStateException if the entry was not present in the registry + ARG 1 key + METHOD method_31189 getOrEmpty (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 key diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping index 7a60d29152..331365e745 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping @@ -4,7 +4,10 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry FIELD field_11109 nextId I FIELD field_11111 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_25067 entriesByKey Lcom/google/common/collect/BiMap; + FIELD field_26731 entryLifecycles Ljava/util/Map; METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object; METHOD method_29721 createCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 registryRef ARG 1 lifecycle + METHOD method_31139 getEntryLifecycle (Ljava/lang/Object;)Lcom/mojang/serialization/Lifecycle; + COMMENT Gets the lifecycle of a registry entry. diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 5ad82da701..b469c5f0c5 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -30,6 +30,11 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD (Lnet/minecraft/class_5269;Lnet/minecraft/class_5321;Lnet/minecraft/class_2874;Ljava/util/function/Supplier;ZZJ)V ARG 1 properties ARG 2 registryKey + ARG 3 dimensionType + ARG 4 profiler + ARG 5 isClient + ARG 6 debug + ARG 7 seed METHOD method_16107 getProfiler ()Lnet/minecraft/class_3695; METHOD method_16109 scheduleBlockRerenderIfNeeded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 pos diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 9b03b9fd3a..5e562ba426 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -69,6 +69,11 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_22415 getBiomeAccessType ()Lnet/minecraft/class_4545; METHOD method_27998 hasCeiling ()Z METHOD method_27999 isUltrawarm ()Z + METHOD method_28517 createDefaultDimensionOptions (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_2370; + ARG 0 dimensionRegistry + ARG 1 biomeRegistry + ARG 2 chunkGeneratorSettingsRegistry + ARG 3 seed METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5455$class_5457;)Lnet/minecraft/class_5455$class_5457; ARG 0 registryManager METHOD method_28528 (J)F