diff --git a/src/main/java/dan200/computercraft/ComputerCraft.java b/src/main/java/dan200/computercraft/ComputerCraft.java index d31e1e41f..d510ab65b 100644 --- a/src/main/java/dan200/computercraft/ComputerCraft.java +++ b/src/main/java/dan200/computercraft/ComputerCraft.java @@ -90,8 +90,6 @@ public final class ComputerCraft public static boolean turtlesCanPush = true; public static EnumSet turtleDisabledActions = EnumSet.noneOf( TurtleAction.class ); - public static boolean genericPeripheral = false; - public static int computerTermWidth = 51; public static int computerTermHeight = 19; diff --git a/src/main/java/dan200/computercraft/shared/Config.java b/src/main/java/dan200/computercraft/shared/Config.java index f93bc5a0a..a39f513f6 100644 --- a/src/main/java/dan200/computercraft/shared/Config.java +++ b/src/main/java/dan200/computercraft/shared/Config.java @@ -82,8 +82,6 @@ public final class Config private static final ConfigValue monitorWidth; private static final ConfigValue monitorHeight; - private static final ConfigValue genericPeripheral; - private static final ConfigValue monitorRenderer; private static final ConfigValue monitorDistance; @@ -294,17 +292,6 @@ public final class Config builder.pop(); } - { - builder.comment( "Options for various experimental features. These are not guaranteed to be stable, and may change or be removed across versions." ); - builder.push( "experimental" ); - - genericPeripheral = builder - .comment( "Attempt to make any existing block (or tile entity) a peripheral.\n" + - "This provides peripheral methods for any inventory, fluid tank or energy storage block. It will" + - "_not_ provide methods which have an existing peripheral provider." ) - .define( "generic_peripherals", false ); - } - serverSpec = builder.build(); Builder clientBuilder = new Builder(); @@ -379,9 +366,6 @@ public final class Config ComputerCraft.monitorWidth = monitorWidth.get(); ComputerCraft.monitorHeight = monitorHeight.get(); - // Experimental - ComputerCraft.genericPeripheral = genericPeripheral.get(); - // Client ComputerCraft.monitorRenderer = monitorRenderer.get(); ComputerCraft.monitorDistanceSq = monitorDistance.get() * monitorDistance.get(); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheralProvider.java b/src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheralProvider.java index 09041c4f8..e0528afa6 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheralProvider.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheralProvider.java @@ -35,8 +35,6 @@ public class GenericPeripheralProvider @Nonnull public static LazyOptional getPeripheral( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side ) { - if( !ComputerCraft.genericPeripheral ) return LazyOptional.empty(); - TileEntity tile = world.getTileEntity( pos ); if( tile == null ) return LazyOptional.empty(); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java b/src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java index a2a39f599..7973fb107 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java @@ -26,9 +26,6 @@ import java.util.stream.Collectors; /** * Data providers for items. - * - * We guard using {@link ComputerCraft#genericPeripheral} in several places, as advanced functionality should not be - * exposed for {@code turtle.getItemDetail} when generic peripehrals are disabled. */ public class ItemData { @@ -73,8 +70,6 @@ public class ItemData data.put( "tags", DataHelpers.getTags( stack.getItem().getTags() ) ); - if( !ComputerCraft.genericPeripheral ) return data; - CompoundNBT tag = stack.getTag(); if( tag != null && tag.contains( "display", Constants.NBT.TAG_COMPOUND ) ) {