fixes, changes and more

build.gradle

@@ -71,18 +71,26 @@ repositories {
             }
         }
     }
+    flatDir {
+        dirs 'libs'
+    }
+
 }
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+
+
     annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
 
-    implementation fg.deobf("curse.maven:markdownmanual-502485:4873115")
+    runtimeOnly fileTree(dir: 'libs', include: '*.jar')
-    implementation fg.deobf("curse.maven:architectury-api-419699:5137938")
+    runtimeOnly fg.deobf("curse.maven:architectury-api-419699:3669448")
-    implementation fg.deobf("curse.maven:libre-computers-1163239:6126363")
+    implementation fg.deobf("curse.maven:markdownmanual-502485:3738124")
+    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:9.7.0.180")
 
-    runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.3.0.4")
+//    implementation fg.deobf("curse.maven:libre-computers-1163239:6137004")
-}
+
+    }
 
 System.setProperty("line.separator", "\n")
 

gradle.properties

@@ -3,18 +3,8 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-forge_version=47.2.32
+forge_version=40.0.40
 
 semver=1.1.1
 
 # curse_project_id=1037738
-
-pr_version=4.19.0-beta+3
-ccl_version=4.4.0.+
-cbm_version=3.3.0.+
-
-debug_embeddium=false
-
-debug_embeddium_plus_plus=false
-
-debug_oculus=false

minecraft.gradle

@@ -1,4 +1,4 @@
 ext {
-    minecraft_version = '1.20.1'
+    minecraft_version = '1.18.2'
     minecraft_sdk = 'forge'
 }

src/main/java/com/therealm18studios/lc/LibreComponents.java

@@ -1,25 +0,0 @@
-package com.therealm18studios.lc;
-
-import com.therealm18studios.lc.common.item.ItemGroup;
-import com.therealm18studios.lc.common.item.Items;
-import com.therealm18studios.lc.manual.Manuals;
-import li.cil.oc2.common.ConfigManager;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-
-@Mod("librecomponents")
-public final class LibreComponents {
-
-    public static String MOD_ID = "librecomponents";
-
-    public LibreComponents() {
-
-        ConfigManager.initialize();
-
-        Items.initialize();
-        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> Manuals::initialize);
-        ItemGroup.TAB_REGISTER.register(FMLJavaModLoadingContext.get().getModEventBus());
-    }
-}

src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java

@@ -1,40 +0,0 @@
-package com.therealm18studios.lc.common.item;
-
-import com.therealm18studios.lc.LibreComponents;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.RegistryObject;
-
-public final class ItemGroup {
-    public static final DeferredRegister<CreativeModeTab> TAB_REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, LibreComponents.MOD_ID);
-
-    @SuppressWarnings("unused")
-    public static final RegistryObject<CreativeModeTab> COMMON_TAB = TAB_REGISTER.register("common", () -> CreativeModeTab.builder()
-        // Set name of tab to display
-        .title(Component.translatable("item_group." + LibreComponents.MOD_ID + ".common"))
-        // Set icon of creative tab
-        .icon(() -> new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()))
-        // Add default items to tab
-        .displayItems((params, output) -> {
-            // Items
-            output.accept(Items.MEMORY_SMALL.get());
-            output.accept(Items.MEMORY_MEDIUM.get());
-            output.accept(Items.MEMORY_LARGE.get());
-            output.accept(Items.MEMORY_EXTRA_LARGE.get());
-            output.accept(Items.HARD_DRIVE_SMALL.get());
-            output.accept(Items.HARD_DRIVE_MEDIUM.get());
-            output.accept(Items.HARD_DRIVE_LARGE.get());
-            output.accept(Items.HARD_DRIVE_EXTRA_LARGE.get());
-            output.accept(Items.CPU_TIER_1.get());
-            output.accept(Items.CPU_TIER_2.get());
-            output.accept(Items.CPU_TIER_3.get());
-            output.accept(Items.CPU_TIER_4.get());
-            output.accept(Items.FLOPPY.get());
-            output.accept(Items.FLOPPY_MODERN.get());
-        })
-        .build()
-    );
-}

src/main/java/com/therealm18studios/lc/data/DataGenerators.java

@@ -1,19 +0,0 @@
-package com.therealm18studios.lc.data;
-
-import net.minecraft.data.DataGenerator;
-import net.minecraft.data.DataProvider;
-import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.data.event.GatherDataEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
-public final class DataGenerators {
-    @SubscribeEvent
-    public static void gatherData(final GatherDataEvent event) {
-        final DataGenerator generator = event.getGenerator();
-        final ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
-
-        generator.addProvider(event.includeClient(), new ModItemModelProvider(generator.getPackOutput(), existingFileHelper));
-    }
-}

src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java

