From 3c9bfef30e7ae659f3bc1578eb63bad61ab7c0bb Mon Sep 17 00:00:00 2001 From: TropheusJ Date: Sat, 15 Feb 2025 19:44:59 -0500 Subject: [PATCH] rename to SimpleRegistry --- .../create/AllInteractionBehaviours.java | 10 +++++----- .../simibubi/create/AllMovementBehaviours.java | 4 ++-- .../storage/MountedStorageTypeRegistries.java | 6 +++--- .../MountedFluidStorageTypeBuilder.java | 4 ++-- .../MountedItemStorageTypeBuilder.java | 4 ++-- .../MovedBlockTransformerRegistries.java | 6 +++--- ...ttachedRegistry.java => SimpleRegistry.java} | 17 +++++++++-------- .../schematic/nbt/SafeNbtWriterRegistry.java | 4 ++-- .../SchematicRequirementRegistries.java | 8 ++++---- .../ContraptionMovementSetting.java | 4 ++-- .../content/fluids/tank/BoilerHeaters.java | 6 +++--- .../displayLink/AllDisplayBehaviours.java | 10 +++++----- .../content/trains/track/AllPortalTracks.java | 4 ++-- .../create/foundation/item/TooltipModifier.java | 4 ++-- .../storage/MountedStorageTypeRegistryImpl.java | 12 ++++++------ ...egistryImpl.java => SimpleRegistryImpl.java} | 4 ++-- .../create/impl/registry/TagProviderImpl.java | 6 +++--- 17 files changed, 57 insertions(+), 56 deletions(-) rename src/main/java/com/simibubi/create/api/registry/{AttachedRegistry.java => SimpleRegistry.java} (81%) rename src/main/java/com/simibubi/create/impl/registry/{AttachedRegistryImpl.java => SimpleRegistryImpl.java} (95%) diff --git a/src/main/java/com/simibubi/create/AllInteractionBehaviours.java b/src/main/java/com/simibubi/create/AllInteractionBehaviours.java index a5ef6b7ff0..d836046b27 100644 --- a/src/main/java/com/simibubi/create/AllInteractionBehaviours.java +++ b/src/main/java/com/simibubi/create/AllInteractionBehaviours.java @@ -2,7 +2,7 @@ package com.simibubi.create; import org.jetbrains.annotations.Nullable; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.simibubi.create.content.contraptions.behaviour.DoorMovingInteraction; import com.simibubi.create.content.contraptions.behaviour.LeverMovingInteraction; import com.simibubi.create.content.contraptions.behaviour.MovingInteractionBehaviour; @@ -15,7 +15,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; public class AllInteractionBehaviours { - public static final AttachedRegistry REGISTRY = AttachedRegistry.create(); + public static final SimpleRegistry REGISTRY = SimpleRegistry.create(); @Nullable public static MovingInteractionBehaviour getBehaviour(BlockState state) { @@ -32,8 +32,8 @@ public class AllInteractionBehaviours { static void registerDefaults() { REGISTRY.register(Blocks.LEVER, new LeverMovingInteraction()); - REGISTRY.registerProvider(AttachedRegistry.Provider.forBlockTag(BlockTags.WOODEN_DOORS, new DoorMovingInteraction())); - REGISTRY.registerProvider(AttachedRegistry.Provider.forBlockTag(BlockTags.WOODEN_TRAPDOORS, new TrapdoorMovingInteraction())); - REGISTRY.registerProvider(AttachedRegistry.Provider.forBlockTag(BlockTags.FENCE_GATES, new TrapdoorMovingInteraction())); + REGISTRY.registerProvider(SimpleRegistry.Provider.forBlockTag(BlockTags.WOODEN_DOORS, new DoorMovingInteraction())); + REGISTRY.registerProvider(SimpleRegistry.Provider.forBlockTag(BlockTags.WOODEN_TRAPDOORS, new TrapdoorMovingInteraction())); + REGISTRY.registerProvider(SimpleRegistry.Provider.forBlockTag(BlockTags.FENCE_GATES, new TrapdoorMovingInteraction())); } } diff --git a/src/main/java/com/simibubi/create/AllMovementBehaviours.java b/src/main/java/com/simibubi/create/AllMovementBehaviours.java index 2be5bc5933..e03ee17c93 100644 --- a/src/main/java/com/simibubi/create/AllMovementBehaviours.java +++ b/src/main/java/com/simibubi/create/AllMovementBehaviours.java @@ -2,7 +2,7 @@ package com.simibubi.create; import org.jetbrains.annotations.Nullable; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.simibubi.create.content.contraptions.behaviour.BellMovementBehaviour; import com.simibubi.create.content.contraptions.behaviour.CampfireMovementBehaviour; import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour; @@ -15,7 +15,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; public class AllMovementBehaviours { - public static final AttachedRegistry REGISTRY = AttachedRegistry.create(); + public static final SimpleRegistry REGISTRY = SimpleRegistry.create(); @Nullable public static MovementBehaviour getBehaviour(BlockState state) { diff --git a/src/main/java/com/simibubi/create/api/contraption/storage/MountedStorageTypeRegistries.java b/src/main/java/com/simibubi/create/api/contraption/storage/MountedStorageTypeRegistries.java index b78dcb0168..f86ffc0921 100644 --- a/src/main/java/com/simibubi/create/api/contraption/storage/MountedStorageTypeRegistries.java +++ b/src/main/java/com/simibubi/create/api/contraption/storage/MountedStorageTypeRegistries.java @@ -3,7 +3,7 @@ package com.simibubi.create.api.contraption.storage; import com.simibubi.create.Create; import com.simibubi.create.api.contraption.storage.fluid.MountedFluidStorageType; import com.simibubi.create.api.contraption.storage.item.MountedItemStorageType; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.simibubi.create.impl.contraption.storage.MountedStorageTypeRegistryImpl; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.util.entry.RegistryEntry; @@ -23,8 +23,8 @@ public class MountedStorageTypeRegistries { Create.asResource("mounted_fluid_storage_type") ); - public static final AttachedRegistry> ITEM_STORAGES = MountedStorageTypeRegistryImpl.ITEM_STORAGES; - public static final AttachedRegistry> FLUID_STORAGES = MountedStorageTypeRegistryImpl.FLUID_STORAGES; + public static final SimpleRegistry> ITEM_STORAGES = MountedStorageTypeRegistryImpl.ITEM_STORAGES; + public static final SimpleRegistry> FLUID_STORAGES = MountedStorageTypeRegistryImpl.FLUID_STORAGES; /** * @throws NullPointerException if called before registry registration diff --git a/src/main/java/com/simibubi/create/api/contraption/storage/fluid/registrate/MountedFluidStorageTypeBuilder.java b/src/main/java/com/simibubi/create/api/contraption/storage/fluid/registrate/MountedFluidStorageTypeBuilder.java index 645ea1a694..4492cdd01e 100644 --- a/src/main/java/com/simibubi/create/api/contraption/storage/fluid/registrate/MountedFluidStorageTypeBuilder.java +++ b/src/main/java/com/simibubi/create/api/contraption/storage/fluid/registrate/MountedFluidStorageTypeBuilder.java @@ -2,7 +2,7 @@ package com.simibubi.create.api.contraption.storage.fluid.registrate; import com.simibubi.create.api.contraption.storage.MountedStorageTypeRegistries; import com.simibubi.create.api.contraption.storage.fluid.MountedFluidStorageType; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.builders.AbstractBuilder; import com.tterrag.registrate.builders.BuilderCallback; @@ -25,7 +25,7 @@ public class MountedFluidStorageTypeBuilder } public MountedFluidStorageTypeBuilder registerTo(TagKey tag) { - MountedStorageTypeRegistries.FLUID_STORAGES.registerProvider(AttachedRegistry.Provider.forBlockTag(tag, this.type)); + MountedStorageTypeRegistries.FLUID_STORAGES.registerProvider(SimpleRegistry.Provider.forBlockTag(tag, this.type)); return this; } diff --git a/src/main/java/com/simibubi/create/api/contraption/storage/item/registrate/MountedItemStorageTypeBuilder.java b/src/main/java/com/simibubi/create/api/contraption/storage/item/registrate/MountedItemStorageTypeBuilder.java index 3b94069568..f9a467ca0e 100644 --- a/src/main/java/com/simibubi/create/api/contraption/storage/item/registrate/MountedItemStorageTypeBuilder.java +++ b/src/main/java/com/simibubi/create/api/contraption/storage/item/registrate/MountedItemStorageTypeBuilder.java @@ -2,7 +2,7 @@ package com.simibubi.create.api.contraption.storage.item.registrate; import com.simibubi.create.api.contraption.storage.MountedStorageTypeRegistries; import com.simibubi.create.api.contraption.storage.item.MountedItemStorageType; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.builders.AbstractBuilder; import com.tterrag.registrate.builders.BuilderCallback; @@ -25,7 +25,7 @@ public class MountedItemStorageTypeBuilder, } public MountedItemStorageTypeBuilder registerTo(TagKey tag) { - MountedStorageTypeRegistries.ITEM_STORAGES.registerProvider(AttachedRegistry.Provider.forBlockTag(tag, this.type)); + MountedStorageTypeRegistries.ITEM_STORAGES.registerProvider(SimpleRegistry.Provider.forBlockTag(tag, this.type)); return this; } diff --git a/src/main/java/com/simibubi/create/api/contraption/transformable/MovedBlockTransformerRegistries.java b/src/main/java/com/simibubi/create/api/contraption/transformable/MovedBlockTransformerRegistries.java index f46534238c..e0160dc481 100644 --- a/src/main/java/com/simibubi/create/api/contraption/transformable/MovedBlockTransformerRegistries.java +++ b/src/main/java/com/simibubi/create/api/contraption/transformable/MovedBlockTransformerRegistries.java @@ -1,6 +1,6 @@ package com.simibubi.create.api.contraption.transformable; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.simibubi.create.content.contraptions.StructureTransform; import net.minecraft.world.level.block.Block; @@ -13,8 +13,8 @@ import net.minecraft.world.level.block.state.BlockState; * These interfaces are alternatives to the {@link ITransformableBlock} and {@link ITransformableBlockEntity} interfaces. */ public class MovedBlockTransformerRegistries { - public static final AttachedRegistry BLOCK_TRANSFORMERS = AttachedRegistry.create(); - public static final AttachedRegistry, BlockEntityTransformer> BLOCK_ENTITY_TRANSFORMERS = AttachedRegistry.create(); + public static final SimpleRegistry BLOCK_TRANSFORMERS = SimpleRegistry.create(); + public static final SimpleRegistry, BlockEntityTransformer> BLOCK_ENTITY_TRANSFORMERS = SimpleRegistry.create(); @FunctionalInterface public interface BlockTransformer { diff --git a/src/main/java/com/simibubi/create/api/registry/AttachedRegistry.java b/src/main/java/com/simibubi/create/api/registry/SimpleRegistry.java similarity index 81% rename from src/main/java/com/simibubi/create/api/registry/AttachedRegistry.java rename to src/main/java/com/simibubi/create/api/registry/SimpleRegistry.java index 0f44dd135a..83090419b4 100644 --- a/src/main/java/com/simibubi/create/api/registry/AttachedRegistry.java +++ b/src/main/java/com/simibubi/create/api/registry/SimpleRegistry.java @@ -4,7 +4,7 @@ import java.util.function.Function; import org.jetbrains.annotations.Nullable; -import com.simibubi.create.impl.registry.AttachedRegistryImpl; +import com.simibubi.create.impl.registry.SimpleRegistryImpl; import com.simibubi.create.impl.registry.TagProviderImpl; import net.minecraft.core.Holder; @@ -13,12 +13,13 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; /** - * A mapping of registered objects to something else. + * A simple registry mapping between objects. Provides simple registration functionality, as well as lazy providers. * This class is thread-safe, and may be safely used during parallel mod init. */ -public interface AttachedRegistry { +public interface SimpleRegistry { /** * Register an association between a key and a value. + * Direct registrations here always take priority over providers. * @throws IllegalArgumentException if the object already has an associated value */ void register(K object, V value); @@ -41,8 +42,8 @@ public interface AttachedRegistry { @Nullable V get(K object); - static AttachedRegistry create() { - return new AttachedRegistryImpl<>(); + static SimpleRegistry create() { + return new SimpleRegistryImpl<>(); } /** @@ -50,7 +51,7 @@ public interface AttachedRegistry { * associated value, all providers will be queried in reverse-registration order. *

* The values returned by providers are cached so that repeated queries always return the same value. - * To invalidate the cache of a provider, call {@link AttachedRegistry#invalidateProvider(Provider)}. + * To invalidate the cache of a provider, call {@link SimpleRegistry#invalidateProvider(Provider)}. */ @FunctionalInterface interface Provider { @@ -58,11 +59,11 @@ public interface AttachedRegistry { V get(K object); /** - * Called by the AttachedRegistry this provider is registered to after it's registered. + * Called by the SimpleRegistry this provider is registered to after it's registered. * This is useful for behavior that should only happen if a provider is actually registered, * such as registering event listeners. */ - default void onRegister(AttachedRegistry registry) { + default void onRegister(SimpleRegistry registry) { } /** diff --git a/src/main/java/com/simibubi/create/api/schematic/nbt/SafeNbtWriterRegistry.java b/src/main/java/com/simibubi/create/api/schematic/nbt/SafeNbtWriterRegistry.java index bc6e778f9f..c9b7e5b179 100644 --- a/src/main/java/com/simibubi/create/api/schematic/nbt/SafeNbtWriterRegistry.java +++ b/src/main/java/com/simibubi/create/api/schematic/nbt/SafeNbtWriterRegistry.java @@ -1,6 +1,6 @@ package com.simibubi.create.api.schematic.nbt; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.entity.BlockEntity; @@ -14,7 +14,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; * This is provided as an alternative to {@link IPartialSafeNBT}. */ public class SafeNbtWriterRegistry { - public static final AttachedRegistry, SafeNbtWriter> REGISTRY = AttachedRegistry.create(); + public static final SimpleRegistry, SafeNbtWriter> REGISTRY = SimpleRegistry.create(); @FunctionalInterface public interface SafeNbtWriter { diff --git a/src/main/java/com/simibubi/create/api/schematic/requirement/SchematicRequirementRegistries.java b/src/main/java/com/simibubi/create/api/schematic/requirement/SchematicRequirementRegistries.java index 4c4a12a01d..ca7244432d 100644 --- a/src/main/java/com/simibubi/create/api/schematic/requirement/SchematicRequirementRegistries.java +++ b/src/main/java/com/simibubi/create/api/schematic/requirement/SchematicRequirementRegistries.java @@ -2,7 +2,7 @@ package com.simibubi.create.api.schematic.requirement; import org.jetbrains.annotations.Nullable; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.simibubi.create.content.schematics.requirement.ItemRequirement; import net.minecraft.world.entity.Entity; @@ -24,9 +24,9 @@ import net.minecraft.world.level.block.state.BlockState; * */ public class SchematicRequirementRegistries { - public static final AttachedRegistry BLOCKS = AttachedRegistry.create(); - public static final AttachedRegistry, BlockEntityRequirement> BLOCK_ENTITIES = AttachedRegistry.create(); - public static final AttachedRegistry, EntityRequirement> ENTITIES = AttachedRegistry.create(); + public static final SimpleRegistry BLOCKS = SimpleRegistry.create(); + public static final SimpleRegistry, BlockEntityRequirement> BLOCK_ENTITIES = SimpleRegistry.create(); + public static final SimpleRegistry, EntityRequirement> ENTITIES = SimpleRegistry.create(); @FunctionalInterface public interface BlockRequirement { diff --git a/src/main/java/com/simibubi/create/content/contraptions/ContraptionMovementSetting.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionMovementSetting.java index 7e4878269a..610bc9c718 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ContraptionMovementSetting.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionMovementSetting.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import javax.annotation.Nullable; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.simibubi.create.infrastructure.config.AllConfigs; import net.minecraft.world.level.block.Block; @@ -17,7 +17,7 @@ import net.minecraftforge.common.extensions.IForgeBlock; public enum ContraptionMovementSetting { MOVABLE, NO_PICKUP, UNMOVABLE; - public static final AttachedRegistry> REGISTRY = AttachedRegistry.create(); + public static final SimpleRegistry> REGISTRY = SimpleRegistry.create(); @Nullable public static ContraptionMovementSetting get(Block block) { diff --git a/src/main/java/com/simibubi/create/content/fluids/tank/BoilerHeaters.java b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerHeaters.java index 077094e64f..2ea86b27db 100644 --- a/src/main/java/com/simibubi/create/content/fluids/tank/BoilerHeaters.java +++ b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerHeaters.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.fluids.tank; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTags.AllBlockTags; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.simibubi.create.content.processing.burner.BlazeBurnerBlock; import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel; import com.simibubi.create.foundation.utility.BlockHelper; @@ -16,7 +16,7 @@ public class BoilerHeaters { public static final int PASSIVE_HEAT = 0; public static final int NO_HEAT = -1; - public static final AttachedRegistry REGISTRY = AttachedRegistry.create(); + public static final SimpleRegistry REGISTRY = SimpleRegistry.create(); public static final Heater PASSIVE_HEATER = (level, pos, state) -> BlockHelper.isNotUnheated(state) ? PASSIVE_HEAT : NO_HEAT; @@ -44,7 +44,7 @@ public class BoilerHeaters { return PASSIVE_HEAT; }); - REGISTRY.registerProvider(AttachedRegistry.Provider.forBlockTag(AllBlockTags.PASSIVE_BOILER_HEATERS.tag, PASSIVE_HEATER)); + REGISTRY.registerProvider(SimpleRegistry.Provider.forBlockTag(AllBlockTags.PASSIVE_BOILER_HEATERS.tag, PASSIVE_HEATER)); } @FunctionalInterface diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java index ae936100f4..ae0fb6180a 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java @@ -9,7 +9,7 @@ import java.util.Map; import javax.annotation.Nullable; import com.simibubi.create.Create; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.simibubi.create.compat.Mods; import com.simibubi.create.content.redstone.displayLink.source.ComputerDisplaySource; import com.simibubi.create.content.redstone.displayLink.source.DeathCounterDisplaySource; @@ -38,11 +38,11 @@ import net.minecraftforge.registries.ForgeRegistries; public class AllDisplayBehaviours { public static final Map GATHERER_BEHAVIOURS = new HashMap<>(); - private static final AttachedRegistry> SOURCES_BY_BLOCK = AttachedRegistry.create(); - private static final AttachedRegistry, List> SOURCES_BY_BLOCK_ENTITY = AttachedRegistry.create(); + private static final SimpleRegistry> SOURCES_BY_BLOCK = SimpleRegistry.create(); + private static final SimpleRegistry, List> SOURCES_BY_BLOCK_ENTITY = SimpleRegistry.create(); - private static final AttachedRegistry TARGETS_BY_BLOCK = AttachedRegistry.create(); - private static final AttachedRegistry, DisplayTarget> TARGETS_BY_BLOCK_ENTITY = AttachedRegistry.create(); + private static final SimpleRegistry TARGETS_BY_BLOCK = SimpleRegistry.create(); + private static final SimpleRegistry, DisplayTarget> TARGETS_BY_BLOCK_ENTITY = SimpleRegistry.create(); public static DisplayBehaviour register(ResourceLocation id, DisplayBehaviour behaviour) { behaviour.id = id; diff --git a/src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java b/src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java index e34465a66c..125d11bdaa 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java +++ b/src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java @@ -5,7 +5,7 @@ import java.util.function.Function; import java.util.function.UnaryOperator; import com.simibubi.create.Create; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import com.simibubi.create.compat.Mods; import com.simibubi.create.compat.betterend.BetterEndPortalCompat; import com.simibubi.create.content.contraptions.glue.SuperGlueEntity; @@ -49,7 +49,7 @@ public class AllPortalTracks { /** * Registry mapping portal blocks to their respective {@link PortalTrackProvider}s. */ - public static final AttachedRegistry REGISTRY = AttachedRegistry.create(); + public static final SimpleRegistry REGISTRY = SimpleRegistry.create(); /** * Registers a portal track integration for a given block identified by its {@link ResourceLocation}, if it exists. diff --git a/src/main/java/com/simibubi/create/foundation/item/TooltipModifier.java b/src/main/java/com/simibubi/create/foundation/item/TooltipModifier.java index 9cccf8a794..d0d4bf7283 100644 --- a/src/main/java/com/simibubi/create/foundation/item/TooltipModifier.java +++ b/src/main/java/com/simibubi/create/foundation/item/TooltipModifier.java @@ -2,7 +2,7 @@ package com.simibubi.create.foundation.item; import org.jetbrains.annotations.Nullable; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import net.minecraft.world.item.Item; @@ -10,7 +10,7 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; @FunctionalInterface public interface TooltipModifier { - AttachedRegistry REGISTRY = AttachedRegistry.create(); + SimpleRegistry REGISTRY = SimpleRegistry.create(); TooltipModifier EMPTY = new TooltipModifier() { @Override diff --git a/src/main/java/com/simibubi/create/impl/contraption/storage/MountedStorageTypeRegistryImpl.java b/src/main/java/com/simibubi/create/impl/contraption/storage/MountedStorageTypeRegistryImpl.java index 5ec14e6094..63321fd0e8 100644 --- a/src/main/java/com/simibubi/create/impl/contraption/storage/MountedStorageTypeRegistryImpl.java +++ b/src/main/java/com/simibubi/create/impl/contraption/storage/MountedStorageTypeRegistryImpl.java @@ -10,7 +10,7 @@ import com.simibubi.create.AllTags; import com.simibubi.create.api.contraption.storage.MountedStorageTypeRegistries; import com.simibubi.create.api.contraption.storage.fluid.MountedFluidStorageType; import com.simibubi.create.api.contraption.storage.item.MountedItemStorageType; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import net.minecraft.Util; import net.minecraft.world.level.block.Block; @@ -26,12 +26,12 @@ import net.minecraftforge.registries.RegistryBuilder; @ApiStatus.Internal @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class MountedStorageTypeRegistryImpl { - public static final AttachedRegistry> ITEM_STORAGES = Util.make(() -> { - AttachedRegistry> registry = AttachedRegistry.create(); + public static final SimpleRegistry> ITEM_STORAGES = Util.make(() -> { + SimpleRegistry> registry = SimpleRegistry.create(); registry.registerProvider(ItemFallbackProvider.INSTANCE); return registry; }); - public static final AttachedRegistry> FLUID_STORAGES = AttachedRegistry.create(); + public static final SimpleRegistry> FLUID_STORAGES = SimpleRegistry.create(); private static IForgeRegistry> itemsRegistry; private static IForgeRegistry> fluidsRegistry; @@ -58,7 +58,7 @@ public class MountedStorageTypeRegistryImpl { ); } - private enum ItemFallbackProvider implements AttachedRegistry.Provider> { + private enum ItemFallbackProvider implements SimpleRegistry.Provider> { INSTANCE; @Override @@ -70,7 +70,7 @@ public class MountedStorageTypeRegistryImpl { } @Override - public void onRegister(AttachedRegistry> registry) { + public void onRegister(SimpleRegistry> registry) { MinecraftForge.EVENT_BUS.addListener((TagsUpdatedEvent event) -> { if (event.shouldUpdateStaticData()) { registry.invalidateProvider(this); diff --git a/src/main/java/com/simibubi/create/impl/registry/AttachedRegistryImpl.java b/src/main/java/com/simibubi/create/impl/registry/SimpleRegistryImpl.java similarity index 95% rename from src/main/java/com/simibubi/create/impl/registry/AttachedRegistryImpl.java rename to src/main/java/com/simibubi/create/impl/registry/SimpleRegistryImpl.java index 2f5cdd4e90..7b3dad1a80 100644 --- a/src/main/java/com/simibubi/create/impl/registry/AttachedRegistryImpl.java +++ b/src/main/java/com/simibubi/create/impl/registry/SimpleRegistryImpl.java @@ -10,10 +10,10 @@ import java.util.Set; import org.jetbrains.annotations.Nullable; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; // methods are synchronized since registrations can happen during parallel mod loading -public class AttachedRegistryImpl implements AttachedRegistry { +public class SimpleRegistryImpl implements SimpleRegistry { private static final Object nullMarker = new Object(); private final Map registrations = new IdentityHashMap<>(); diff --git a/src/main/java/com/simibubi/create/impl/registry/TagProviderImpl.java b/src/main/java/com/simibubi/create/impl/registry/TagProviderImpl.java index 876490fc32..c802552254 100644 --- a/src/main/java/com/simibubi/create/impl/registry/TagProviderImpl.java +++ b/src/main/java/com/simibubi/create/impl/registry/TagProviderImpl.java @@ -4,7 +4,7 @@ import java.util.function.Function; import org.jetbrains.annotations.Nullable; -import com.simibubi.create.api.registry.AttachedRegistry; +import com.simibubi.create.api.registry.SimpleRegistry; import net.minecraft.core.Holder; import net.minecraft.tags.TagKey; @@ -12,7 +12,7 @@ import net.minecraft.tags.TagKey; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TagsUpdatedEvent; -public class TagProviderImpl implements AttachedRegistry.Provider { +public class TagProviderImpl implements SimpleRegistry.Provider { private final TagKey tag; private final Function> holderGetter; private final V value; @@ -31,7 +31,7 @@ public class TagProviderImpl implements AttachedRegistry.Provider { } @Override - public void onRegister(AttachedRegistry registry) { + public void onRegister(SimpleRegistry registry) { MinecraftForge.EVENT_BUS.addListener((TagsUpdatedEvent event) -> { if (event.shouldUpdateStaticData()) { registry.invalidateProvider(this);