Assorted mappings, mainly enchanting, some rendering params and generator type. (#1671)

* Assorted mappings, mainly enchanting, some rendering params and generator type.

(cherry picked from commit b573c98c68)

* Back to consumer

* drop empty comments

* yeet broken

* oops2

* Update World.mapping
This commit is contained in:
i509VCB 2020-08-30 18:37:36 -05:00 committed by GitHub
parent b964ad9c82
commit 577ff9ccbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 77 additions and 4 deletions

View File

@ -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

View File

@ -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.

View File

@ -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

View File

@ -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,23 @@ 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_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 forEachEnchantment (Lnet/minecraft/class_1890$class_1891;Ljava/lang/Iterable;)V
ARG 0 action
ARG 0 consumer
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
@ -87,7 +101,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper
ARG 0 equipment
ARG 1 source
METHOD method_8220 forEachEnchantment (Lnet/minecraft/class_1890$class_1891;Lnet/minecraft/class_1799;)V
ARG 0 action
ARG 0 consumer
ARG 1 stack
METHOD method_8221 hasVanishingCurse (Lnet/minecraft/class_1799;)Z
ARG 0 stack

View File

@ -2,6 +2,7 @@ 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

View File

@ -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 <init> (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
@ -150,8 +153,10 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
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;
ARG 1 entry
METHOD method_31140 getOrThrow (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

View File

@ -15,6 +15,8 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry
ARG 0 registryRef
ARG 1 lifecycle
ARG 2 entryCodec
METHOD method_31139 getEntryLifecycle (Ljava/lang/Object;)Lcom/mojang/serialization/Lifecycle;
COMMENT Gets the lifecycle of a registry entry.
METHOD method_30929 createRegistryManagerEntryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec;
ARG 1 entryCodec
METHOD method_31051 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;Z)Ljava/lang/Object;

View File

@ -29,8 +29,12 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
FIELD field_9256 lcgBlockSeed I
METHOD <init> (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 2 registryRef
ARG 3 dimensionType
ARG 4 profiler
ARG 5 isClient
ARG 6 debugWorld
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

View File

@ -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 getSkyAngle (J)F