Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Great Registry Repackaging #3396

Merged
merged 10 commits into from
Nov 16, 2022
Merged

Great Registry Repackaging #3396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
83fcc3d
22w45a registry
apple502j Nov 9, 2022
c9df80a
Merge branch '22w45a' of https://github.com/FabricMC/yarn into 22w45a…
apple502j Nov 9, 2022
61065f8
More registry
apple502j Nov 9, 2022
77503b8
Great Registry Repackaging
apple502j Nov 9, 2022
79d7bd0
Revert defaulted registry rename
apple502j Nov 9, 2022
883d3e8
Rename RegistryKeys fields to fix inconsistency
apple502j Nov 10, 2022
68101db
Fix javadoc
apple502j Nov 10, 2022
fc9c749
Move some classes again, per haykam suggestion
apple502j Nov 15, 2022
335485d
Fix javadoc
apple502j Nov 15, 2022
8ed8115
Update CommandRegistryAccess.mapping
apple502j Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mappings/net/minecraft/block/Block.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
COMMENT
COMMENT <p>There is exactly one instance for every type of block. Every stone
COMMENT block for example in a world shares the same block instance. Each block
COMMENT instance is registered under {@link net.minecraft.util.registry.Registry#BLOCK}.
COMMENT instance is registered under {@link net.minecraft.registry.Registries#BLOCK}.
COMMENT See {@link Blocks} for examples of block instances.
COMMENT
COMMENT <p>An item corresponding to a block is not automatically created. You
COMMENT may create your own {@link net.minecraft.item.BlockItem} and register it
COMMENT under {@link net.minecraft.util.registry.Registry#ITEM}.
COMMENT under {@link net.minecraft.registry.Registries#ITEM}.
COMMENT
COMMENT <p>The translation key for the block name is determined by {@link
COMMENT #getTranslationKey}.
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn
ARG 2 count
METHOD method_26395 isNonFlammableWood (Lnet/minecraft/class_1792;)Z
COMMENT {@return whether the provided {@code item} is in the {@link
COMMENT net.minecraft.tag.ItemTags#NON_FLAMMABLE_WOOD non_flammable_wood} tag}
COMMENT net.minecraft.registry.tag.ItemTags#NON_FLAMMABLE_WOOD non_flammable_wood} tag}
ARG 0 item
METHOD method_27354 getRecipesUsedAndDropExperience (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Ljava/util/List;
ARG 1 world
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/entity/BellBlockEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CLASS net/minecraft/class_3721 net/minecraft/block/entity/BellBlockEntity
METHOD method_20219 notifyMemoriesOfBell ()V
COMMENT Makes living entities within 48 blocks remember that they heard a bell at the current world time.
METHOD method_20518 isRaiderEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_1309;)Z
COMMENT Determines whether the given entity is in the {@link net.minecraft.tag.EntityTypeTags#RAIDERS} entity type tag and within 48 blocks of the given position.
COMMENT Determines whether the given entity is in the {@link net.minecraft.registry.tag.EntityTypeTags#RAIDERS} entity type tag and within 48 blocks of the given position.
ARG 0 pos
ARG 1 entity
METHOD method_20519 (Lnet/minecraft/class_2338;ILorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/entity/BlockEntityType.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2591 net/minecraft/block/entity/BlockEntityType
COMMENT represents the type of the placed block entities, like chests or furnaces.
COMMENT
COMMENT <p>Block entity types are pre-defined and registered in {@link
COMMENT net.minecraft.util.registry.Registry#BLOCK_ENTITY_TYPE}. To create a block
COMMENT net.minecraft.registry.Registries#BLOCK_ENTITY_TYPE}. To create a block
COMMENT entity type, the {@linkplain BlockEntityType.Builder#create builder} should be used.
COMMENT
COMMENT <p>Blocks that have corresponding block entities must implement {@link
Expand Down
6 changes: 3 additions & 3 deletions mappings/net/minecraft/command/CommandRegistryAccess.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess
CLASS 2
FIELD field_40912 entryListCreationPolicy Lnet/minecraft/class_7157$class_7158;
CLASS class_7158 EntryListCreationPolicy
COMMENT A policy on how to handle a {@link net.minecraft.tag.TagKey} that does not resolve
COMMENT A policy on how to handle a {@link net.minecraft.registry.tag.TagKey} that does not resolve
COMMENT to an existing tag (unrecognized tag) in {@link
COMMENT net.minecraft.util.registry.RegistryWrapper#getOptional(net.minecraft.tag.TagKey)}.
COMMENT net.minecraft.registry.RegistryWrapper#getOptional(net.minecraft.registry.tag.TagKey)}.
FIELD field_37824 Lnet/minecraft/class_7157$class_7158;
COMMENT Creates a new {@link net.minecraft.util.registry.RegistryEntryList}, stores it and returns it.
COMMENT Creates a new {@link net.minecraft.registry.entry.RegistryEntryList}, stores it and returns it.
FIELD field_37826 Lnet/minecraft/class_7157$class_7158;
COMMENT Throws an exception.
CLASS class_7870 EntryListCreationPolicySettable
Expand Down
4 changes: 2 additions & 2 deletions mappings/net/minecraft/entity/Entity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,9 +669,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
COMMENT {@return whether the entity can freeze}
COMMENT
COMMENT @implNote Entities cannot be frozen if they are in the {@link
COMMENT net.minecraft.tag.EntityTypeTags#FREEZE_IMMUNE_ENTITY_TYPES} tag. In addition to this, {@link
COMMENT net.minecraft.registry.tag.EntityTypeTags#FREEZE_IMMUNE_ENTITY_TYPES} tag. In addition to this, {@link
COMMENT LivingEntity} cannot be frozen if they are spectator or if they wear an
COMMENT item inside {@link net.minecraft.tag.ItemTags#FREEZE_IMMUNE_WEARABLES} tag.
COMMENT item inside {@link net.minecraft.registry.tag.ItemTags#FREEZE_IMMUNE_WEARABLES} tag.
METHOD method_32317 setFrozenTicks (I)V
COMMENT Sets how long the entity is freezing in ticks.
COMMENT
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/item/Item.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
COMMENT
COMMENT <p>Items with no custom behavior, like diamonds, can call the constructor of Item
COMMENT directly. If a custom behavior is needed, this should be subclassed. Items also have
COMMENT to be registered in the {@link net.minecraft.util.registry.Registry#ITEM} registry.
COMMENT to be registered in the {@link net.minecraft.registry.Registries#ITEM} registry.
COMMENT
COMMENT <p>Many methods of this class are called on both the logical client and logical server,
COMMENT so take caution when using those methods. The logical side can be checked using
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/network/PacketByteBuf.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
COMMENT <td>Codec-based</td><td>{@link #decode(Codec)}</td><td>{@link #encode(Codec, Object)}</td>
COMMENT </tr>
COMMENT <tr>
COMMENT <td>{@link net.minecraft.util.registry.Registry} value</td><td>{@link #readRegistryValue(IndexedIterable)}</td><td>{@link #writeRegistryValue(IndexedIterable, Object)}</td>
COMMENT <td>{@link net.minecraft.registry.Registry} value</td><td>{@link #readRegistryValue(IndexedIterable)}</td><td>{@link #writeRegistryValue(IndexedIterable, Object)}</td>
COMMENT </tr>
COMMENT <tr>
COMMENT <td>{@link Collection}</td><td>{@link #readCollection(IntFunction, PacketByteBuf.PacketReader)}</td><td>{@link #writeCollection(Collection, PacketByteBuf.PacketWriter)}</td>
Expand Down
2 changes: 1 addition & 1 deletion ...t/util/registry/BuiltinRegistries.mapping → ...ecraft/registry/BuiltinRegistries.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_7887 net/minecraft/util/registry/BuiltinRegistries
CLASS net/minecraft/class_7887 net/minecraft/registry/BuiltinRegistries
FIELD field_40953 REGISTRY_BUILDER Lnet/minecraft/class_7877;
METHOD method_46817 createWrapperLookup ()Lnet/minecraft/class_7225$class_7874;
METHOD method_46818 hasBiomePlacementModifier (Lnet/minecraft/class_6796;)Z
Expand Down
2 changes: 1 addition & 1 deletion ...egistry/CombinedDynamicRegistries.mapping → ...egistry/CombinedDynamicRegistries.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_7780 net/minecraft/util/registry/CombinedDynamicRegistries
CLASS net/minecraft/class_7780 net/minecraft/registry/CombinedDynamicRegistries
FIELD field_40581 types Ljava/util/List;
FIELD field_40582 registryManagers Ljava/util/List;
FIELD field_40583 combinedRegistryManager Lnet/minecraft/class_5455$class_6890;
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/registry/DefaultedRegistry.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/class_7922 net/minecraft/registry/DefaultedRegistry
METHOD method_10137 getDefaultId ()Lnet/minecraft/class_2960;
2 changes: 1 addition & 1 deletion ...l/registry/DynamicRegistryManager.mapping → ...t/registry/DynamicRegistryManager.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManager
CLASS net/minecraft/class_5455 net/minecraft/registry/DynamicRegistryManager
COMMENT A manager of dynamic registries. It allows users to access non-hardcoded
COMMENT registries reliably.
COMMENT
Expand Down
2 changes: 1 addition & 1 deletion ...aft/util/registry/MutableRegistry.mapping → ...inecraft/registry/MutableRegistry.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry
CLASS net/minecraft/class_2385 net/minecraft/registry/MutableRegistry
COMMENT A registry that allows adding or modifying values.
COMMENT Note that in vanilla, all registries are instances of this.
COMMENT
Expand Down
2 changes: 1 addition & 1 deletion ...ecraft/util/registry/Registerable.mapping → ...t/minecraft/registry/Registerable.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_7891 net/minecraft/util/registry/Registerable
CLASS net/minecraft/class_7891 net/minecraft/registry/Registerable
METHOD method_46799 getRegistryLookup (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7871;
ARG 1 registryRef
METHOD method_46800 register (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883;
Expand Down
2 changes: 1 addition & 1 deletion ...inecraft/util/registry/Registries.mapping → ...net/minecraft/registry/Registries.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_7923 net/minecraft/util/registry/Registries
CLASS net/minecraft/class_7923 net/minecraft/registry/Registries
FIELD field_41128 POINT_OF_INTEREST_TYPE Lnet/minecraft/class_2378;
FIELD field_41129 MEMORY_MODULE_TYPE Lnet/minecraft/class_7922;
FIELD field_41130 SENSOR_TYPE Lnet/minecraft/class_7922;
Expand Down
28 changes: 14 additions & 14 deletions .../minecraft/util/registry/Registry.mapping → ...s/net/minecraft/registry/Registry.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
CLASS net/minecraft/class_2378 net/minecraft/registry/Registry
COMMENT A registry is used to register various in-game components. Almost all parts of the
COMMENT game - from blocks, items, and entity types, to cat types, goat horn instruments,
COMMENT and structure pools - are registered in registries. Registry system allows the game
Expand All @@ -11,9 +11,9 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
COMMENT <p>A <strong>registry</strong> is an object that holds the mapping between three things:
COMMENT the string ID, the numeric ID, and the registered value. There are many registries
COMMENT for different types of registerable objects, and a registry's type parameter indicates
COMMENT the accepted type. For example, you register your {@link Block} to {@code
COMMENT the accepted type. For example, you register your {@link net.minecraft.block.Block} to {@code
COMMENT Registry<Block>}. It's important to note that registries themselves are registered
COMMENT in a "registry of registries", {@link #ROOT}.
COMMENT in a "registry of registries", {@link Registries#ROOT}.
COMMENT
COMMENT <p>The <strong>string ID</strong>, usually just called "ID", is a human-readable
COMMENT {@link Identifier} that uniquely identifies the registered value in a registry.
Expand Down Expand Up @@ -69,7 +69,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
COMMENT <h2 id="using">Using Registry</h2>
COMMENT <h3 id="reading">Reading Registry</h3>
COMMENT <p>A registry is also an {@link IndexedIterable}. Therefore, registries can be
COMMENT iterated using, e.g. {@code for (Block block : Registry.BLOCK)}.
COMMENT iterated using, e.g. {@code for (Block block : Registries.BLOCK)}.
COMMENT
COMMENT <p>There are several other methods used for reading the contents of the registry:
COMMENT <ul>
Expand All @@ -88,7 +88,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
COMMENT or dynamic. For dynamic registries, data packs can usually be used to register a new
COMMENT value or replace one. For static registries, the game's code must be modified.
COMMENT
COMMENT <p>Static registries are defined in this class, and unlike the dynamic registries, it
COMMENT <p>Static registries are defined in {@link Registries}, and unlike the dynamic registries, it
COMMENT cannot be changed after the game initialization. The game enforces this by "freezing"
COMMENT the registry. Attempting to register a value after freezing causes a crash, such as
COMMENT "Registry is already frozen". Modding APIs usually provide a way to bypass this restriction.
Expand All @@ -103,22 +103,22 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
COMMENT <li><strong>Intrusive holders</strong> are registry entries tied to a specific
COMMENT registerable object at instantiation time. When instantiating those, it promises
COMMENT that the object is later registered - which, if broken, will result in a crash.
COMMENT This is used for {@link #BLOCK}, {@link #ITEM}, {@link #FLUID}, {@link #ENTITY_TYPE},
COMMENT and {@link #GAME_EVENT} registries.</li>
COMMENT This is used for {@link Registries#BLOCK}, {@link Registries#ITEM}, {@link Registries#FLUID},
COMMENT {@link Registries#ENTITY_TYPE}, and {@link Registries#GAME_EVENT} registries.</li>
COMMENT <li><strong>Standalone holders</strong> are registry entries that are not intrusive.
COMMENT There is no restriction on instantiation.</li>
COMMENT </ul>
COMMENT
COMMENT <p>When a class whose instances are registered as intrusive holders, such as
COMMENT {@link Block} or {@link Item}, are instantiated without registering, the game
COMMENT crashes with "Some intrusive holders were not added to registry" error message.
COMMENT <strong>This includes conditional registration</strong>. For example, the code
COMMENT below can cause a crash:
COMMENT {@link net.minecraft.block.Block} or {@link net.minecraft.item.Item}, are instantiated
COMMENT without registering, the game crashes with "Some intrusive holders were not added to
COMMENT registry" error message. <strong>This includes conditional registration</strong>.
COMMENT For example, the code below can cause a crash:
COMMENT
COMMENT <pre>{@code
COMMENT Item myItem = new Item(new Item.Settings());
COMMENT if (condition) {
COMMENT Registry.register(Registry.ITEM, new Identifier("example", "bad"), myItem);
COMMENT Registry.register(Registries.ITEM, new Identifier("example", "bad"), myItem);
COMMENT }
COMMENT }</pre>
COMMENT
Expand All @@ -127,7 +127,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
COMMENT <pre>{@code
COMMENT if (condition) {
COMMENT Item myItem = new Item(new Item.Settings());
COMMENT Registry.register(Registry.ITEM, new Identifier("example", "bad"), myItem);
COMMENT Registry.register(Registries.ITEM, new Identifier("example", "bad"), myItem);
COMMENT }
COMMENT }</pre>
METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream;
Expand Down Expand Up @@ -276,7 +276,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
METHOD method_47442 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle;
ARG 1 entry
METHOD method_47443 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult;
ARG 1 entry
ARG 1 id
CLASS 1
METHOD method_46773 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880;
ARG 0 entry
2 changes: 1 addition & 1 deletion ...aft/util/registry/RegistryBuilder.mapping → ...inecraft/registry/RegistryBuilder.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_7877 net/minecraft/util/registry/RegistryBuilder
CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
FIELD field_40941 registries Ljava/util/List;
METHOD method_46776 addRegistry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7877$class_7882;)Lnet/minecraft/class_7877;
ARG 1 registryRef
Expand Down
2 changes: 1 addition & 1 deletion ...raft/util/registry/RegistryCodecs.mapping → ...minecraft/registry/RegistryCodecs.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_6895 net/minecraft/util/registry/RegistryCodecs
CLASS net/minecraft/class_6895 net/minecraft/registry/RegistryCodecs
COMMENT A utility class for serialization of registries using codecs.
METHOD method_40340 entryList (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/Codec;
ARG 0 registryRef
Expand Down
2 changes: 1 addition & 1 deletion ...util/registry/RegistryEntryLookup.mapping → ...raft/registry/RegistryEntryLookup.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_7871 net/minecraft/util/registry/RegistryEntryLookup
CLASS net/minecraft/class_7871 net/minecraft/registry/RegistryEntryLookup
METHOD method_46733 getOptional (Lnet/minecraft/class_6862;)Ljava/util/Optional;
ARG 1 tag
METHOD method_46735 getOrThrow (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888;
Expand Down
9 changes: 7 additions & 2 deletions ...necraft/util/registry/RegistryKey.mapping → ...et/minecraft/registry/RegistryKey.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey
CLASS net/minecraft/class_5321 net/minecraft/registry/RegistryKey
COMMENT Represents a key for a value in a registry in a context where a
COMMENT root registry is available.
COMMENT
COMMENT @param <T> the type of the value
COMMENT @see Registry#ROOT
COMMENT @see Registries#ROOT
FIELD field_25136 INSTANCES Ljava/util/concurrent/ConcurrentMap;
COMMENT A cache of all registry keys ever created.
FIELD field_25137 registry Lnet/minecraft/class_2960;
Expand Down Expand Up @@ -40,6 +40,8 @@ CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey
METHOD method_29181 of (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321;
ARG 0 registry
ARG 1 value
METHOD method_29182 (Lnet/minecraft/class_5321$class_7892;)Lnet/minecraft/class_5321;
ARG 0 pair
METHOD method_31163 isOf (Lnet/minecraft/class_5321;)Z
COMMENT Returns whether this registry key belongs to the given registry (according to its type, not whether the registry actually contains this key).
ARG 1 registry
Expand All @@ -56,3 +58,6 @@ CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey
COMMENT by passing the registry {@code E}.
ARG 1 registryRef
METHOD method_41185 getRegistry ()Lnet/minecraft/class_2960;
CLASS class_7892 RegistryIdPair
FIELD comp_1150 id Lnet/minecraft/class_2960;
METHOD comp_1150 id ()Lnet/minecraft/class_2960;
30 changes: 30 additions & 0 deletions mappings/net/minecraft/registry/RegistryKeys.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
CLASS net/minecraft/class_7924 net/minecraft/registry/RegistryKeys
FIELD field_41204 MATERIAL_CONDITION Lnet/minecraft/class_5321;
FIELD field_41205 MATERIAL_RULE Lnet/minecraft/class_5321;
FIELD field_41207 SCREEN_HANDLER Lnet/minecraft/class_5321;
FIELD field_41208 STATUS_EFFECT Lnet/minecraft/class_5321;
FIELD field_41211 PLACEMENT_MODIFIER_TYPE Lnet/minecraft/class_5321;
FIELD field_41218 ROOT_PLAYER_TYPE Lnet/minecraft/class_5321;
FIELD field_41223 WORLD Lnet/minecraft/class_5321;
FIELD field_41224 DIMENSION Lnet/minecraft/class_5321;
FIELD field_41227 STRUCTURE_PIECE Lnet/minecraft/class_5321;
FIELD field_41228 STRUCTURE_PLACEMENT Lnet/minecraft/class_5321;
FIELD field_41229 STRUCTURE_POOL_ELEMENT Lnet/minecraft/class_5321;
FIELD field_41230 STRUCTURE_PROCESSOR Lnet/minecraft/class_5321;
FIELD field_41231 STRUCTURE_TYPE Lnet/minecraft/class_5321;
FIELD field_41232 TREE_DECORATOR_TYPE Lnet/minecraft/class_5321;
FIELD field_41233 TRUNK_PLACER_TYPE Lnet/minecraft/class_5321;
FIELD field_41253 BIOME_SOURCE Lnet/minecraft/class_5321;
FIELD field_41257 BLOCK_STATE_PROVIDER_TYPE Lnet/minecraft/class_5321;
FIELD field_41258 CARVER Lnet/minecraft/class_5321;
FIELD field_41260 CHUNK_GENERATOR Lnet/minecraft/class_5321;
FIELD field_41264 DENSITY_FUNCTION_TYPE Lnet/minecraft/class_5321;
FIELD field_41267 FEATURE Lnet/minecraft/class_5321;
FIELD field_41268 FEATURE_SIZE_TYPE Lnet/minecraft/class_5321;
FIELD field_41271 FOLIAGE_PLACER_TYPE Lnet/minecraft/class_5321;
METHOD method_47516 toWorldKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321;
ARG 0 key
METHOD method_47517 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
ARG 0 id
METHOD method_47518 toDimensionKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321;
ARG 0 key
2 changes: 1 addition & 1 deletion ...raft/util/registry/RegistryLoader.mapping → ...minecraft/registry/RegistryLoader.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_7655 net/minecraft/util/registry/RegistryLoader
CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
FIELD field_39968 DYNAMIC_REGISTRIES Ljava/util/List;
FIELD field_39969 DIMENSION_REGISTRIES Ljava/util/List;
FIELD field_39970 LOGGER Lorg/slf4j/Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...inecraft/util/dynamic/RegistryOps.mapping → ...et/minecraft/registry/RegistryOps.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_6903 net/minecraft/util/dynamic/RegistryOps
CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps
FIELD field_40852 registryInfoGetter Lnet/minecraft/class_6903$class_7863;
METHOD <init> (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6903$class_7863;)V
ARG 1 delegate
Expand Down
2 changes: 1 addition & 1 deletion ...aft/util/registry/RegistryWrapper.mapping → ...inecraft/registry/RegistryWrapper.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_7225 net/minecraft/util/registry/RegistryWrapper
CLASS net/minecraft/class_7225 net/minecraft/registry/RegistryWrapper
COMMENT A read-only wrapper of a registry.
METHOD method_42017 streamEntries ()Ljava/util/stream/Stream;
COMMENT {@return a stream of registry keys defined in the wrapped registry}
Expand Down
4 changes: 3 additions & 1 deletion ...l/registry/SerializableRegistries.mapping → ...t/registry/SerializableRegistries.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_7782 net/minecraft/util/registry/SerializableRegistries
CLASS net/minecraft/class_7782 net/minecraft/registry/SerializableRegistries
FIELD field_40587 CODEC Lcom/mojang/serialization/Codec;
FIELD field_40588 REGISTRIES Ljava/util/Map;
METHOD method_45948 createCodec ()Lcom/mojang/serialization/Codec;
Expand Down Expand Up @@ -30,4 +30,6 @@ CLASS net/minecraft/class_7782 net/minecraft/util/registry/SerializableRegistrie
ARG 0 registryManager
METHOD method_45963 (Lnet/minecraft/class_5455$class_6892;)Z
ARG 0 entry
METHOD method_47449 streamDynamicEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream;
ARG 0 combinedRegistries
CLASS class_7783 Info
Loading