diff --git a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheralBuilder.java b/projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheralBuilder.java index 71102b19e..67d2ea8c4 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheralBuilder.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheralBuilder.java @@ -8,9 +8,9 @@ import dan200.computercraft.api.peripheral.PeripheralType; import dan200.computercraft.core.methods.NamedMethod; import dan200.computercraft.core.methods.PeripheralMethod; -import dan200.computercraft.shared.platform.RegistryWrappers; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +40,7 @@ IPeripheral toPeripheral(BlockEntity blockEntity, Direction side) { String type; if (name == null) { - var typeId = RegistryWrappers.BLOCK_ENTITY_TYPES.tryGetKey(blockEntity.getType()); + var typeId = BlockEntityType.getKey(blockEntity.getType()); if (typeId == null) { LOG.error( "Block entity {} for {} was not registered. Skipping creating a generic peripheral for it.", diff --git a/projects/common/src/main/java/dan200/computercraft/shared/platform/RegistryWrappers.java b/projects/common/src/main/java/dan200/computercraft/shared/platform/RegistryWrappers.java index 989183f59..76c289a5b 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/platform/RegistryWrappers.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/platform/RegistryWrappers.java @@ -38,8 +38,6 @@ public final class RegistryWrappers { public interface RegistryWrapper extends IdMap { ResourceLocation getKey(T object); - @Nullable ResourceLocation tryGetKey(T object); - T get(ResourceLocation location); @Nullable diff --git a/projects/common/src/test/java/dan200/computercraft/TestPlatformHelper.java b/projects/common/src/test/java/dan200/computercraft/TestPlatformHelper.java index 9ecdaa8e0..815c716db 100644 --- a/projects/common/src/test/java/dan200/computercraft/TestPlatformHelper.java +++ b/projects/common/src/test/java/dan200/computercraft/TestPlatformHelper.java @@ -268,12 +268,6 @@ public ResourceLocation getKey(T object) { return key; } - @Nullable - @Override - public ResourceLocation tryGetKey(T object) { - return registry.getKey(object); - } - @Override public T get(ResourceLocation location) { var object = registry.get(location); diff --git a/projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java b/projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java index 7efb7806c..3ed6f52c0 100644 --- a/projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java +++ b/projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java @@ -337,12 +337,6 @@ public ResourceLocation getKey(T object) { return key; } - @Nullable - @Override - public ResourceLocation tryGetKey(T object) { - return registry.getKey(object); - } - @Override public T get(ResourceLocation location) { var object = registry.get(location); diff --git a/projects/forge/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java b/projects/forge/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java index 4e2eb27e9..63bc64304 100644 --- a/projects/forge/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java +++ b/projects/forge/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java @@ -360,12 +360,6 @@ public ResourceLocation getKey(T object) { return key; } - @Nullable - @Override - public ResourceLocation tryGetKey(T object) { - return registry.getKey(object); - } - @Override public T get(ResourceLocation location) { var object = registry.getValue(location);