diff --git a/build.gradle b/build.gradle index 81e2a19..2f1a712 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ def getGitRef() { } version = "${semver}+${getGitRef()}" -group = "com.therealm18studios.librecomponents" +group = "com.therealm18studios.oc2rc" java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -71,15 +71,19 @@ repositories { } } } + flatDir { + dirs("libs") + } } dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" annotationProcessor "org.spongepowered:mixin:0.8.5:processor" + implementation fileTree(dir: 'libs', include: '*.jar') implementation fg.deobf("curse.maven:markdownmanual-502485:4873115") implementation fg.deobf("curse.maven:architectury-api-419699:5137938") - implementation fg.deobf("curse.maven:libre-computers-1163239:6126363") +// implementation fg.deobf("curse.maven:libre-computers-1163239:6126363") runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.3.0.4") } diff --git a/libs/oc2r-1.20.1-forge-1.3.1+unknown-all.jar b/libs/oc2r-1.20.1-forge-1.3.1+unknown-all.jar new file mode 100644 index 0000000..6690f09 Binary files /dev/null and b/libs/oc2r-1.20.1-forge-1.3.1+unknown-all.jar differ diff --git a/src/main/java/com/therealm18studios/lc/LibreComponents.java b/src/main/java/com/therealm18studios/oc2rc/OC2RC.java similarity index 54% rename from src/main/java/com/therealm18studios/lc/LibreComponents.java rename to src/main/java/com/therealm18studios/oc2rc/OC2RC.java index 2b8bd7b..4c9a740 100644 --- a/src/main/java/com/therealm18studios/lc/LibreComponents.java +++ b/src/main/java/com/therealm18studios/oc2rc/OC2RC.java @@ -1,20 +1,20 @@ -package com.therealm18studios.lc; +package com.therealm18studios.oc2rc; -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 com.therealm18studios.oc2rc.common.item.ItemGroup; +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; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -@Mod("librecomponents") -public final class LibreComponents { +@Mod("oc2rc") +public final class OC2RC { - public static String MOD_ID = "librecomponents"; + public static String MOD_ID = "oc2rc"; - public LibreComponents() { + public OC2RC() { ConfigManager.initialize(); diff --git a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java b/src/main/java/com/therealm18studios/oc2rc/common/item/ItemGroup.java similarity index 85% rename from src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java rename to src/main/java/com/therealm18studios/oc2rc/common/item/ItemGroup.java index c200f08..053c068 100644 --- a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java +++ b/src/main/java/com/therealm18studios/oc2rc/common/item/ItemGroup.java @@ -1,6 +1,6 @@ -package com.therealm18studios.lc.common.item; +package com.therealm18studios.oc2rc.common.item; -import com.therealm18studios.lc.LibreComponents; +import com.therealm18studios.oc2rc.OC2RC; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; @@ -9,12 +9,12 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; public final class ItemGroup { - public static final DeferredRegister TAB_REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, LibreComponents.MOD_ID); + public static final DeferredRegister TAB_REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, OC2RC.MOD_ID); @SuppressWarnings("unused") public static final RegistryObject COMMON_TAB = TAB_REGISTER.register("common", () -> CreativeModeTab.builder() // Set name of tab to display - .title(Component.translatable("item_group." + LibreComponents.MOD_ID + ".common")) + .title(Component.translatable("item_group." + OC2RC.MOD_ID + ".common")) // Set icon of creative tab .icon(() -> new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get())) // Add default items to tab diff --git a/src/main/java/com/therealm18studios/lc/common/item/Items.java b/src/main/java/com/therealm18studios/oc2rc/common/item/Items.java similarity index 90% rename from src/main/java/com/therealm18studios/lc/common/item/Items.java rename to src/main/java/com/therealm18studios/oc2rc/common/item/Items.java index 148083e..8bf7515 100644 --- a/src/main/java/com/therealm18studios/lc/common/item/Items.java +++ b/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 li.cil.oc2.common.item.MemoryItem; -import li.cil.oc2.common.item.HardDriveItem; -import li.cil.oc2.common.item.CPUItem; -import li.cil.oc2.common.item.FloppyItem; +import com.therealm18studios.oc2rc.OC2RC; +import li.cil.oc2r.common.item.MemoryItem; +import li.cil.oc2r.common.item.HardDriveItem; +import li.cil.oc2r.common.item.CPUItem; +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 ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, LibreComponents.MOD_ID); + private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OC2RC.MOD_ID); /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/com/therealm18studios/lc/manual/Manuals.java b/src/main/java/com/therealm18studios/oc2rc/manual/Manuals.java similarity index 71% rename from src/main/java/com/therealm18studios/lc/manual/Manuals.java rename to src/main/java/com/therealm18studios/oc2rc/manual/Manuals.java index 9111fea..fa388e4 100644 --- a/src/main/java/com/therealm18studios/lc/manual/Manuals.java +++ b/src/main/java/com/therealm18studios/oc2rc/manual/Manuals.java @@ -1,7 +1,7 @@ -package com.therealm18studios.lc.manual; +package com.therealm18studios.oc2rc.manual; -import com.therealm18studios.lc.LibreComponents; -import com.therealm18studios.lc.common.item.Items; +import com.therealm18studios.oc2rc.OC2RC; +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; @@ -23,9 +23,9 @@ public final class Manuals { public static void initialize() { TABS.register(FMLJavaModLoadingContext.get().getModEventBus()); - TABS.register("librecomponents", () -> new ItemStackTab( - ManualModel.LANGUAGE_KEY + "/librecomponents/index.md", - Component.translatable("manual." + LibreComponents.MOD_ID + ".items"), + TABS.register("oc2rc", () -> new ItemStackTab( + ManualModel.LANGUAGE_KEY + "/oc2rc/index.md", + Component.translatable("manual." + OC2RC.MOD_ID + ".items"), new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()))); } } diff --git a/src/main/resources/assets/librecomponents/lang/en_us.json b/src/main/resources/assets/librecomponents/lang/en_us.json deleted file mode 100644 index 0af94bc..0000000 --- a/src/main/resources/assets/librecomponents/lang/en_us.json +++ /dev/null @@ -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." -} diff --git a/src/main/resources/assets/librecomponents/lang/ru_ru.json b/src/main/resources/assets/librecomponents/lang/ru_ru.json deleted file mode 100644 index d03c699..0000000 --- a/src/main/resources/assets/librecomponents/lang/ru_ru.json +++ /dev/null @@ -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": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах." -} diff --git a/src/main/resources/assets/librecomponents/lang/zh_cn.json b/src/main/resources/assets/librecomponents/lang/zh_cn.json deleted file mode 100644 index 9277d28..0000000 --- a/src/main/resources/assets/librecomponents/lang/zh_cn.json +++ /dev/null @@ -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." -} diff --git a/src/main/resources/assets/librecomponents/models/item/floppy.json b/src/main/resources/assets/librecomponents/models/item/floppy.json deleted file mode 100644 index 1df84e7..0000000 --- a/src/main/resources/assets/librecomponents/models/item/floppy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "librecomponents:item/floppy_base", - "layer1": "librecomponents:item/floppy_normal" - } -} diff --git a/src/main/resources/assets/librecomponents/models/item/floppy_modern.json b/src/main/resources/assets/librecomponents/models/item/floppy_modern.json deleted file mode 100644 index d711ff3..0000000 --- a/src/main/resources/assets/librecomponents/models/item/floppy_modern.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "librecomponents:item/floppy_base", - "layer1": "librecomponents:item/floppy_modern" - } -} diff --git a/src/main/resources/assets/librecomponents/models/item/hard_drive_extra_large.json b/src/main/resources/assets/librecomponents/models/item/hard_drive_extra_large.json deleted file mode 100644 index 708e81d..0000000 --- a/src/main/resources/assets/librecomponents/models/item/hard_drive_extra_large.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "librecomponents:item/hard_drive_base", - "layer1": "librecomponents:item/hard_drive_extra_large" - } -} diff --git a/src/main/resources/assets/librecomponents/models/item/hard_drive_large.json b/src/main/resources/assets/librecomponents/models/item/hard_drive_large.json deleted file mode 100644 index 8ecb547..0000000 --- a/src/main/resources/assets/librecomponents/models/item/hard_drive_large.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "librecomponents:item/hard_drive_base", - "layer1": "librecomponents:item/hard_drive_large" - } -} diff --git a/src/main/resources/assets/librecomponents/models/item/hard_drive_medium.json b/src/main/resources/assets/librecomponents/models/item/hard_drive_medium.json deleted file mode 100644 index 8881ea0..0000000 --- a/src/main/resources/assets/librecomponents/models/item/hard_drive_medium.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "librecomponents:item/hard_drive_base", - "layer1": "librecomponents:item/hard_drive_medium" - } -} diff --git a/src/main/resources/assets/librecomponents/models/item/hard_drive_small.json b/src/main/resources/assets/librecomponents/models/item/hard_drive_small.json deleted file mode 100644 index bce2a60..0000000 --- a/src/main/resources/assets/librecomponents/models/item/hard_drive_small.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "librecomponents:item/hard_drive_base", - "layer1": "librecomponents:item/hard_drive_small" - } -} diff --git a/src/main/resources/assets/librecomponents/models/item/memory_extra_large.json b/src/main/resources/assets/librecomponents/models/item/memory_extra_large.json deleted file mode 100644 index 3cb8ba5..0000000 --- a/src/main/resources/assets/librecomponents/models/item/memory_extra_large.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "librecomponents:item/memory_extra_large" - } -} diff --git a/src/main/resources/assets/librecomponents/models/item/memory_large.json b/src/main/resources/assets/librecomponents/models/item/memory_large.json deleted file mode 100644 index f1eef99..0000000 --- a/src/main/resources/assets/librecomponents/models/item/memory_large.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "librecomponents:item/memory_large" - } -} diff --git a/src/main/resources/assets/librecomponents/models/item/memory_medium.json b/src/main/resources/assets/librecomponents/models/item/memory_medium.json deleted file mode 100644 index 7405107..0000000 --- a/src/main/resources/assets/librecomponents/models/item/memory_medium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "librecomponents:item/memory_medium" - } -} diff --git a/src/main/resources/assets/librecomponents/models/item/memory_small.json b/src/main/resources/assets/librecomponents/models/item/memory_small.json deleted file mode 100644 index bbedc60..0000000 --- a/src/main/resources/assets/librecomponents/models/item/memory_small.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "librecomponents:item/memory_small" - } -} diff --git a/src/main/resources/assets/oc2/doc/en_us/librecomponents/cpu.md b/src/main/resources/assets/oc2/doc/en_us/oc2rc/cpu.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/librecomponents/cpu.md rename to src/main/resources/assets/oc2/doc/en_us/oc2rc/cpu.md diff --git a/src/main/resources/assets/oc2/doc/en_us/librecomponents/floppy.md b/src/main/resources/assets/oc2/doc/en_us/oc2rc/floppy.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/librecomponents/floppy.md rename to src/main/resources/assets/oc2/doc/en_us/oc2rc/floppy.md diff --git a/src/main/resources/assets/oc2/doc/en_us/librecomponents/hard_drive.md b/src/main/resources/assets/oc2/doc/en_us/oc2rc/hard_drive.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/librecomponents/hard_drive.md rename to src/main/resources/assets/oc2/doc/en_us/oc2rc/hard_drive.md diff --git a/src/main/resources/assets/oc2/doc/en_us/librecomponents/index.md b/src/main/resources/assets/oc2/doc/en_us/oc2rc/index.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/librecomponents/index.md rename to src/main/resources/assets/oc2/doc/en_us/oc2rc/index.md diff --git a/src/main/resources/assets/oc2/doc/en_us/librecomponents/memory.md b/src/main/resources/assets/oc2/doc/en_us/oc2rc/memory.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/librecomponents/memory.md rename to src/main/resources/assets/oc2/doc/en_us/oc2rc/memory.md diff --git a/src/main/resources/assets/oc2rc/lang/en_us.json b/src/main/resources/assets/oc2rc/lang/en_us.json new file mode 100644 index 0000000..7dcb6f8 --- /dev/null +++ b/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." +} diff --git a/src/main/resources/assets/oc2rc/lang/ru_ru.json b/src/main/resources/assets/oc2rc/lang/ru_ru.json new file mode 100644 index 0000000..7418ef6 --- /dev/null +++ b/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": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах." +} diff --git a/src/main/resources/assets/oc2rc/lang/zh_cn.json b/src/main/resources/assets/oc2rc/lang/zh_cn.json new file mode 100644 index 0000000..9f52c1e --- /dev/null +++ b/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." +} diff --git a/src/main/resources/assets/librecomponents/models/item/cpu_tier_1.json b/src/main/resources/assets/oc2rc/models/item/cpu_tier_1.json similarity index 57% rename from src/main/resources/assets/librecomponents/models/item/cpu_tier_1.json rename to src/main/resources/assets/oc2rc/models/item/cpu_tier_1.json index ab2613d..742b38c 100644 --- a/src/main/resources/assets/librecomponents/models/item/cpu_tier_1.json +++ b/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" } } diff --git a/src/main/resources/assets/librecomponents/models/item/cpu_tier_2.json b/src/main/resources/assets/oc2rc/models/item/cpu_tier_2.json similarity index 57% rename from src/main/resources/assets/librecomponents/models/item/cpu_tier_2.json rename to src/main/resources/assets/oc2rc/models/item/cpu_tier_2.json index 6376e0e..593d779 100644 --- a/src/main/resources/assets/librecomponents/models/item/cpu_tier_2.json +++ b/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" } } diff --git a/src/main/resources/assets/librecomponents/models/item/cpu_tier_3.json b/src/main/resources/assets/oc2rc/models/item/cpu_tier_3.json similarity index 57% rename from src/main/resources/assets/librecomponents/models/item/cpu_tier_3.json rename to src/main/resources/assets/oc2rc/models/item/cpu_tier_3.json index c057d30..c2e3a4a 100644 --- a/src/main/resources/assets/librecomponents/models/item/cpu_tier_3.json +++ b/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" } } diff --git a/src/main/resources/assets/librecomponents/models/item/cpu_tier_4.json b/src/main/resources/assets/oc2rc/models/item/cpu_tier_4.json similarity index 57% rename from src/main/resources/assets/librecomponents/models/item/cpu_tier_4.json rename to src/main/resources/assets/oc2rc/models/item/cpu_tier_4.json index dd69d2c..4245f36 100644 --- a/src/main/resources/assets/librecomponents/models/item/cpu_tier_4.json +++ b/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" } } diff --git a/src/main/resources/assets/oc2rc/models/item/floppy.json b/src/main/resources/assets/oc2rc/models/item/floppy.json new file mode 100644 index 0000000..31acb7b --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/oc2rc/models/item/floppy_modern.json b/src/main/resources/assets/oc2rc/models/item/floppy_modern.json new file mode 100644 index 0000000..5e6e8fc --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/oc2rc/models/item/hard_drive_extra_large.json b/src/main/resources/assets/oc2rc/models/item/hard_drive_extra_large.json new file mode 100644 index 0000000..3ca07e0 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/oc2rc/models/item/hard_drive_large.json b/src/main/resources/assets/oc2rc/models/item/hard_drive_large.json new file mode 100644 index 0000000..3dbdd44 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/oc2rc/models/item/hard_drive_medium.json b/src/main/resources/assets/oc2rc/models/item/hard_drive_medium.json new file mode 100644 index 0000000..437038b --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/oc2rc/models/item/hard_drive_small.json b/src/main/resources/assets/oc2rc/models/item/hard_drive_small.json new file mode 100644 index 0000000..517d6cc --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/oc2rc/models/item/memory_extra_large.json b/src/main/resources/assets/oc2rc/models/item/memory_extra_large.json new file mode 100644 index 0000000..c6cff0b --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/oc2rc/models/item/memory_large.json b/src/main/resources/assets/oc2rc/models/item/memory_large.json new file mode 100644 index 0000000..d902a94 --- /dev/null +++ b/src/main/resources/assets/oc2rc/models/item/memory_large.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2rc:item/memory_large" + } +} diff --git a/src/main/resources/assets/oc2rc/models/item/memory_medium.json b/src/main/resources/assets/oc2rc/models/item/memory_medium.json new file mode 100644 index 0000000..a463a89 --- /dev/null +++ b/src/main/resources/assets/oc2rc/models/item/memory_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2rc:item/memory_medium" + } +} diff --git a/src/main/resources/assets/oc2rc/models/item/memory_small.json b/src/main/resources/assets/oc2rc/models/item/memory_small.json new file mode 100644 index 0000000..d2cefff --- /dev/null +++ b/src/main/resources/assets/oc2rc/models/item/memory_small.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2rc:item/memory_small" + } +} diff --git a/src/main/resources/assets/librecomponents/textures/item/cpu_tier_1.png b/src/main/resources/assets/oc2rc/textures/item/cpu_tier_1.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/cpu_tier_1.png rename to src/main/resources/assets/oc2rc/textures/item/cpu_tier_1.png diff --git a/src/main/resources/assets/librecomponents/textures/item/cpu_tier_2.png b/src/main/resources/assets/oc2rc/textures/item/cpu_tier_2.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/cpu_tier_2.png rename to src/main/resources/assets/oc2rc/textures/item/cpu_tier_2.png diff --git a/src/main/resources/assets/librecomponents/textures/item/cpu_tier_3.png b/src/main/resources/assets/oc2rc/textures/item/cpu_tier_3.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/cpu_tier_3.png rename to src/main/resources/assets/oc2rc/textures/item/cpu_tier_3.png diff --git a/src/main/resources/assets/librecomponents/textures/item/cpu_tier_4.png b/src/main/resources/assets/oc2rc/textures/item/cpu_tier_4.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/cpu_tier_4.png rename to src/main/resources/assets/oc2rc/textures/item/cpu_tier_4.png diff --git a/src/main/resources/assets/librecomponents/textures/item/floppy_base.png b/src/main/resources/assets/oc2rc/textures/item/floppy_base.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/floppy_base.png rename to src/main/resources/assets/oc2rc/textures/item/floppy_base.png diff --git a/src/main/resources/assets/librecomponents/textures/item/floppy_modern.png b/src/main/resources/assets/oc2rc/textures/item/floppy_modern.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/floppy_modern.png rename to src/main/resources/assets/oc2rc/textures/item/floppy_modern.png diff --git a/src/main/resources/assets/librecomponents/textures/item/floppy_normal.png b/src/main/resources/assets/oc2rc/textures/item/floppy_normal.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/floppy_normal.png rename to src/main/resources/assets/oc2rc/textures/item/floppy_normal.png diff --git a/src/main/resources/assets/librecomponents/textures/item/floppy_slot.png b/src/main/resources/assets/oc2rc/textures/item/floppy_slot.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/floppy_slot.png rename to src/main/resources/assets/oc2rc/textures/item/floppy_slot.png diff --git a/src/main/resources/assets/librecomponents/textures/item/floppy_tint.png b/src/main/resources/assets/oc2rc/textures/item/floppy_tint.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/floppy_tint.png rename to src/main/resources/assets/oc2rc/textures/item/floppy_tint.png diff --git a/src/main/resources/assets/librecomponents/textures/item/hard_disk_platter.png b/src/main/resources/assets/oc2rc/textures/item/hard_disk_platter.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/hard_disk_platter.png rename to src/main/resources/assets/oc2rc/textures/item/hard_disk_platter.png diff --git a/src/main/resources/assets/librecomponents/textures/item/hard_drive_base.png b/src/main/resources/assets/oc2rc/textures/item/hard_drive_base.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/hard_drive_base.png rename to src/main/resources/assets/oc2rc/textures/item/hard_drive_base.png diff --git a/src/main/resources/assets/librecomponents/textures/item/hard_drive_extra_large.png b/src/main/resources/assets/oc2rc/textures/item/hard_drive_extra_large.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/hard_drive_extra_large.png rename to src/main/resources/assets/oc2rc/textures/item/hard_drive_extra_large.png diff --git a/src/main/resources/assets/librecomponents/textures/item/hard_drive_large.png b/src/main/resources/assets/oc2rc/textures/item/hard_drive_large.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/hard_drive_large.png rename to src/main/resources/assets/oc2rc/textures/item/hard_drive_large.png diff --git a/src/main/resources/assets/librecomponents/textures/item/hard_drive_medium.png b/src/main/resources/assets/oc2rc/textures/item/hard_drive_medium.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/hard_drive_medium.png rename to src/main/resources/assets/oc2rc/textures/item/hard_drive_medium.png diff --git a/src/main/resources/assets/librecomponents/textures/item/hard_drive_slot.png b/src/main/resources/assets/oc2rc/textures/item/hard_drive_slot.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/hard_drive_slot.png rename to src/main/resources/assets/oc2rc/textures/item/hard_drive_slot.png diff --git a/src/main/resources/assets/librecomponents/textures/item/hard_drive_small.png b/src/main/resources/assets/oc2rc/textures/item/hard_drive_small.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/hard_drive_small.png rename to src/main/resources/assets/oc2rc/textures/item/hard_drive_small.png diff --git a/src/main/resources/assets/librecomponents/textures/item/hard_drive_tint.png b/src/main/resources/assets/oc2rc/textures/item/hard_drive_tint.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/hard_drive_tint.png rename to src/main/resources/assets/oc2rc/textures/item/hard_drive_tint.png diff --git a/src/main/resources/assets/librecomponents/textures/item/memory_extra_large.png b/src/main/resources/assets/oc2rc/textures/item/memory_extra_large.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/memory_extra_large.png rename to src/main/resources/assets/oc2rc/textures/item/memory_extra_large.png diff --git a/src/main/resources/assets/librecomponents/textures/item/memory_large.png b/src/main/resources/assets/oc2rc/textures/item/memory_large.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/memory_large.png rename to src/main/resources/assets/oc2rc/textures/item/memory_large.png diff --git a/src/main/resources/assets/librecomponents/textures/item/memory_medium.png b/src/main/resources/assets/oc2rc/textures/item/memory_medium.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/memory_medium.png rename to src/main/resources/assets/oc2rc/textures/item/memory_medium.png diff --git a/src/main/resources/assets/librecomponents/textures/item/memory_slot.png b/src/main/resources/assets/oc2rc/textures/item/memory_slot.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/memory_slot.png rename to src/main/resources/assets/oc2rc/textures/item/memory_slot.png diff --git a/src/main/resources/assets/librecomponents/textures/item/memory_small.png b/src/main/resources/assets/oc2rc/textures/item/memory_small.png similarity index 100% rename from src/main/resources/assets/librecomponents/textures/item/memory_small.png rename to src/main/resources/assets/oc2rc/textures/item/memory_small.png diff --git a/src/main/resources/data/oc2/tags/items/device_needs_reboot.json b/src/main/resources/data/oc2/tags/items/device_needs_reboot.json deleted file mode 100644 index f77bb27..0000000 --- a/src/main/resources/data/oc2/tags/items/device_needs_reboot.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "replace": false, - "values": [ - "librecomponents:hard_drive_small", - "librecomponents:hard_drive_medium", - "librecomponents:hard_drive_large", - "librecomponents:hard_drive_extra_large", - "librecomponents:memory_small", - "librecomponents:memory_medium", - "librecomponents:memory_large", - "librecomponents:memory_extra_large", - "librecomponents:cpu_tier_1", - "librecomponents:cpu_tier_2", - "librecomponents:cpu_tier_3", - "librecomponents:cpu_tier_4" - ] -} diff --git a/src/main/resources/data/oc2/tags/items/devices/cpu.json b/src/main/resources/data/oc2/tags/items/devices/cpu.json deleted file mode 100644 index c1afc28..0000000 --- a/src/main/resources/data/oc2/tags/items/devices/cpu.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "librecomponents:cpu_tier_1", - "librecomponents:cpu_tier_2", - "librecomponents:cpu_tier_3", - "librecomponents:cpu_tier_4" - ] -} diff --git a/src/main/resources/data/oc2/tags/items/devices/floppy.json b/src/main/resources/data/oc2/tags/items/devices/floppy.json deleted file mode 100644 index dea22ae..0000000 --- a/src/main/resources/data/oc2/tags/items/devices/floppy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "librecomponents:floppy", - "librecomponents:floppy_modern" - ] -} diff --git a/src/main/resources/data/oc2/tags/items/devices/hard_drive.json b/src/main/resources/data/oc2/tags/items/devices/hard_drive.json deleted file mode 100644 index 425ec76..0000000 --- a/src/main/resources/data/oc2/tags/items/devices/hard_drive.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "librecomponents:hard_drive_small", - "librecomponents:hard_drive_medium", - "librecomponents:hard_drive_large", - "librecomponents:hard_drive_extra_large" - ] -} diff --git a/src/main/resources/data/oc2/tags/items/devices/memory.json b/src/main/resources/data/oc2/tags/items/devices/memory.json deleted file mode 100644 index 76af3cb..0000000 --- a/src/main/resources/data/oc2/tags/items/devices/memory.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "librecomponents:memory_small", - "librecomponents:memory_medium", - "librecomponents:memory_large", - "librecomponents:memory_extra_large" - ] -} diff --git a/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json b/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json new file mode 100644 index 0000000..c52e4a6 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "oc2rc:hard_drive_small", + "oc2rc:hard_drive_medium", + "oc2rc:hard_drive_large", + "oc2rc:hard_drive_extra_large", + "oc2rc:memory_small", + "oc2rc:memory_medium", + "oc2rc:memory_large", + "oc2rc:memory_extra_large", + "oc2rc:cpu_tier_1", + "oc2rc:cpu_tier_2", + "oc2rc:cpu_tier_3", + "oc2rc:cpu_tier_4" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/cpu.json b/src/main/resources/data/oc2r/tags/items/devices/cpu.json new file mode 100644 index 0000000..d4f4c88 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/cpu.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "oc2rc:cpu_tier_1", + "oc2rc:cpu_tier_2", + "oc2rc:cpu_tier_3", + "oc2rc:cpu_tier_4" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/floppy.json b/src/main/resources/data/oc2r/tags/items/devices/floppy.json new file mode 100644 index 0000000..1348ddf --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/floppy.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "oc2rc:floppy", + "oc2rc:floppy_modern" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json b/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json new file mode 100644 index 0000000..902fea3 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "oc2rc:hard_drive_small", + "oc2rc:hard_drive_medium", + "oc2rc:hard_drive_large", + "oc2rc:hard_drive_extra_large" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/memory.json b/src/main/resources/data/oc2r/tags/items/devices/memory.json new file mode 100644 index 0000000..53c96e3 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/memory.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "oc2rc:memory_small", + "oc2rc:memory_medium", + "oc2rc:memory_large", + "oc2rc:memory_extra_large" + ] +} diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/floppy.json similarity index 100% rename from src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy.json rename to src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/floppy.json diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy_modern.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/floppy_modern.json similarity index 100% rename from src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy_modern.json rename to src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/floppy_modern.json diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_extra_large.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_extra_large.json similarity index 100% rename from src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_extra_large.json rename to src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_extra_large.json diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_large.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_large.json similarity index 100% rename from src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_large.json rename to src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_large.json diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_medium.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_medium.json similarity index 100% rename from src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_medium.json rename to src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_medium.json diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_small.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_small.json similarity index 100% rename from src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_small.json rename to src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_small.json diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_extra_large.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_extra_large.json similarity index 100% rename from src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_extra_large.json rename to src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_extra_large.json diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_large.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_large.json similarity index 100% rename from src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_large.json rename to src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_large.json diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_medium.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_medium.json similarity index 100% rename from src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_medium.json rename to src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_medium.json diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_small.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_small.json similarity index 100% rename from src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_small.json rename to src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_small.json diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_1.json b/src/main/resources/data/oc2rc/recipes/cpu_tier_1.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/cpu_tier_1.json rename to src/main/resources/data/oc2rc/recipes/cpu_tier_1.json diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_2.json b/src/main/resources/data/oc2rc/recipes/cpu_tier_2.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/cpu_tier_2.json rename to src/main/resources/data/oc2rc/recipes/cpu_tier_2.json diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_3.json b/src/main/resources/data/oc2rc/recipes/cpu_tier_3.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/cpu_tier_3.json rename to src/main/resources/data/oc2rc/recipes/cpu_tier_3.json diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_4.json b/src/main/resources/data/oc2rc/recipes/cpu_tier_4.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/cpu_tier_4.json rename to src/main/resources/data/oc2rc/recipes/cpu_tier_4.json diff --git a/src/main/resources/data/librecomponents/recipes/floppy.json b/src/main/resources/data/oc2rc/recipes/floppy.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/floppy.json rename to src/main/resources/data/oc2rc/recipes/floppy.json diff --git a/src/main/resources/data/librecomponents/recipes/floppy_modern.json b/src/main/resources/data/oc2rc/recipes/floppy_modern.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/floppy_modern.json rename to src/main/resources/data/oc2rc/recipes/floppy_modern.json diff --git a/src/main/resources/data/librecomponents/recipes/hard_drive_extra_large.json b/src/main/resources/data/oc2rc/recipes/hard_drive_extra_large.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/hard_drive_extra_large.json rename to src/main/resources/data/oc2rc/recipes/hard_drive_extra_large.json diff --git a/src/main/resources/data/librecomponents/recipes/hard_drive_large.json b/src/main/resources/data/oc2rc/recipes/hard_drive_large.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/hard_drive_large.json rename to src/main/resources/data/oc2rc/recipes/hard_drive_large.json diff --git a/src/main/resources/data/librecomponents/recipes/hard_drive_medium.json b/src/main/resources/data/oc2rc/recipes/hard_drive_medium.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/hard_drive_medium.json rename to src/main/resources/data/oc2rc/recipes/hard_drive_medium.json diff --git a/src/main/resources/data/librecomponents/recipes/hard_drive_small.json b/src/main/resources/data/oc2rc/recipes/hard_drive_small.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/hard_drive_small.json rename to src/main/resources/data/oc2rc/recipes/hard_drive_small.json diff --git a/src/main/resources/data/librecomponents/recipes/memory_extra_large.json b/src/main/resources/data/oc2rc/recipes/memory_extra_large.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/memory_extra_large.json rename to src/main/resources/data/oc2rc/recipes/memory_extra_large.json diff --git a/src/main/resources/data/librecomponents/recipes/memory_large.json b/src/main/resources/data/oc2rc/recipes/memory_large.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/memory_large.json rename to src/main/resources/data/oc2rc/recipes/memory_large.json diff --git a/src/main/resources/data/librecomponents/recipes/memory_medium.json b/src/main/resources/data/oc2rc/recipes/memory_medium.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/memory_medium.json rename to src/main/resources/data/oc2rc/recipes/memory_medium.json diff --git a/src/main/resources/data/librecomponents/recipes/memory_small.json b/src/main/resources/data/oc2rc/recipes/memory_small.json similarity index 100% rename from src/main/resources/data/librecomponents/recipes/memory_small.json rename to src/main/resources/data/oc2rc/recipes/memory_small.json diff --git a/src/main/resources/mixins.librecomponents.json b/src/main/resources/mixins.oc2rc.json similarity index 100% rename from src/main/resources/mixins.librecomponents.json rename to src/main/resources/mixins.oc2rc.json