@@ -1,55 +0,0 @@
-package com.therealm18studios.lc.data;
-
-import com.therealm18studios.lc.LibreComponents;
-import li.cil.oc2.common.entity.Entities;
-import com.therealm18studios.lc.common.item.Items;
-import net.minecraft.data.PackOutput;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.Item;
-import net.minecraftforge.client.model.generators.ItemModelBuilder;
-import net.minecraftforge.client.model.generators.ItemModelProvider;
-import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.registries.RegistryObject;
-
-public final class ModItemModelProvider extends ItemModelProvider {
-    public ModItemModelProvider(final PackOutput output, final ExistingFileHelper existingFileHelper) {
-        super(output, LibreComponents.MOD_ID, existingFileHelper);
-    }
-
-    @Override
-    protected void registerModels() {
-        simple(Items.MEMORY_SMALL);
-        simple(Items.MEMORY_MEDIUM);
-        simple(Items.MEMORY_LARGE);
-        simple(Items.MEMORY_EXTRA_LARGE);
-        simple(Items.CPU_TIER_1);
-        simple(Items.CPU_TIER_2);
-        simple(Items.CPU_TIER_3);
-        simple(Items.CPU_TIER_4);
-        simple(Items.HARD_DRIVE_SMALL, "item/hard_drive_base")
-            .texture("layer1", "item/hard_drive_tint");
-        simple(Items.HARD_DRIVE_MEDIUM, "item/hard_drive_base")
-            .texture("layer1", "item/hard_drive_tint");
-        simple(Items.HARD_DRIVE_LARGE, "item/hard_drive_base")
-            .texture("layer1", "item/hard_drive_tint");
-        simple(Items.HARD_DRIVE_EXTRA_LARGE, "item/hard_drive_base")
-            .texture("layer1", "item/hard_drive_tint");
-        simple(Items.FLOPPY, "item/floppy_base")
-            .texture("layer1", "item/floppy_tint");
-        simple(Items.FLOPPY_MODERN, "item/floppy_base")
-            .texture("layer1", "item/floppy_tint");
-
-        withExistingParent(Entities.ROBOT.getId().getPath(), "template_shulker_box");
-    }
-
-    private <T extends Item> void simple(final RegistryObject<T> item) {
-        simple(item, "item/" + item.getId().getPath());
-    }
-
-    private <T extends Item> ItemModelBuilder simple(final RegistryObject<T> item, final String texturePath) {
-        return singleTexture(item.getId().getPath(),
-            new ResourceLocation("item/generated"),
-            "layer0",
-            new ResourceLocation(LibreComponents.MOD_ID, texturePath));
-    }
-}

src/main/java/com/therealm18studios/oc2rc/OC2RC.java

@@ -0,0 +1,22 @@
+package com.therealm18studios.oc2rc;
+
+import com.therealm18studios.oc2rc.common.item.Items;
+import com.therealm18studios.oc2rc.manual.Manuals;
+import li.cil.oc2r.common.ConfigManager;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod("oc2rc")
+public final class OC2RC {
+
+    public static String MOD_ID = "oc2rc";
+
+    public OC2RC() {
+
+        ConfigManager.initialize();
+
+        Items.initialize();
+        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> Manuals::initialize);
+    }
+}

src/main/java/com/therealm18studios/oc2rc/common/item/Items.java

@@ -1,10 +1,10 @@
-package com.therealm18studios.lc.common.item;
+package com.therealm18studios.oc2rc.common.item;
 
-import com.therealm18studios.lc.LibreComponents;
+import com.therealm18studios.oc2rc.OC2RC;
-import li.cil.oc2.common.item.MemoryItem;
+import li.cil.oc2r.common.item.MemoryItem;
-import li.cil.oc2.common.item.HardDriveItem;
+import li.cil.oc2r.common.item.HardDriveItem;
-import li.cil.oc2.common.item.CPUItem;
+//import li.cil.oc2r.common.item.CPUItem;
-import li.cil.oc2.common.item.FloppyItem;
+import li.cil.oc2r.common.item.FloppyItem;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -17,7 +17,7 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 
 public final class Items {
-    private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, LibreComponents.MOD_ID);
+    private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OC2RC.MOD_ID);
 
     ///////////////////////////////////////////////////////////////////
 
