From 0564f590eff5207fe375f2f986e1e3faaff618b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 17 May 2021 20:07:43 +0200 Subject: [PATCH] Renamed file import export card. --- src/main/java/li/cil/oc2/common/Config.java | 8 ++++---- ...e.java => FileImportExportCardItemDevice.java} | 14 +++++++------- .../oc2/common/bus/device/provider/Providers.java | 2 +- ...> FileImportExportCardItemDeviceProvider.java} | 12 ++++++------ src/main/java/li/cil/oc2/common/item/Items.java | 2 +- .../message/ClientCanceledImportFileMessage.java | 4 ++-- .../network/message/ImportedFileMessage.java | 4 ++-- .../message/RequestImportedFileMessage.java | 5 ++--- .../message/ServerCanceledImportFileMessage.java | 4 ++-- .../li/cil/oc2/data/ModItemModelProvider.java | 2 +- .../java/li/cil/oc2/data/ModItemTagsProvider.java | 2 +- src/main/resources/assets/oc2/lang/en_us.json | 2 ++ ...ace_card.json => file_import_export_card.json} | 2 +- ...rface_card.png => file_import_export_card.png} | Bin ....mcmeta => file_import_export_card.png.mcmeta} | 0 .../data/oc2/file_systems/scripts/bin/export.lua | 14 +++++++------- .../data/oc2/file_systems/scripts/bin/import.lua | 12 ++++++------ .../data/oc2/tags/items/devices/card.json | 2 +- 18 files changed, 46 insertions(+), 45 deletions(-) rename src/main/java/li/cil/oc2/common/bus/device/item/{CloudInterfaceCardItemDevice.java => FileImportExportCardItemDevice.java} (94%) rename src/main/java/li/cil/oc2/common/bus/device/provider/item/{CloudInterfaceCardItemDeviceProvider.java => FileImportExportCardItemDeviceProvider.java} (82%) rename src/main/resources/assets/oc2/models/item/{cloud_interface_card.json => file_import_export_card.json} (56%) rename src/main/resources/assets/oc2/textures/item/{cloud_interface_card.png => file_import_export_card.png} (100%) rename src/main/resources/assets/oc2/textures/item/{cloud_interface_card.png.mcmeta => file_import_export_card.png.mcmeta} (100%) diff --git a/src/main/java/li/cil/oc2/common/Config.java b/src/main/java/li/cil/oc2/common/Config.java index 6a03dc23..78ec7c85 100644 --- a/src/main/java/li/cil/oc2/common/Config.java +++ b/src/main/java/li/cil/oc2/common/Config.java @@ -39,7 +39,7 @@ public final class Config { public static double hardDriveEnergyPerMegabytePerTick = 1; public static int redstoneInterfaceCardEnergyPerTick = 1; public static int networkInterfaceEnergyPerTick = 1; - public static int cloudInterfaceCardEnergyPerTick = 1; + public static int fileImportExportCardEnergyPerTick = 1; public static int blockOperationsModuleEnergyPerTick = 2; public static int inventoryOperationsModuleEnergyPerTick = 1; @@ -97,7 +97,7 @@ public final class Config { hardDriveEnergyPerMegabytePerTick = COMMON_INSTANCE.hardDriveEnergyPerMegabytePerTick.get(); redstoneInterfaceCardEnergyPerTick = COMMON_INSTANCE.redstoneInterfaceCardEnergyPerTick.get(); networkInterfaceEnergyPerTick = COMMON_INSTANCE.networkInterfaceEnergyPerTick.get(); - cloudInterfaceCardEnergyPerTick = COMMON_INSTANCE.cloudInterfaceCardEnergyPerTick.get(); + fileImportExportCardEnergyPerTick = COMMON_INSTANCE.fileImportExportCardEnergyPerTick.get(); blockOperationsModuleEnergyPerTick = COMMON_INSTANCE.blockOperationsModuleEnergyPerTick.get(); inventoryOperationsModuleEnergyPerTick = COMMON_INSTANCE.inventoryOperationsModuleEnergyPerTick.get(); @@ -129,7 +129,7 @@ public final class Config { public final ForgeConfigSpec.DoubleValue hardDriveEnergyPerMegabytePerTick; public final ForgeConfigSpec.IntValue redstoneInterfaceCardEnergyPerTick; public final ForgeConfigSpec.IntValue networkInterfaceEnergyPerTick; - public final ForgeConfigSpec.IntValue cloudInterfaceCardEnergyPerTick; + public final ForgeConfigSpec.IntValue fileImportExportCardEnergyPerTick; public final ForgeConfigSpec.IntValue blockOperationsModuleEnergyPerTick; public final ForgeConfigSpec.IntValue inventoryOperationsModuleEnergyPerTick; @@ -168,7 +168,7 @@ public final class Config { hardDriveEnergyPerMegabytePerTick = builder.defineInRange("hardDriveEnergyPerMegabytePerTick", Config.hardDriveEnergyPerMegabytePerTick, 0, Integer.MAX_VALUE); redstoneInterfaceCardEnergyPerTick = builder.defineInRange("redstoneInterfaceCardEnergyPerTick", Config.redstoneInterfaceCardEnergyPerTick, 0, Integer.MAX_VALUE); networkInterfaceEnergyPerTick = builder.defineInRange("networkInterfaceEnergyPerTick", Config.networkInterfaceEnergyPerTick, 0, Integer.MAX_VALUE); - cloudInterfaceCardEnergyPerTick = builder.defineInRange("cloudInterfaceCardEnergyPerTick", Config.cloudInterfaceCardEnergyPerTick, 0, Integer.MAX_VALUE); + fileImportExportCardEnergyPerTick = builder.defineInRange("fileImportExportCardEnergyPerTick", Config.fileImportExportCardEnergyPerTick, 0, Integer.MAX_VALUE); blockOperationsModuleEnergyPerTick = builder.defineInRange("blockOperationsModuleEnergyPerTick", Config.blockOperationsModuleEnergyPerTick, 0, Integer.MAX_VALUE); inventoryOperationsModuleEnergyPerTick = builder.defineInRange("inventoryOperationsModuleEnergyPerTick", Config.inventoryOperationsModuleEnergyPerTick, 0, Integer.MAX_VALUE); } diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/CloudInterfaceCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/FileImportExportCardItemDevice.java similarity index 94% rename from src/main/java/li/cil/oc2/common/bus/device/item/CloudInterfaceCardItemDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/item/FileImportExportCardItemDevice.java index edd10106..2be20931 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/item/CloudInterfaceCardItemDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/item/FileImportExportCardItemDevice.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Set; import java.util.WeakHashMap; -public final class CloudInterfaceCardItemDevice extends IdentityProxy implements RPCDevice, DocumentedDevice, ItemDevice { +public final class FileImportExportCardItemDevice extends IdentityProxy implements RPCDevice, DocumentedDevice, ItemDevice { public static final int MAX_TRANSFERRED_FILE_SIZE = 512 * 1024; private static final String BEGIN_EXPORT_FILE = "beginExportFile"; @@ -70,9 +70,9 @@ public final class CloudInterfaceCardItemDevice extends IdentityProxy private static final class ImportFileRequest { public final Set PendingPlayers = Collections.newSetFromMap(new WeakHashMap<>()); - public final WeakReference Device; + public final WeakReference Device; - private ImportFileRequest(final CloudInterfaceCardItemDevice device) { + private ImportFileRequest(final FileImportExportCardItemDevice device) { Device = new WeakReference<>(device); } } @@ -91,10 +91,10 @@ public final class CloudInterfaceCardItemDevice extends IdentityProxy /////////////////////////////////////////////////////////////////// - public CloudInterfaceCardItemDevice(final ItemStack identity, final TerminalUserProvider userProvider) { + public FileImportExportCardItemDevice(final ItemStack identity, final TerminalUserProvider userProvider) { super(identity); this.userProvider = userProvider; - this.device = new ObjectDevice(this, "cloud"); + this.device = new ObjectDevice(this, "file_import_export"); } /////////////////////////////////////////////////////////////////// @@ -102,7 +102,7 @@ public final class CloudInterfaceCardItemDevice extends IdentityProxy public static void setImportedFile(final int id, final byte[] data) { final ImportFileRequest request = importingDevices.remove(id); if (request != null) { - final CloudInterfaceCardItemDevice device = request.Device.get(); + final FileImportExportCardItemDevice device = request.Device.get(); if (device != null) { device.importedFile = new ImportedFile(data); final ServerCanceledImportFileMessage message = new ServerCanceledImportFileMessage(id); @@ -119,7 +119,7 @@ public final class CloudInterfaceCardItemDevice extends IdentityProxy request.PendingPlayers.remove(player); if (request.PendingPlayers.isEmpty()) { importingDevices.remove(id); - final CloudInterfaceCardItemDevice device = request.Device.get(); + final FileImportExportCardItemDevice device = request.Device.get(); if (device != null) { device.state = State.IMPORT_CANCELED; } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java b/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java index e1db3bf7..2c14f16d 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java @@ -40,7 +40,7 @@ public final class Providers { ITEM_DEVICE_PROVIDERS.register("flash_memory_custom", FlashMemoryWithExternalDataItemDeviceProvider::new); ITEM_DEVICE_PROVIDERS.register("redstone_interface_card", RedstoneInterfaceCardItemDeviceProvider::new); ITEM_DEVICE_PROVIDERS.register("network_interface_card", NetworkInterfaceCardItemDeviceProvider::new); - ITEM_DEVICE_PROVIDERS.register("cloud_interface_card", CloudInterfaceCardItemDeviceProvider::new); + ITEM_DEVICE_PROVIDERS.register("file_import_export", FileImportExportCardItemDeviceProvider::new); ITEM_DEVICE_PROVIDERS.register("inventory_operations_module", InventoryOperationsModuleDeviceProvider::new); ITEM_DEVICE_PROVIDERS.register("block_operations_module", BlockOperationsModuleDeviceProvider::new); diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/CloudInterfaceCardItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java similarity index 82% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/CloudInterfaceCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java index 86df0383..7dab94ed 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/CloudInterfaceCardItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java @@ -4,7 +4,7 @@ import li.cil.oc2.api.bus.device.ItemDevice; import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; import li.cil.oc2.api.capabilities.TerminalUserProvider; import li.cil.oc2.common.Config; -import li.cil.oc2.common.bus.device.item.CloudInterfaceCardItemDevice; +import li.cil.oc2.common.bus.device.item.FileImportExportCardItemDevice; import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; import li.cil.oc2.common.capabilities.Capabilities; import li.cil.oc2.common.item.Items; @@ -12,9 +12,9 @@ import net.minecraftforge.common.util.LazyOptional; import java.util.Optional; -public final class CloudInterfaceCardItemDeviceProvider extends AbstractItemDeviceProvider { - public CloudInterfaceCardItemDeviceProvider() { - super(Items.CLOUD_INTERFACE_CARD); +public final class FileImportExportCardItemDeviceProvider extends AbstractItemDeviceProvider { + public FileImportExportCardItemDeviceProvider() { + super(Items.FILE_IMPORT_EXPORT_CARD); } /////////////////////////////////////////////////////////////////// @@ -27,12 +27,12 @@ public final class CloudInterfaceCardItemDeviceProvider extends AbstractItemDevi @Override protected Optional getItemDevice(final ItemDeviceQuery query) { return getTerminalUserProvider(query).map(provider -> - new CloudInterfaceCardItemDevice(query.getItemStack(), provider)); + new FileImportExportCardItemDevice(query.getItemStack(), provider)); } @Override protected int getItemDeviceEnergyConsumption(final ItemDeviceQuery query) { - return Config.cloudInterfaceCardEnergyPerTick; + return Config.fileImportExportCardEnergyPerTick; } /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/item/Items.java b/src/main/java/li/cil/oc2/common/item/Items.java index c1de71de..db97ca9b 100644 --- a/src/main/java/li/cil/oc2/common/item/Items.java +++ b/src/main/java/li/cil/oc2/common/item/Items.java @@ -64,7 +64,7 @@ public final class Items { public static final RegistryObject REDSTONE_INTERFACE_CARD = register("redstone_interface_card"); public static final RegistryObject NETWORK_INTERFACE_CARD = register("network_interface_card"); - public static final RegistryObject CLOUD_INTERFACE_CARD = register("cloud_interface_card"); + public static final RegistryObject FILE_IMPORT_EXPORT_CARD = register("file_import_export_card"); public static final RegistryObject INVENTORY_OPERATIONS_MODULE = register("inventory_operations_module"); public static final RegistryObject BLOCK_OPERATIONS_MODULE = register("block_operations_module", BlockOperationsModule::new); diff --git a/src/main/java/li/cil/oc2/common/network/message/ClientCanceledImportFileMessage.java b/src/main/java/li/cil/oc2/common/network/message/ClientCanceledImportFileMessage.java index 3a688d4a..90ec24b8 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ClientCanceledImportFileMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/ClientCanceledImportFileMessage.java @@ -1,6 +1,6 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.bus.device.item.CloudInterfaceCardItemDevice; +import li.cil.oc2.common.bus.device.item.FileImportExportCardItemDevice; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; @@ -22,7 +22,7 @@ public final class ClientCanceledImportFileMessage { /////////////////////////////////////////////////////////////////// public static boolean handleMessage(final ClientCanceledImportFileMessage message, final Supplier context) { - CloudInterfaceCardItemDevice.cancelImport(context.get().getSender(), message.id); + FileImportExportCardItemDevice.cancelImport(context.get().getSender(), message.id); return true; } diff --git a/src/main/java/li/cil/oc2/common/network/message/ImportedFileMessage.java b/src/main/java/li/cil/oc2/common/network/message/ImportedFileMessage.java index bb346274..34ab50e2 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ImportedFileMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/ImportedFileMessage.java @@ -1,6 +1,6 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.bus.device.item.CloudInterfaceCardItemDevice; +import li.cil.oc2.common.bus.device.item.FileImportExportCardItemDevice; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; @@ -24,7 +24,7 @@ public final class ImportedFileMessage { /////////////////////////////////////////////////////////////////// public static boolean handleMessage(final ImportedFileMessage message, final Supplier context) { - CloudInterfaceCardItemDevice.setImportedFile(message.id, message.data); + FileImportExportCardItemDevice.setImportedFile(message.id, message.data); return true; } diff --git a/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java b/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java index 0ff9ce58..83bfd9b2 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java @@ -1,12 +1,11 @@ package li.cil.oc2.common.network.message; import li.cil.oc2.client.gui.FileChooserScreen; -import li.cil.oc2.common.bus.device.item.CloudInterfaceCardItemDevice; +import li.cil.oc2.common.bus.device.item.FileImportExportCardItemDevice; import li.cil.oc2.common.network.Network; import net.minecraft.client.Minecraft; import net.minecraft.network.PacketBuffer; import net.minecraft.util.text.Color; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.fml.network.NetworkEvent; import org.apache.logging.log4j.LogManager; @@ -43,7 +42,7 @@ public final class RequestImportedFileMessage { public void onFileSelected(final Path path) { try { final byte[] data = Files.readAllBytes(path); - if (data.length > CloudInterfaceCardItemDevice.MAX_TRANSFERRED_FILE_SIZE) { + if (data.length > FileImportExportCardItemDevice.MAX_TRANSFERRED_FILE_SIZE) { Network.INSTANCE.sendToServer(new ClientCanceledImportFileMessage(message.id)); Minecraft.getInstance().player.sendStatusMessage(FILE_TOO_LARGE_TEXT .modifyStyle(s -> s.setColor(Color.fromInt(0xFFA0A0))), false); diff --git a/src/main/java/li/cil/oc2/common/network/message/ServerCanceledImportFileMessage.java b/src/main/java/li/cil/oc2/common/network/message/ServerCanceledImportFileMessage.java index 48024a11..c99243d0 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ServerCanceledImportFileMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/ServerCanceledImportFileMessage.java @@ -1,6 +1,6 @@ package li.cil.oc2.common.network.message; -import li.cil.oc2.common.bus.device.item.CloudInterfaceCardItemDevice; +import li.cil.oc2.common.bus.device.item.FileImportExportCardItemDevice; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; @@ -22,7 +22,7 @@ public final class ServerCanceledImportFileMessage { /////////////////////////////////////////////////////////////////// public static boolean handleMessage(final ServerCanceledImportFileMessage message, final Supplier context) { - CloudInterfaceCardItemDevice.cancelImport(context.get().getSender(), message.id); + FileImportExportCardItemDevice.cancelImport(context.get().getSender(), message.id); return true; } diff --git a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java index 2ac00912..3a1a3a57 100644 --- a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java +++ b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java @@ -40,7 +40,7 @@ public final class ModItemModelProvider extends ItemModelProvider { simple(Items.REDSTONE_INTERFACE_CARD, "item/redstone_interface_card"); simple(Items.NETWORK_INTERFACE_CARD, "item/network_interface_card"); - simple(Items.CLOUD_INTERFACE_CARD, "item/cloud_interface_card"); + simple(Items.FILE_IMPORT_EXPORT_CARD, "item/file_import_export_card"); simple(Items.INVENTORY_OPERATIONS_MODULE, "item/inventory_operations_module"); simple(Items.BLOCK_OPERATIONS_MODULE, "item/block_operations_module"); diff --git a/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java b/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java index e534e3c9..4b1fbebc 100644 --- a/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java +++ b/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java @@ -54,7 +54,7 @@ public final class ModItemTagsProvider extends ItemTagsProvider { getOrCreateBuilder(DEVICES_CARD).add( Items.REDSTONE_INTERFACE_CARD.get(), Items.NETWORK_INTERFACE_CARD.get(), - Items.CLOUD_INTERFACE_CARD.get() + Items.FILE_IMPORT_EXPORT_CARD.get() ); getOrCreateBuilder(DEVICES_ROBOT_MODULE).add( Items.INVENTORY_OPERATIONS_MODULE.get(), diff --git a/src/main/resources/assets/oc2/lang/en_us.json b/src/main/resources/assets/oc2/lang/en_us.json index 39895c75..75e4c6d6 100644 --- a/src/main/resources/assets/oc2/lang/en_us.json +++ b/src/main/resources/assets/oc2/lang/en_us.json @@ -26,6 +26,8 @@ "item.oc2.flash_memory": "Flash Memory", "item.oc2.redstone_interface_card": "Redstone Interface Card", "item.oc2.network_interface_card": "Network Interface Card", + "item.oc2.file_import_export_card": "File Import/Export Card", + "item.oc2.file_import_export_card.desc": "Provides an API to import and export files into and out of a virtual computer from and into your real file system.", "item.oc2.robot": "Robot", "item.oc2.robot.desc": "Use a Scrench or compatible wrench to add and remove components.", "item.oc2.inventory_operations_module": "Inventory Operations Module", diff --git a/src/main/resources/assets/oc2/models/item/cloud_interface_card.json b/src/main/resources/assets/oc2/models/item/file_import_export_card.json similarity index 56% rename from src/main/resources/assets/oc2/models/item/cloud_interface_card.json rename to src/main/resources/assets/oc2/models/item/file_import_export_card.json index 2450b182..9584f85b 100644 --- a/src/main/resources/assets/oc2/models/item/cloud_interface_card.json +++ b/src/main/resources/assets/oc2/models/item/file_import_export_card.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2:item/cloud_interface_card" + "layer0": "oc2:item/file_import_export_card" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/textures/item/cloud_interface_card.png b/src/main/resources/assets/oc2/textures/item/file_import_export_card.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/cloud_interface_card.png rename to src/main/resources/assets/oc2/textures/item/file_import_export_card.png diff --git a/src/main/resources/assets/oc2/textures/item/cloud_interface_card.png.mcmeta b/src/main/resources/assets/oc2/textures/item/file_import_export_card.png.mcmeta similarity index 100% rename from src/main/resources/assets/oc2/textures/item/cloud_interface_card.png.mcmeta rename to src/main/resources/assets/oc2/textures/item/file_import_export_card.png.mcmeta diff --git a/src/main/resources/data/oc2/file_systems/scripts/bin/export.lua b/src/main/resources/data/oc2/file_systems/scripts/bin/export.lua index 431e2be4..bbca7cc8 100644 --- a/src/main/resources/data/oc2/file_systems/scripts/bin/export.lua +++ b/src/main/resources/data/oc2/file_systems/scripts/bin/export.lua @@ -1,10 +1,10 @@ #!/usr/bin/lua local devices = require("devices") -local cloud = devices:find("cloud") +local device = devices:find("file_import_export") -if not cloud then - print("A cloud interface card is required for this functionality.") +if not device then + print("A File Import/Export Card is required for this functionality.") return end @@ -15,23 +15,23 @@ end local file = assert(io.open(arg[1], "rb")) -cloud:reset() +device:reset() io.write("Exporting") -cloud:beginExportFile(arg[1]) +device:beginExportFile(arg[1]) while true do local str = file:read(512) if not str then break end if #str > 0 then local bytes = {string.byte(str, 1, -1)} - cloud:writeExportFile(bytes) + device:writeExportFile(bytes) io.write(".") end end io.write("\n") -cloud:finishExportFile() +device:finishExportFile() assert(file:close()) diff --git a/src/main/resources/data/oc2/file_systems/scripts/bin/import.lua b/src/main/resources/data/oc2/file_systems/scripts/bin/import.lua index 6dbbc6b4..5a7da083 100644 --- a/src/main/resources/data/oc2/file_systems/scripts/bin/import.lua +++ b/src/main/resources/data/oc2/file_systems/scripts/bin/import.lua @@ -1,10 +1,10 @@ #!/usr/bin/lua local devices = require("devices") -local cloud = devices:find("cloud") +local device = devices:find("file_import_export") -if not cloud then - print("A cloud interface card is required for this functionality.") +if not device then + print("A File Import/Export Card is required for this functionality.") return end @@ -15,14 +15,14 @@ end local file = assert(io.open(arg[1], "wb")) -cloud:reset() +device:reset() io.write("Importing") -cloud:beginImportFile() +device:beginImportFile() while true do - local bytes = cloud:readImportFile() + local bytes = device:readImportFile() if not bytes then break end if #bytes > 0 then file:write(string.char(table.unpack(bytes))) diff --git a/src/main/resources/data/oc2/tags/items/devices/card.json b/src/main/resources/data/oc2/tags/items/devices/card.json index 49559e37..6a8fad30 100644 --- a/src/main/resources/data/oc2/tags/items/devices/card.json +++ b/src/main/resources/data/oc2/tags/items/devices/card.json @@ -3,6 +3,6 @@ "values": [ "oc2:redstone_interface_card", "oc2:network_interface_card", - "oc2:cloud_interface_card" + "oc2:file_import_export_card" ] } \ No newline at end of file