diff --git a/src/main/java/com/simibubi/create/api/registry/SimpleRegistry.java b/src/main/java/com/simibubi/create/api/registry/SimpleRegistry.java index 09db5d84b1..9c35b1ae9f 100644 --- a/src/main/java/com/simibubi/create/api/registry/SimpleRegistry.java +++ b/src/main/java/com/simibubi/create/api/registry/SimpleRegistry.java @@ -2,6 +2,7 @@ package com.simibubi.create.api.registry; import java.util.function.Function; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import com.simibubi.create.impl.registry.SimpleRegistryImpl; @@ -11,11 +12,13 @@ import net.minecraft.core.Holder; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.StateHolder; /** * 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. */ +@ApiStatus.NonExtendable public interface SimpleRegistry { /** * Register an association between a key and a value. @@ -43,6 +46,12 @@ public interface SimpleRegistry { @Nullable V get(K object); + /** + * Shortcut for {@link #get(Object)} that accepts a StateHolder, such as BlockState or FluidState. + */ + @Nullable + V get(StateHolder state); + static SimpleRegistry create() { return new SimpleRegistryImpl<>(); } diff --git a/src/main/java/com/simibubi/create/foundation/mixin/accessor/StateHolderAccessor.java b/src/main/java/com/simibubi/create/foundation/mixin/accessor/StateHolderAccessor.java new file mode 100644 index 0000000000..390df8e9e9 --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/mixin/accessor/StateHolderAccessor.java @@ -0,0 +1,12 @@ +package com.simibubi.create.foundation.mixin.accessor; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import net.minecraft.world.level.block.state.StateHolder; + +@Mixin(StateHolder.class) +public interface StateHolderAccessor { + @Accessor + O getOwner(); +} diff --git a/src/main/java/com/simibubi/create/impl/registry/SimpleRegistryImpl.java b/src/main/java/com/simibubi/create/impl/registry/SimpleRegistryImpl.java index 660857a1f8..06dcb7f4d7 100644 --- a/src/main/java/com/simibubi/create/impl/registry/SimpleRegistryImpl.java +++ b/src/main/java/com/simibubi/create/impl/registry/SimpleRegistryImpl.java @@ -9,6 +9,9 @@ import java.util.Objects; import org.jetbrains.annotations.Nullable; import com.simibubi.create.api.registry.SimpleRegistry; +import com.simibubi.create.foundation.mixin.accessor.StateHolderAccessor; + +import net.minecraft.world.level.block.state.StateHolder; // methods are synchronized since registrations can happen during parallel mod loading public class SimpleRegistryImpl implements SimpleRegistry { @@ -74,6 +77,14 @@ public class SimpleRegistryImpl implements SimpleRegistry { return null; } + @Override + @Nullable + @SuppressWarnings("unchecked") + public synchronized V get(StateHolder state) { + K owner = ((StateHolderAccessor) state).getOwner(); + return this.get(owner); + } + @SuppressWarnings("unchecked") private static T nullMarker() { return (T) nullMarker;