@@ -39,14 +39,14 @@ public final class Items {
     public static final RegistryObject<HardDriveItem> HARD_DRIVE_EXTRA_LARGE = register("hard_drive_extra_large", () ->
         new HardDriveItem(268435456, DyeColor.YELLOW));
 
-    public static final RegistryObject<CPUItem> CPU_TIER_1 = register("cpu_tier_1", () ->
+//    public static final RegistryObject<CPUItem> CPU_TIER_1 = register("cpu_tier_1", () ->
-        new CPUItem(250000000));
+//        new CPUItem(250000000));
-    public static final RegistryObject<CPUItem> CPU_TIER_2 = register("cpu_tier_2", () ->
+//    public static final RegistryObject<CPUItem> CPU_TIER_2 = register("cpu_tier_2", () ->
-        new CPUItem(300000000));
+//        new CPUItem(300000000));
-    public static final RegistryObject<CPUItem> CPU_TIER_3 = register("cpu_tier_3", () ->
+//    public static final RegistryObject<CPUItem> CPU_TIER_3 = register("cpu_tier_3", () ->
-        new CPUItem(350000000));
+//        new CPUItem(350000000));
-    public static final RegistryObject<CPUItem> CPU_TIER_4 = register("cpu_tier_4", () ->
+//    public static final RegistryObject<CPUItem> CPU_TIER_4 = register("cpu_tier_4", () ->
-        new CPUItem(400000000));
+//        new CPUItem(400000000));
 
     public static final RegistryObject<FloppyItem> FLOPPY = register("floppy", () ->
         new FloppyItem(2949120));

src/main/java/com/therealm18studios/oc2rc/manual/Manuals.java

@@ -1,12 +1,12 @@
-package com.therealm18studios.lc.manual;
+package com.therealm18studios.oc2rc.manual;
 
-import com.therealm18studios.lc.LibreComponents;
+import com.therealm18studios.oc2rc.OC2RC;
-import com.therealm18studios.lc.common.item.Items;
+import com.therealm18studios.oc2rc.common.item.Items;
 import li.cil.manual.api.ManualModel;
 import li.cil.manual.api.Tab;
 import li.cil.manual.api.prefab.tab.ItemStackTab;
 import li.cil.manual.api.util.Constants;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -23,9 +23,9 @@ public final class Manuals {
     public static void initialize() {
         TABS.register(FMLJavaModLoadingContext.get().getModEventBus());
 
-        TABS.register("librecomponents", () -> new ItemStackTab(
+        TABS.register("oc2rc", () -> new ItemStackTab(
-            ManualModel.LANGUAGE_KEY + "/librecomponents/index.md",
+            ManualModel.LANGUAGE_KEY + "/oc2rc/index.md",
-            Component.translatable("manual." + LibreComponents.MOD_ID + ".items"),
+            new TranslatableComponent("manual." + OC2RC.MOD_ID + ".items"),
             new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get())));
     }
 }

src/main/resources/META-INF/mods.toml

@@ -1,31 +1,31 @@
 modLoader = "javafml"
-loaderVersion = "[47,)"
+loaderVersion = "[40,)"
 issueTrackerURL = "https://github.com/Libre-Computers/LibreComponents/issues"
 license = "MIT"
 
 [[mods]]
-modId = "librecomponents"
+modId = "oc2rc"
 version = "${file.jarVersion}"
-displayName = "Libre Components"
+displayName = "OC2R Components"
 authors = "The Realm 18 Studios"
 description = '''
-Libre Drives all the extra components you need.
+OC2RC Devices for all the extra components you need.
 '''
 
-[[dependencies.librecomponents]]
+[[dependencies.oc2rc]]
 modId = "forge"
 mandatory = true
-versionRange = "[40.1.68,)"
+versionRange = "[40.0.40,)"
 ordering = "NONE"
 side = "BOTH"
-[[dependencies.librecomponents]]
+[[dependencies.oc2rc]]
 modId = "minecraft"
 mandatory = true
-versionRange = "1.20.1"
+versionRange = "1.18.2"
 ordering = "NONE"
 side = "BOTH"
-[[dependencies.librecomponents]]
+[[dependencies.oc2rc]]
-modId = "oc2"
+modId = "oc2r"
 mandatory = false
 versionRange = "[1.1.0,)"
 side = "BOTH"

src/main/resources/assets/librecomponents/lang/en_us.json

@@ -1,18 +0,0 @@
-{
-  "item_group.librecomponents.common": "Libre Components",
-
-  "manual.librecomponents.items": "Libre Components",
-
-  "item.librecomponents.cpu_tier_1": "CPU Tier 5",
-  "item.librecomponents.cpu_tier_1.desc": "Processes computer instructions.",
-  "item.librecomponents.cpu_tier_2": "CPU Tier 6",
-  "item.librecomponents.cpu_tier_2.desc": "Processes computer instructions.",
-  "item.librecomponents.cpu_tier_3": "CPU Tier 7",
-  "item.librecomponents.cpu_tier_3.desc": "Processes computer instructions.",
-  "item.librecomponents.cpu_tier_4": "CPU Tier 8",
-  "item.librecomponents.cpu_tier_4.desc": "Processes computer instructions.",
-  "item.librecomponents.floppy": "Floppy Disk",
-  "item.librecomponents.floppy.desc": "Portable storage used to transfer data between Computers.",
-  "item.librecomponents.floppy_modern": "Modern Floppy Disk",
-  "item.librecomponents.floppy_modern.desc": "Newer version of portable storage used to transfer data between Computers."
-}

src/main/resources/assets/librecomponents/lang/ru_ru.json

@@ -1,20 +0,0 @@
-{
-  "item_group.librecomponents.common": "Libre Components",
-
-  "item.librecomponents.cpu_tier_1": "CPU уровень 5",
-  "item.librecomponents.cpu_tier_1.desc": "Processes computer instructions.",
-  "item.librecomponents.cpu_tier_2": "CPU уровень 6",
-  "item.librecomponents.cpu_tier_2.desc": "Processes computer instructions.",
-  "item.librecomponents.cpu_tier_3": "CPU уровень 7",
-  "item.librecomponents.cpu_tier_3.desc": "Processes computer instructions.",
-  "item.librecomponents.cpu_tier_4": "CPU уровень 8",
-  "item.librecomponents.cpu_tier_4.desc": "Processes computer instructions.",
-  "item.librecomponents.floppy": "Дискета",
-  "item.librecomponents.floppy.desc": "Съемный накопитель для переноса данных между компьютерами.",
-  "item.librecomponents.floppy_modern": "Современная дискета",
-  "item.librecomponents.floppy_modern.desc": "Новая версия портативного хранилища, используемого для передачи данных между компьютерами.",
-  "item.librecomponents.hard_drive": "Жесткий диск",
-  "item.librecomponents.hard_drive.desc": "Накопитель для операционных систем и данных.",
-  "item.librecomponents.memory": "Память",
-  "item.librecomponents.memory.desc": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах."
-}

src/main/resources/assets/librecomponents/lang/zh_cn.json

@@ -1,20 +0,0 @@
-{
-  "item_group.librecomponents.common": "Libre Components",
-
-  "item.librecomponents.cpu_tier_1": "CPU Tier 5",
-  "item.librecomponents.cpu_tier_1.desc": "Processes computer instructions.",
-  "item.librecomponents.cpu_tier_2": "CPU Tier 6",
-  "item.librecomponents.cpu_tier_2.desc": "Processes computer instructions.",
-  "item.librecomponents.cpu_tier_3": "CPU Tier 7",
-  "item.librecomponents.cpu_tier_3.desc": "Processes computer instructions.",
-  "item.librecomponents.cpu_tier_4": "CPU Tier 8",
-  "item.librecomponents.cpu_tier_4.desc": "Processes computer instructions.",
-  "item.librecomponents.floppy": "软盘",
-  "item.librecomponents.floppy.desc": "Portable storage used to transfer data between Computers.",
-  "item.librecomponents.floppy_modern": "现代软盘",
-  "item.librecomponents.floppy_modern.desc": "用于在计算机之间传输数据的较新版本的便携式存储。",
-  "item.librecomponents.hard_drive": "硬盘",
-  "item.librecomponents.hard_drive.desc": "Mass storage for operating systems and data.",
-  "item.librecomponents.memory": "内存条",
-  "item.librecomponents.memory.desc": "Random Access Memory (RAM) used in Computers and Robots."
-}

src/main/resources/assets/librecomponents/models/item/floppy.json

@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "librecomponents:item/floppy_base",
-    "layer1": "librecomponents:item/floppy_normal"
-  }
-}

src/main/resources/assets/librecomponents/models/item/floppy_modern.json

@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "librecomponents:item/floppy_base",
-    "layer1": "librecomponents:item/floppy_modern"
-  }
-}

src/main/resources/assets/librecomponents/models/item/hard_drive_extra_large.json

@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "librecomponents:item/hard_drive_base",
-    "layer1": "librecomponents:item/hard_drive_extra_large"
-  }
-}

src/main/resources/assets/librecomponents/models/item/hard_drive_large.json

@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "librecomponents:item/hard_drive_base",
-    "layer1": "librecomponents:item/hard_drive_large"
-  }
-}

src/main/resources/assets/librecomponents/models/item/hard_drive_medium.json

@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "librecomponents:item/hard_drive_base",
-    "layer1": "librecomponents:item/hard_drive_medium"
-  }
-}

src/main/resources/assets/librecomponents/models/item/hard_drive_small.json

@@ -1,7 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "librecomponents:item/hard_drive_base",
-    "layer1": "librecomponents:item/hard_drive_small"
-  }
-}

src/main/resources/assets/librecomponents/models/item/memory_extra_large.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "librecomponents:item/memory_extra_large"
-  }
-}

src/main/resources/assets/librecomponents/models/item/memory_large.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "librecomponents:item/memory_large"
-  }
-}

src/main/resources/assets/librecomponents/models/item/memory_medium.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "librecomponents:item/memory_medium"
-  }
-}

src/main/resources/assets/librecomponents/models/item/memory_small.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "librecomponents:item/memory_small"
-  }
-}

src/main/resources/assets/oc2rc/lang/en_us.json

@@ -0,0 +1,18 @@
+{
+  "item_group.oc2rc.common": "Libre Components",
+
+  "manual.oc2rc.items": "Libre Components",
+
+  "item.oc2rc.cpu_tier_1": "CPU Tier 5",
+  "item.oc2rc.cpu_tier_1.desc": "Processes computer instructions.",
+  "item.oc2rc.cpu_tier_2": "CPU Tier 6",
+  "item.oc2rc.cpu_tier_2.desc": "Processes computer instructions.",
+  "item.oc2rc.cpu_tier_3": "CPU Tier 7",
+  "item.oc2rc.cpu_tier_3.desc": "Processes computer instructions.",
+  "item.oc2rc.cpu_tier_4": "CPU Tier 8",
+  "item.oc2rc.cpu_tier_4.desc": "Processes computer instructions.",
+  "item.oc2rc.floppy": "Floppy Disk",
+  "item.oc2rc.floppy.desc": "Portable storage used to transfer data between Computers.",
+  "item.oc2rc.floppy_modern": "Modern Floppy Disk",
+  "item.oc2rc.floppy_modern.desc": "Newer version of portable storage used to transfer data between Computers."
+}

src/main/resources/assets/oc2rc/lang/ru_ru.json

@@ -0,0 +1,20 @@
+{
+  "item_group.oc2rc.common": "Libre Components",
+
+  "item.oc2rc.cpu_tier_1": "CPU уровень 5",
+  "item.oc2rc.cpu_tier_1.desc": "Processes computer instructions.",
+  "item.oc2rc.cpu_tier_2": "CPU уровень 6",
+  "item.oc2rc.cpu_tier_2.desc": "Processes computer instructions.",
+  "item.oc2rc.cpu_tier_3": "CPU уровень 7",
+  "item.oc2rc.cpu_tier_3.desc": "Processes computer instructions.",
+  "item.oc2rc.cpu_tier_4": "CPU уровень 8",
+  "item.oc2rc.cpu_tier_4.desc": "Processes computer instructions.",
+  "item.oc2rc.floppy": "Дискета",
+  "item.oc2rc.floppy.desc": "Съемный накопитель для переноса данных между компьютерами.",
+  "item.oc2rc.floppy_modern": "Современная дискета",
+  "item.oc2rc.floppy_modern.desc": "Новая версия портативного хранилища, используемого для передачи данных между компьютерами.",
+  "item.oc2rc.hard_drive": "Жесткий диск",
+  "item.oc2rc.hard_drive.desc": "Накопитель для операционных систем и данных.",
+  "item.oc2rc.memory": "Память",
+  "item.oc2rc.memory.desc": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах."
+}

src/main/resources/assets/oc2rc/lang/zh_cn.json

@@ -0,0 +1,20 @@
+{
+  "item_group.oc2rc.common": "Libre Components",
+
+  "item.oc2rc.cpu_tier_1": "CPU Tier 5",
+  "item.oc2rc.cpu_tier_1.desc": "Processes computer instructions.",
+  "item.oc2rc.cpu_tier_2": "CPU Tier 6",
+  "item.oc2rc.cpu_tier_2.desc": "Processes computer instructions.",
+  "item.oc2rc.cpu_tier_3": "CPU Tier 7",
+  "item.oc2rc.cpu_tier_3.desc": "Processes computer instructions.",
+  "item.oc2rc.cpu_tier_4": "CPU Tier 8",
+  "item.oc2rc.cpu_tier_4.desc": "Processes computer instructions.",
+  "item.oc2rc.floppy": "软盘",
+  "item.oc2rc.floppy.desc": "Portable storage used to transfer data between Computers.",
+  "item.oc2rc.floppy_modern": "现代软盘",
+  "item.oc2rc.floppy_modern.desc": "用于在计算机之间传输数据的较新版本的便携式存储。",
+  "item.oc2rc.hard_drive": "硬盘",
+  "item.oc2rc.hard_drive.desc": "Mass storage for operating systems and data.",
+  "item.oc2rc.memory": "内存条",
+  "item.oc2rc.memory.desc": "Random Access Memory (RAM) used in Computers and Robots."
+}

src/main/resources/assets/oc2rc/models/item/cpu_tier_1.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "librecomponents:item/cpu_tier_1"
+    "layer0": "oc2rc:item/cpu_tier_1"
   }
 }

src/main/resources/assets/oc2rc/models/item/cpu_tier_2.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "librecomponents:item/cpu_tier_2"
+    "layer0": "oc2rc:item/cpu_tier_2"
   }
 }

src/main/resources/assets/oc2rc/models/item/cpu_tier_3.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "librecomponents:item/cpu_tier_3"
+    "layer0": "oc2rc:item/cpu_tier_3"
   }
 }

src/main/resources/assets/oc2rc/models/item/cpu_tier_4.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "librecomponents:item/cpu_tier_4"
+    "layer0": "oc2rc:item/cpu_tier_4"
   }
 }

src/main/resources/assets/oc2rc/models/item/floppy.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2rc:item/floppy_base",
+    "layer1": "oc2rc:item/floppy_normal"
+  }
+}

src/main/resources/assets/oc2rc/models/item/floppy_modern.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2rc:item/floppy_base",
+    "layer1": "oc2rc:item/floppy_modern"
+  }
+}

src/main/resources/assets/oc2rc/models/item/hard_drive_extra_large.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2rc:item/hard_drive_base",
+    "layer1": "oc2rc:item/hard_drive_extra_large"
+  }
+}

src/main/resources/assets/oc2rc/models/item/hard_drive_large.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2rc:item/hard_drive_base",
+    "layer1": "oc2rc:item/hard_drive_large"
+  }
+}

src/main/resources/assets/oc2rc/models/item/hard_drive_medium.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2rc:item/hard_drive_base",
+    "layer1": "oc2rc:item/hard_drive_medium"
+  }
+}

src/main/resources/assets/oc2rc/models/item/hard_drive_small.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2rc:item/hard_drive_base",
+    "layer1": "oc2rc:item/hard_drive_small"
+  }
+}

src/main/resources/assets/oc2rc/models/item/memory_extra_large.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2rc:item/memory_extra_large"
+  }
+}

src/main/resources/assets/oc2rc/models/item/memory_large.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2rc:item/memory_large"
+  }
+}

src/main/resources/assets/oc2rc/models/item/memory_medium.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2rc:item/memory_medium"
+  }
+}

src/main/resources/assets/oc2rc/models/item/memory_small.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2rc:item/memory_small"
+  }
+}

src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_extra_large.json

@@ -1,47 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "librecomponents:hard_drive_extra_large"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "oc2:computer"
-            ]
-          }
-        ]
-      }
-    },
-    "has_robot": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "oc2:robot"
-            ]
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "librecomponents:hard_drive_extra_large"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_robot",
-      "has_the_recipe"
-    ]
-  ]
-}

src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_medium.json

@@ -1,47 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "librecomponents:hard_drive_medium"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "oc2:computer"
-            ]
-          }
-        ]
-      }
-    },
-    "has_robot": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "oc2:robot"
-            ]
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "librecomponents:hard_drive_medium"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_robot",
-      "has_the_recipe"
-    ]
-  ]
-}

src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_extra_large.json

@@ -1,47 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "librecomponents:memory_extra_large"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "oc2:computer"
-            ]
-          }
-        ]
-      }
-    },
-    "has_robot": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "oc2:robot"
-            ]
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "librecomponents:memory_extra_large"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_robot",
-      "has_the_recipe"
-    ]
-  ]
-}

src/main/resources/data/librecomponents/recipes/cpu_tier_1.json

@@ -1,28 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "III",
-    "TST",
-    "CBC"
-  ],
-  "key": {
-    "I": {
-      "tag": "forge:ingots/iron"
-    },
-    "C": {
-      "tag": "forge:ingots/copper"
-    },
-    "T": {
-      "item": "oc2:cpu_tier_4"
-    },
-    "S": {
-      "item": "oc2:silicon_wafer"
-    },
-    "B": {
-      "item": "oc2:circuit_board"
-    }
-  },
-  "result": {
-    "item": "librecomponents:cpu_tier_1"
-  }
-}

src/main/resources/data/librecomponents/recipes/cpu_tier_2.json

@@ -1,28 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "GGG",
-    "TST",
-    "CBC"
-  ],
-  "key": {
-    "G": {
-      "tag": "forge:ingots/gold"
-    },
-    "C": {
-      "tag": "forge:ingots/copper"
-    },
-    "T": {
-      "item": "librecomponents:cpu_tier_1"
-    },
-    "S": {
-      "item": "oc2:silicon_wafer"
-    },
-    "B": {
-      "item": "oc2:circuit_board"
-    }
-  },
-  "result": {
-    "item": "librecomponents:cpu_tier_2"
-  }
-}

src/main/resources/data/librecomponents/recipes/cpu_tier_3.json

@@ -1,28 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "DDD",
-    "TST",
-    "GBG"
-  ],
-  "key": {
-    "D": {
-      "tag": "forge:gems/diamond"
-    },
-    "G": {
-      "tag": "forge:ingots/gold"
-    },
-    "T": {
-      "item": "librecomponents:cpu_tier_2"
-    },
-    "S": {
-      "item": "oc2:silicon_wafer"
-    },
-    "B": {
-      "item": "oc2:circuit_board"
-    }
-  },
-  "result": {
-    "item": "librecomponents:cpu_tier_3"
-  }
-}

src/main/resources/data/librecomponents/recipes/cpu_tier_4.json

@@ -1,28 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "NNN",
-    "TST",
-    "GBG"
-  ],
-  "key": {
-    "N": {
-      "tag": "forge:gems/emerald"
-    },
-    "G": {
-      "tag": "forge:ingots/gold"
-    },
-    "T": {
-      "item": "librecomponents:cpu_tier_3"
-    },
-    "S": {
-      "item": "oc2:silicon_wafer"
-    },
-    "B": {
-      "item": "oc2:circuit_board"
-    }
-  },
-  "result": {
-    "item": "librecomponents:cpu_tier_4"
-  }
-}

src/main/resources/data/oc2/tags/items/devices/cpu.json

@@ -1,9 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    "librecomponents:cpu_tier_1",
-    "librecomponents:cpu_tier_2",
-    "librecomponents:cpu_tier_3",
-    "librecomponents:cpu_tier_4"
-  ]
-}

src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/floppy.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "librecomponents:floppy"
+      "oc2rc:floppy"
     ]
   },
   "criteria": {
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "oc2:disk_drive"
+              "oc2r:disk_drive"
             ]
           }
         ]
@@ -21,7 +21,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "librecomponents:floppy"
+        "recipe": "oc2rc:floppy"
       }
     }
   },

src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/floppy_modern.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "librecomponents:floppy_modern"
+      "oc2rc:floppy_modern"
     ]
   },
   "criteria": {
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "oc2:disk_drive"
+              "oc2r:disk_drive"
             ]
           }
         ]
@@ -21,7 +21,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "librecomponents:floppy_modern"
+        "recipe": "oc2rc:floppy_modern"
       }
     }
   },

src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_extra_large.json

@@ -0,0 +1,47 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "oc2rc:hard_drive_extra_large"
+    ]
+  },
+  "criteria": {
+    "has_computer": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "oc2r:computer"
+            ]
+          }
+        ]
+      }
+    },
+    "has_robot": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "oc2r:robot"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "oc2rc:hard_drive_extra_large"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_computer",
+      "has_robot",
+      "has_the_recipe"
+    ]
+  ]
+}

src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_large.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "librecomponents:hard_drive_large"
+      "oc2rc:hard_drive_large"
     ]
   },
   "criteria": {
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "oc2:computer"
+              "oc2r:computer"
             ]
           }
         ]
@@ -24,7 +24,7 @@
         "items": [
           {
             "items": [
-              "oc2:robot"
+              "oc2r:robot"
             ]
           }
         ]
@@ -33,7 +33,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "librecomponents:hard_drive_large"
+        "recipe": "oc2rc:hard_drive_large"
       }
     }
   },

src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_medium.json

@@ -0,0 +1,47 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "oc2rc:hard_drive_medium"
+    ]
+  },
+  "criteria": {
+    "has_computer": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "oc2r:computer"
+            ]
+          }
+        ]
+      }
+    },
+    "has_robot": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "oc2r:robot"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "oc2rc:hard_drive_medium"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_computer",
+      "has_robot",
+      "has_the_recipe"
+    ]
+  ]
+}

src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_small.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "librecomponents:hard_drive_small"
+      "oc2rc:hard_drive_small"
     ]
   },
   "criteria": {
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "oc2:computer"
+              "oc2r:computer"
             ]
           }
         ]
@@ -24,7 +24,7 @@
         "items": [
           {
             "items": [
-              "oc2:robot"
+              "oc2r:robot"
             ]
           }
         ]
@@ -33,7 +33,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "librecomponents:hard_drive_small"
+        "recipe": "oc2rc:hard_drive_small"
       }
     }
   },

src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_extra_large.json

@@ -0,0 +1,47 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "oc2rc:memory_extra_large"
+    ]
+  },
+  "criteria": {
+    "has_computer": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "oc2r:computer"
+            ]
+          }
+        ]
+      }
+    },
+    "has_robot": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "oc2r:robot"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "oc2rc:memory_extra_large"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_computer",
+      "has_robot",
+      "has_the_recipe"
+    ]
+  ]
+}

src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_large.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "librecomponents:memory_large"
+      "oc2rc:memory_large"
     ]
   },
   "criteria": {
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "oc2:computer"
+              "oc2r:computer"
             ]
           }
         ]
@@ -24,7 +24,7 @@
         "items": [
           {
             "items": [
-              "oc2:robot"
+              "oc2r:robot"
             ]
           }
         ]
@@ -33,7 +33,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "librecomponents:memory_large"
+        "recipe": "oc2rc:memory_large"
       }
     }
   },

src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_medium.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "librecomponents:memory_medium"
+      "oc2rc:memory_medium"
     ]
   },
   "criteria": {
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "oc2:computer"
+              "oc2r:computer"
             ]
           }
         ]
@@ -24,7 +24,7 @@
         "items": [
           {
             "items": [
-              "oc2:robot"
+              "oc2r:robot"
             ]
           }
         ]
@@ -33,7 +33,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "librecomponents:memory_medium"
+        "recipe": "oc2rc:memory_medium"
       }
     }
   },

src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_small.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "librecomponents:memory_small"
+      "oc2rc:memory_small"
     ]
   },
   "criteria": {
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "oc2:computer"
+              "oc2r:computer"
             ]
           }
         ]
@@ -24,7 +24,7 @@
         "items": [
           {
             "items": [
-              "oc2:robot"
+              "oc2r:robot"
             ]
           }
         ]
@@ -33,7 +33,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "librecomponents:memory_small"
+        "recipe": "oc2rc:memory_small"
       }
     }
   },

src/main/resources/data/oc2rc/recipes/floppy.json

@@ -6,19 +6,19 @@
   ],
   "key": {
     "I": {
-      "item": "oc2:floppy_modern"
+      "item": "oc2r:floppy"
     },
     "T": {
-      "item": "oc2:transistor"
+      "item": "oc2r:transistor"
     },
     "Q": {
       "tag": "forge:gems/quartz"
     },
     "B": {
-      "item": "oc2:circuit_board"
+      "item": "oc2r:circuit_board"
     }
   },
   "result": {
-    "item": "librecomponents:floppy"
+    "item": "oc2rc:floppy"
   }
 }

src/main/resources/data/oc2rc/recipes/floppy_modern.json

@@ -7,19 +7,19 @@
   ],
   "key": {
     "I": {
-      "item": "librecomponents:floppy"
+      "item": "oc2rc:floppy"
     },
     "T": {
-      "item": "oc2:transistor"
+      "item": "oc2r:transistor"
     },
     "Q": {
       "tag": "forge:gems/quartz"
     },
     "B": {
-      "item": "oc2:circuit_board"
+      "item": "oc2r:circuit_board"
     }
   },
   "result": {
-    "item": "librecomponents:floppy_modern"
+    "item": "oc2rc:floppy_modern"
   }
 }

src/main/resources/data/oc2rc/recipes/hard_drive_extra_large.json

@@ -7,19 +7,19 @@
   ],
   "key": {
     "D": {
-      "item": "librecomponents:hard_drive_large"
+      "item": "oc2rc:hard_drive_large"
     },
     "T": {
-      "item": "oc2:transistor"
+      "item": "oc2r:transistor"
     },
     "B": {
-      "item": "oc2:circuit_board"
+      "item": "oc2r:circuit_board"
     },
     "E": {
       "tag": "forge:gems/emerald"
     }
   },
   "result": {
-    "item": "librecomponents:hard_drive_extra_large"
+    "item": "oc2rc:hard_drive_extra_large"
   }
 }

src/main/resources/data/oc2rc/recipes/hard_drive_large.json

@@ -6,19 +6,19 @@
   ],
   "key": {
     "D": {
-      "item": "librecomponents:hard_drive_medium"
+      "item": "oc2rc:hard_drive_medium"
     },
     "T": {
-      "item": "oc2:transistor"
+      "item": "oc2r:transistor"
     },
     "B": {
-      "item": "oc2:circuit_board"
+      "item": "oc2r:circuit_board"
     },
     "E": {
       "tag": "forge:gems/emerald"
     }
   },
   "result": {
-    "item": "librecomponents:hard_drive_large"
+    "item": "oc2rc:hard_drive_large"
   }
 }

src/main/resources/data/oc2rc/recipes/hard_drive_medium.json

@@ -6,19 +6,19 @@
   ],
   "key": {
     "G": {
-      "item": "librecomponents:hard_drive_small"
+      "item": "oc2rc:hard_drive_small"
     },
     "T": {
-      "item": "oc2:transistor"
+      "item": "oc2r:transistor"
     },
     "B": {
-      "item": "oc2:circuit_board"
+      "item": "oc2r:circuit_board"
     },
     "E": {
       "tag": "forge:gems/emerald"
     }
   },
   "result": {
-    "item": "librecomponents:hard_drive_medium"
+    "item": "oc2rc:hard_drive_medium"
   }
 }

src/main/resources/data/oc2rc/recipes/hard_drive_small.json

@@ -2,23 +2,24 @@
   "type": "minecraft:crafting_shaped",
   "pattern": [
     "ITI",
-    "EBE"
+    "EBE",
+    "ITI"
   ],
   "key": {
     "I": {
-      "item": "oc2:hard_drive_extra_large"
+      "item": "oc2r:hard_drive_large"
     },
     "T": {
-      "item": "oc2:transistor"
+      "item": "oc2r:transistor"
     },
     "B": {
-      "item": "oc2:circuit_board"
+      "item": "oc2r:circuit_board"
     },
     "E": {
       "tag": "forge:gems/emerald"
     }
   },
   "result": {
-    "item": "librecomponents:hard_drive_small"
+    "item": "oc2rc:hard_drive_small"
   }
 }

src/main/resources/data/oc2rc/recipes/memory_extra_large.json

@@ -7,19 +7,19 @@
   ],
   "key": {
     "D": {
-      "item": "librecomponents:memory_large"
+      "item": "oc2rc:memory_large"
     },
     "T": {
-      "item": "oc2:transistor"
+      "item": "oc2r:transistor"
     },
     "B": {
-      "item": "oc2:circuit_board"
+      "item": "oc2r:circuit_board"
     },
     "E": {
       "tag": "forge:gems/emerald"
     }
   },
   "result": {
-    "item": "librecomponents:memory_extra_large"
+    "item": "oc2rc:memory_extra_large"
   }
 }

src/main/resources/data/oc2rc/recipes/memory_large.json

@@ -6,16 +6,16 @@
   ],
   "key": {
     "D": {
-      "item": "librecomponents:memory_medium"
+      "item": "oc2rc:memory_medium"
     },
     "T": {
-      "item": "oc2:transistor"
+      "item": "oc2r:transistor"
     },
     "B": {
-      "item": "oc2:circuit_board"
+      "item": "oc2r:circuit_board"
     }
   },
   "result": {
-    "item": "librecomponents:memory_large"
+    "item": "oc2rc:memory_large"
   }
 }

src/main/resources/data/oc2rc/recipes/memory_medium.json

@@ -6,16 +6,16 @@
   ],
   "key": {
     "G": {
-      "item": "librecomponents:memory_small"
+      "item": "oc2rc:memory_small"
     },
     "T": {
-      "item": "oc2:transistor"
+      "item": "oc2r:transistor"
     },
     "B": {
-      "item": "oc2:circuit_board"
+      "item": "oc2r:circuit_board"
     }
   },
   "result": {
-    "item": "librecomponents:memory_medium"
+    "item": "oc2rc:memory_medium"
   }
 }

src/main/resources/data/oc2rc/recipes/memory_small.json

@@ -2,20 +2,21 @@
   "type": "minecraft:crafting_shaped",
   "pattern": [
     "ITI",
-    " B "
+    " B ",
+    "ITI"
   ],
   "key": {
     "I": {
-      "item": "oc2:memory_extra_large"
+      "item": "oc2r:memory_large"
     },
     "T": {
-      "item": "oc2:transistor"
+      "item": "oc2r:transistor"
     },
     "B": {
-      "item": "oc2:circuit_board"
+      "item": "oc2r:circuit_board"
     }
   },
   "result": {
-    "item": "librecomponents:memory_small"
+    "item": "oc2rc:memory_small"
   }
 }

src/main/resources/data/oc2rc/tags/items/device_needs_reboot.json

@@ -8,10 +8,6 @@
     "librecomponents:memory_small",
     "librecomponents:memory_medium",
     "librecomponents:memory_large",
-    "librecomponents:memory_extra_large",
+    "librecomponents:memory_extra_large"
-    "librecomponents:cpu_tier_1",
-    "librecomponents:cpu_tier_2",
-    "librecomponents:cpu_tier_3",
-    "librecomponents:cpu_tier_4"
   ]
 }