From cc5f40a9e7046ffaab4b2513b47520fb0ead556b Mon Sep 17 00:00:00 2001 From: Robert MacRae Date: Fri, 31 Jan 2025 14:09:40 -0400 Subject: [PATCH 1/4] Project now supports 1.19.2 --- build.gradle | 19 ++++++-- gradle.properties | 12 +---- minecraft.gradle | 2 +- .../therealm18studios/lc/LibreComponents.java | 2 +- .../lc/common/item/ItemGroup.java | 48 +++++++------------ .../lc/common/item/Items.java | 18 +++---- .../lc/data/DataGenerators.java | 5 +- .../lc/data/ModItemModelProvider.java | 14 +++--- src/main/resources/META-INF/mods.toml | 4 +- .../data/librecomponents/recipes/floppy.json | 2 +- .../recipes/hard_drive_small.json | 5 +- .../librecomponents/recipes/memory_small.json | 5 +- 12 files changed, 62 insertions(+), 74 deletions(-) diff --git a/build.gradle b/build.gradle index 81e2a19..2042eff 100644 --- a/build.gradle +++ b/build.gradle @@ -71,18 +71,27 @@ 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") - implementation fg.deobf("curse.maven:architectury-api-419699:5137938") - implementation fg.deobf("curse.maven:libre-computers-1163239:6126363") + runtimeOnly fileTree(dir: 'libs', include: '*.jar') + runtimeOnly fg.deobf("curse.maven:architectury-api-419699:5137942") + runtimeOnly fg.deobf("curse.maven:jei-238222:5846858") + runtimeOnly fg.deobf("curse.maven:tiny-redstone-453746:5318126") - runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.3.0.4") -} + implementation fg.deobf("curse.maven:markdownmanual-502485:4306669") + implementation fg.deobf("curse.maven:libre-computers-1163239:6136998") + + } System.setProperty("line.separator", "\n") diff --git a/gradle.properties b/gradle.properties index 8edece0..432c5c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,18 +3,8 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -forge_version=47.2.32 +forge_version=43.2.10 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 diff --git a/minecraft.gradle b/minecraft.gradle index 073b468..a4a49e1 100644 --- a/minecraft.gradle +++ b/minecraft.gradle @@ -1,4 +1,4 @@ ext { - minecraft_version = '1.20.1' + minecraft_version = '1.19.2' minecraft_sdk = 'forge' } diff --git a/src/main/java/com/therealm18studios/lc/LibreComponents.java b/src/main/java/com/therealm18studios/lc/LibreComponents.java index 2b8bd7b..01669f1 100644 --- a/src/main/java/com/therealm18studios/lc/LibreComponents.java +++ b/src/main/java/com/therealm18studios/lc/LibreComponents.java @@ -20,6 +20,6 @@ public final class LibreComponents { Items.initialize(); DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> Manuals::initialize); - ItemGroup.TAB_REGISTER.register(FMLJavaModLoadingContext.get().getModEventBus()); +// ItemGroup.COMMON.register(FMLJavaModLoadingContext.get().getModEventBus()); } } diff --git a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java b/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java index c200f08..6ce5e39 100644 --- a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java +++ b/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java @@ -1,40 +1,26 @@ 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 TAB_REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, LibreComponents.MOD_ID); + public static final CreativeModeTab COMMON = new CreativeModeTab(LibreComponents.MOD_ID + ".common") + { + @Override + public ItemStack makeIcon() { + return new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()); + } + }; - @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")) - // 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() - ); +// public ItemGroup getInstance(ItemGroup){ +// ItemGroup.TAB_REGISTER.getDisplayName().contains( +// Items.MEMORY_SMALL.get(), Items.MEMORY_MEDIUM.get(), Items.MEMORY_LARGE.get(), Items.MEMORY_EXTRA_LARGE.get(), +// Items.HARD_DRIVE_SMALL.get(), Items.HARD_DRIVE_MEDIUM.get(), Items.HARD_DRIVE_LARGE.get(), Items.HARD_DRIVE_EXTRA_LARGE.get(), +// Items.FLOPPY.get(), Items.FLOPPY_MODERN.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());); +// } } diff --git a/src/main/java/com/therealm18studios/lc/common/item/Items.java b/src/main/java/com/therealm18studios/lc/common/item/Items.java index 148083e..c5aef4f 100644 --- a/src/main/java/com/therealm18studios/lc/common/item/Items.java +++ b/src/main/java/com/therealm18studios/lc/common/item/Items.java @@ -3,7 +3,7 @@ package com.therealm18studios.lc.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.CPUItem; import li.cil.oc2.common.item.FloppyItem; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; @@ -39,14 +39,14 @@ public final class Items { public static final RegistryObject HARD_DRIVE_EXTRA_LARGE = register("hard_drive_extra_large", () -> new HardDriveItem(268435456, DyeColor.YELLOW)); - public static final RegistryObject CPU_TIER_1 = register("cpu_tier_1", () -> - new CPUItem(250000000)); - public static final RegistryObject CPU_TIER_2 = register("cpu_tier_2", () -> - new CPUItem(300000000)); - public static final RegistryObject CPU_TIER_3 = register("cpu_tier_3", () -> - new CPUItem(350000000)); - public static final RegistryObject CPU_TIER_4 = register("cpu_tier_4", () -> - new CPUItem(400000000)); +// public static final RegistryObject CPU_TIER_1 = register("cpu_tier_1", () -> +// new CPUItem(250000000)); +// public static final RegistryObject CPU_TIER_2 = register("cpu_tier_2", () -> +// new CPUItem(300000000)); +// public static final RegistryObject CPU_TIER_3 = register("cpu_tier_3", () -> +// new CPUItem(350000000)); +// public static final RegistryObject CPU_TIER_4 = register("cpu_tier_4", () -> +// new CPUItem(400000000)); public static final RegistryObject FLOPPY = register("floppy", () -> new FloppyItem(2949120)); diff --git a/src/main/java/com/therealm18studios/lc/data/DataGenerators.java b/src/main/java/com/therealm18studios/lc/data/DataGenerators.java index 6ce01db..5377821 100644 --- a/src/main/java/com/therealm18studios/lc/data/DataGenerators.java +++ b/src/main/java/com/therealm18studios/lc/data/DataGenerators.java @@ -1,7 +1,6 @@ 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; @@ -14,6 +13,8 @@ public final class DataGenerators { final DataGenerator generator = event.getGenerator(); final ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); - generator.addProvider(event.includeClient(), new ModItemModelProvider(generator.getPackOutput(), existingFileHelper)); + if (event.includeClient()) { + generator.addProvider(true, new ModItemModelProvider(generator, existingFileHelper)); + } } } diff --git a/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java b/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java index 124e18a..3e3865e 100644 --- a/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java +++ b/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java @@ -3,7 +3,7 @@ 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.data.DataGenerator; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraftforge.client.model.generators.ItemModelBuilder; @@ -12,8 +12,8 @@ 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); + public ModItemModelProvider(final DataGenerator generator, final ExistingFileHelper existingFileHelper) { + super(generator, LibreComponents.MOD_ID, existingFileHelper); } @Override @@ -22,10 +22,10 @@ public final class ModItemModelProvider extends ItemModelProvider { 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.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") diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index f7086cc..3df0f8b 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[47,)" +loaderVersion = "[43,)" issueTrackerURL = "https://github.com/Libre-Computers/LibreComponents/issues" license = "MIT" @@ -21,7 +21,7 @@ side = "BOTH" [[dependencies.librecomponents]] modId = "minecraft" mandatory = true -versionRange = "1.20.1" +versionRange = "1.19.2" ordering = "NONE" side = "BOTH" [[dependencies.librecomponents]] diff --git a/src/main/resources/data/librecomponents/recipes/floppy.json b/src/main/resources/data/librecomponents/recipes/floppy.json index 6082b2f..fcc5625 100644 --- a/src/main/resources/data/librecomponents/recipes/floppy.json +++ b/src/main/resources/data/librecomponents/recipes/floppy.json @@ -6,7 +6,7 @@ ], "key": { "I": { - "item": "oc2:floppy_modern" + "item": "oc2:floppy" }, "T": { "item": "oc2:transistor" diff --git a/src/main/resources/data/librecomponents/recipes/hard_drive_small.json b/src/main/resources/data/librecomponents/recipes/hard_drive_small.json index 1268375..a1446aa 100644 --- a/src/main/resources/data/librecomponents/recipes/hard_drive_small.json +++ b/src/main/resources/data/librecomponents/recipes/hard_drive_small.json @@ -2,11 +2,12 @@ "type": "minecraft:crafting_shaped", "pattern": [ "ITI", - "EBE" + "EBE", + "ITI" ], "key": { "I": { - "item": "oc2:hard_drive_extra_large" + "item": "oc2:hard_drive_large" }, "T": { "item": "oc2:transistor" diff --git a/src/main/resources/data/librecomponents/recipes/memory_small.json b/src/main/resources/data/librecomponents/recipes/memory_small.json index 75cc02a..f3a507e 100644 --- a/src/main/resources/data/librecomponents/recipes/memory_small.json +++ b/src/main/resources/data/librecomponents/recipes/memory_small.json @@ -2,11 +2,12 @@ "type": "minecraft:crafting_shaped", "pattern": [ "ITI", - " B " + " B ", + "ITI" ], "key": { "I": { - "item": "oc2:memory_extra_large" + "item": "oc2:memory_large" }, "T": { "item": "oc2:transistor" From c439985ac2ea85e620ffc32afb893402304161ff Mon Sep 17 00:00:00 2001 From: Robert MacRae Date: Fri, 31 Jan 2025 14:44:28 -0400 Subject: [PATCH 2/4] Now supports 1.18.2 --- build.gradle | 9 ++- gradle.properties | 2 +- minecraft.gradle | 2 +- .../therealm18studios/lc/LibreComponents.java | 2 - .../lc/common/item/ItemGroup.java | 26 --------- .../lc/data/DataGenerators.java | 20 ------- .../lc/data/ModItemModelProvider.java | 55 ------------------- .../therealm18studios/lc/manual/Manuals.java | 4 +- src/main/resources/META-INF/mods.toml | 6 +- 9 files changed, 11 insertions(+), 115 deletions(-) delete mode 100644 src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java delete mode 100644 src/main/java/com/therealm18studios/lc/data/DataGenerators.java delete mode 100644 src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java diff --git a/build.gradle b/build.gradle index 2042eff..0c31e2a 100644 --- a/build.gradle +++ b/build.gradle @@ -84,12 +84,11 @@ dependencies { annotationProcessor "org.spongepowered:mixin:0.8.5:processor" runtimeOnly fileTree(dir: 'libs', include: '*.jar') - runtimeOnly fg.deobf("curse.maven:architectury-api-419699:5137942") - runtimeOnly fg.deobf("curse.maven:jei-238222:5846858") - runtimeOnly fg.deobf("curse.maven:tiny-redstone-453746:5318126") + runtimeOnly fg.deobf("curse.maven:architectury-api-419699:3669448") + implementation fg.deobf("curse.maven:markdownmanual-502485:3738124") + runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:9.7.0.180") - implementation fg.deobf("curse.maven:markdownmanual-502485:4306669") - implementation fg.deobf("curse.maven:libre-computers-1163239:6136998") + implementation fg.deobf("curse.maven:libre-computers-1163239:6137004") } diff --git a/gradle.properties b/gradle.properties index 432c5c2..92bfe47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -forge_version=43.2.10 +forge_version=40.0.40 semver=1.1.1 diff --git a/minecraft.gradle b/minecraft.gradle index a4a49e1..03af559 100644 --- a/minecraft.gradle +++ b/minecraft.gradle @@ -1,4 +1,4 @@ ext { - minecraft_version = '1.19.2' + minecraft_version = '1.18.2' minecraft_sdk = 'forge' } diff --git a/src/main/java/com/therealm18studios/lc/LibreComponents.java b/src/main/java/com/therealm18studios/lc/LibreComponents.java index 01669f1..0bf6585 100644 --- a/src/main/java/com/therealm18studios/lc/LibreComponents.java +++ b/src/main/java/com/therealm18studios/lc/LibreComponents.java @@ -1,6 +1,5 @@ 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; @@ -20,6 +19,5 @@ public final class LibreComponents { Items.initialize(); DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> Manuals::initialize); -// ItemGroup.COMMON.register(FMLJavaModLoadingContext.get().getModEventBus()); } } diff --git a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java b/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java deleted file mode 100644 index 6ce5e39..0000000 --- a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.therealm18studios.lc.common.item; - -import com.therealm18studios.lc.LibreComponents; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; - -public final class ItemGroup { - public static final CreativeModeTab COMMON = new CreativeModeTab(LibreComponents.MOD_ID + ".common") - { - @Override - public ItemStack makeIcon() { - return new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()); - } - }; - -// public ItemGroup getInstance(ItemGroup){ -// ItemGroup.TAB_REGISTER.getDisplayName().contains( -// Items.MEMORY_SMALL.get(), Items.MEMORY_MEDIUM.get(), Items.MEMORY_LARGE.get(), Items.MEMORY_EXTRA_LARGE.get(), -// Items.HARD_DRIVE_SMALL.get(), Items.HARD_DRIVE_MEDIUM.get(), Items.HARD_DRIVE_LARGE.get(), Items.HARD_DRIVE_EXTRA_LARGE.get(), -// Items.FLOPPY.get(), Items.FLOPPY_MODERN.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());); -// } -} diff --git a/src/main/java/com/therealm18studios/lc/data/DataGenerators.java b/src/main/java/com/therealm18studios/lc/data/DataGenerators.java deleted file mode 100644 index 5377821..0000000 --- a/src/main/java/com/therealm18studios/lc/data/DataGenerators.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.therealm18studios.lc.data; - -import net.minecraft.data.DataGenerator; -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(); - - if (event.includeClient()) { - generator.addProvider(true, new ModItemModelProvider(generator, existingFileHelper)); - } - } -} diff --git a/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java b/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java deleted file mode 100644 index 3e3865e..0000000 --- a/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java +++ /dev/null @@ -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.DataGenerator; -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 DataGenerator generator, final ExistingFileHelper existingFileHelper) { - super(generator, 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 void simple(final RegistryObject item) { - simple(item, "item/" + item.getId().getPath()); - } - - private ItemModelBuilder simple(final RegistryObject item, final String texturePath) { - return singleTexture(item.getId().getPath(), - new ResourceLocation("item/generated"), - "layer0", - new ResourceLocation(LibreComponents.MOD_ID, texturePath)); - } -} diff --git a/src/main/java/com/therealm18studios/lc/manual/Manuals.java b/src/main/java/com/therealm18studios/lc/manual/Manuals.java index 9111fea..54c36ad 100644 --- a/src/main/java/com/therealm18studios/lc/manual/Manuals.java +++ b/src/main/java/com/therealm18studios/lc/manual/Manuals.java @@ -6,7 +6,7 @@ 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; @@ -25,7 +25,7 @@ public final class Manuals { TABS.register("librecomponents", () -> new ItemStackTab( ManualModel.LANGUAGE_KEY + "/librecomponents/index.md", - Component.translatable("manual." + LibreComponents.MOD_ID + ".items"), + new TranslatableComponent("manual." + LibreComponents.MOD_ID + ".items"), new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()))); } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 3df0f8b..2a547fc 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[43,)" +loaderVersion = "[40,)" issueTrackerURL = "https://github.com/Libre-Computers/LibreComponents/issues" license = "MIT" @@ -15,13 +15,13 @@ Libre Drives all the extra components you need. [[dependencies.librecomponents]] modId = "forge" mandatory = true -versionRange = "[40.1.68,)" +versionRange = "[40.0.40,)" ordering = "NONE" side = "BOTH" [[dependencies.librecomponents]] modId = "minecraft" mandatory = true -versionRange = "1.19.2" +versionRange = "1.18.2" ordering = "NONE" side = "BOTH" [[dependencies.librecomponents]] From 58df881673ff546d6b8dad7e3ede4f9afd76d57e Mon Sep 17 00:00:00 2001 From: Robert MacRae Date: Fri, 31 Jan 2025 15:40:33 -0400 Subject: [PATCH 3/4] removed until cpus added to version --- .../librecomponents/recipes/cpu_tier_1.json | 28 ------------------- .../librecomponents/recipes/cpu_tier_2.json | 28 ------------------- .../librecomponents/recipes/cpu_tier_3.json | 28 ------------------- .../librecomponents/recipes/cpu_tier_4.json | 28 ------------------- .../oc2/tags/items/device_needs_reboot.json | 6 +--- .../data/oc2/tags/items/devices/cpu.json | 9 ------ 6 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 src/main/resources/data/librecomponents/recipes/cpu_tier_1.json delete mode 100644 src/main/resources/data/librecomponents/recipes/cpu_tier_2.json delete mode 100644 src/main/resources/data/librecomponents/recipes/cpu_tier_3.json delete mode 100644 src/main/resources/data/librecomponents/recipes/cpu_tier_4.json delete mode 100644 src/main/resources/data/oc2/tags/items/devices/cpu.json diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_1.json b/src/main/resources/data/librecomponents/recipes/cpu_tier_1.json deleted file mode 100644 index 64a47f9..0000000 --- a/src/main/resources/data/librecomponents/recipes/cpu_tier_1.json +++ /dev/null @@ -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" - } -} diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_2.json b/src/main/resources/data/librecomponents/recipes/cpu_tier_2.json deleted file mode 100644 index e3326fc..0000000 --- a/src/main/resources/data/librecomponents/recipes/cpu_tier_2.json +++ /dev/null @@ -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" - } -} diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_3.json b/src/main/resources/data/librecomponents/recipes/cpu_tier_3.json deleted file mode 100644 index a77fb2e..0000000 --- a/src/main/resources/data/librecomponents/recipes/cpu_tier_3.json +++ /dev/null @@ -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" - } -} diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_4.json b/src/main/resources/data/librecomponents/recipes/cpu_tier_4.json deleted file mode 100644 index 5ee897f..0000000 --- a/src/main/resources/data/librecomponents/recipes/cpu_tier_4.json +++ /dev/null @@ -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" - } -} 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 index f77bb27..0926430 100644 --- a/src/main/resources/data/oc2/tags/items/device_needs_reboot.json +++ b/src/main/resources/data/oc2/tags/items/device_needs_reboot.json @@ -8,10 +8,6 @@ "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" + "librecomponents:memory_extra_large" ] } 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" - ] -} From 7b7214f66ae99c85abcc1f5bfcc2d3cae0b34bbe Mon Sep 17 00:00:00 2001 From: Robert MacRae Date: Sun, 16 Feb 2025 14:10:37 -0400 Subject: [PATCH 4/4] fixes, changes and more --- build.gradle | 2 +- .../therealm18studios/lc/LibreComponents.java | 23 --------- .../com/therealm18studios/oc2rc/OC2RC.java | 22 ++++++++ .../{lc => oc2rc}/common/item/Items.java | 14 +++--- .../{lc => oc2rc}/manual/Manuals.java | 12 ++--- src/main/resources/META-INF/mods.toml | 14 +++--- .../assets/librecomponents/lang/en_us.json | 18 ------- .../assets/librecomponents/lang/ru_ru.json | 20 -------- .../assets/librecomponents/lang/zh_cn.json | 20 -------- .../librecomponents/models/item/floppy.json | 7 --- .../models/item/floppy_modern.json | 7 --- .../models/item/hard_drive_extra_large.json | 7 --- .../models/item/hard_drive_large.json | 7 --- .../models/item/hard_drive_medium.json | 7 --- .../models/item/hard_drive_small.json | 7 --- .../models/item/memory_extra_large.json | 6 --- .../models/item/memory_large.json | 6 --- .../models/item/memory_medium.json | 6 --- .../models/item/memory_small.json | 6 --- .../doc/en_us/oc2rc}/cpu.md | 0 .../doc/en_us/oc2rc}/floppy.md | 0 .../doc/en_us/oc2rc}/hard_drive.md | 0 .../doc/en_us/oc2rc}/index.md | 0 .../doc/en_us/oc2rc}/memory.md | 0 .../resources/assets/oc2rc/lang/en_us.json | 18 +++++++ .../resources/assets/oc2rc/lang/ru_ru.json | 20 ++++++++ .../resources/assets/oc2rc/lang/zh_cn.json | 20 ++++++++ .../models/item/cpu_tier_1.json | 2 +- .../models/item/cpu_tier_2.json | 2 +- .../models/item/cpu_tier_3.json | 2 +- .../models/item/cpu_tier_4.json | 2 +- .../assets/oc2rc/models/item/floppy.json | 7 +++ .../oc2rc/models/item/floppy_modern.json | 7 +++ .../models/item/hard_drive_extra_large.json | 7 +++ .../oc2rc/models/item/hard_drive_large.json | 7 +++ .../oc2rc/models/item/hard_drive_medium.json | 7 +++ .../oc2rc/models/item/hard_drive_small.json | 7 +++ .../oc2rc/models/item/memory_extra_large.json | 6 +++ .../oc2rc/models/item/memory_large.json | 6 +++ .../oc2rc/models/item/memory_medium.json | 6 +++ .../oc2rc/models/item/memory_small.json | 6 +++ .../textures/item/cpu_tier_1.png | Bin .../textures/item/cpu_tier_2.png | Bin .../textures/item/cpu_tier_3.png | Bin .../textures/item/cpu_tier_4.png | Bin .../textures/item/floppy_base.png | Bin .../textures/item/floppy_modern.png | Bin .../textures/item/floppy_normal.png | Bin .../textures/item/floppy_slot.png | Bin .../textures/item/floppy_tint.png | Bin .../textures/item/hard_disk_platter.png | Bin .../textures/item/hard_drive_base.png | Bin .../textures/item/hard_drive_extra_large.png | Bin .../textures/item/hard_drive_large.png | Bin .../textures/item/hard_drive_medium.png | Bin .../textures/item/hard_drive_slot.png | Bin .../textures/item/hard_drive_small.png | Bin .../textures/item/hard_drive_tint.png | Bin .../textures/item/memory_extra_large.png | Bin .../textures/item/memory_large.png | Bin .../textures/item/memory_medium.png | Bin .../textures/item/memory_slot.png | Bin .../textures/item/memory_small.png | Bin .../hard_drive_extra_large.json | 47 ------------------ .../hard_drive_medium.json | 47 ------------------ .../memory_extra_large.json | 47 ------------------ .../recipes/oc2rc/common}/floppy.json | 6 +-- .../recipes/oc2rc/common}/floppy_modern.json | 6 +-- .../oc2rc/common/hard_drive_extra_large.json | 47 ++++++++++++++++++ .../oc2rc/common}/hard_drive_large.json | 8 +-- .../oc2rc/common/hard_drive_medium.json | 47 ++++++++++++++++++ .../oc2rc/common}/hard_drive_small.json | 8 +-- .../oc2rc/common/memory_extra_large.json | 47 ++++++++++++++++++ .../recipes/oc2rc/common}/memory_large.json | 8 +-- .../recipes/oc2rc/common}/memory_medium.json | 8 +-- .../recipes/oc2rc/common}/memory_small.json | 8 +-- .../recipes/floppy.json | 8 +-- .../recipes/floppy_modern.json | 8 +-- .../recipes/hard_drive_extra_large.json | 8 +-- .../recipes/hard_drive_large.json | 8 +-- .../recipes/hard_drive_medium.json | 8 +-- .../recipes/hard_drive_small.json | 8 +-- .../recipes/memory_extra_large.json | 8 +-- .../recipes/memory_large.json | 8 +-- .../recipes/memory_medium.json | 8 +-- .../recipes/memory_small.json | 8 +-- .../tags/items/device_needs_reboot.json | 0 .../tags/items/devices/floppy.json | 0 .../tags/items/devices/hard_drive.json | 0 .../tags/items/devices/memory.json | 0 ...librecomponents.json => mixins.oc2rc.json} | 0 91 files changed, 378 insertions(+), 379 deletions(-) delete mode 100644 src/main/java/com/therealm18studios/lc/LibreComponents.java create mode 100644 src/main/java/com/therealm18studios/oc2rc/OC2RC.java rename src/main/java/com/therealm18studios/{lc => oc2rc}/common/item/Items.java (90%) rename src/main/java/com/therealm18studios/{lc => oc2rc}/manual/Manuals.java (71%) delete mode 100644 src/main/resources/assets/librecomponents/lang/en_us.json delete mode 100644 src/main/resources/assets/librecomponents/lang/ru_ru.json delete mode 100644 src/main/resources/assets/librecomponents/lang/zh_cn.json delete mode 100644 src/main/resources/assets/librecomponents/models/item/floppy.json delete mode 100644 src/main/resources/assets/librecomponents/models/item/floppy_modern.json delete mode 100644 src/main/resources/assets/librecomponents/models/item/hard_drive_extra_large.json delete mode 100644 src/main/resources/assets/librecomponents/models/item/hard_drive_large.json delete mode 100644 src/main/resources/assets/librecomponents/models/item/hard_drive_medium.json delete mode 100644 src/main/resources/assets/librecomponents/models/item/hard_drive_small.json delete mode 100644 src/main/resources/assets/librecomponents/models/item/memory_extra_large.json delete mode 100644 src/main/resources/assets/librecomponents/models/item/memory_large.json delete mode 100644 src/main/resources/assets/librecomponents/models/item/memory_medium.json delete mode 100644 src/main/resources/assets/librecomponents/models/item/memory_small.json rename src/main/resources/assets/{oc2/doc/en_us/librecomponents => oc2rc/doc/en_us/oc2rc}/cpu.md (100%) rename src/main/resources/assets/{oc2/doc/en_us/librecomponents => oc2rc/doc/en_us/oc2rc}/floppy.md (100%) rename src/main/resources/assets/{oc2/doc/en_us/librecomponents => oc2rc/doc/en_us/oc2rc}/hard_drive.md (100%) rename src/main/resources/assets/{oc2/doc/en_us/librecomponents => oc2rc/doc/en_us/oc2rc}/index.md (100%) rename src/main/resources/assets/{oc2/doc/en_us/librecomponents => oc2rc/doc/en_us/oc2rc}/memory.md (100%) create mode 100644 src/main/resources/assets/oc2rc/lang/en_us.json create mode 100644 src/main/resources/assets/oc2rc/lang/ru_ru.json create mode 100644 src/main/resources/assets/oc2rc/lang/zh_cn.json rename src/main/resources/assets/{librecomponents => oc2rc}/models/item/cpu_tier_1.json (57%) rename src/main/resources/assets/{librecomponents => oc2rc}/models/item/cpu_tier_2.json (57%) rename src/main/resources/assets/{librecomponents => oc2rc}/models/item/cpu_tier_3.json (57%) rename src/main/resources/assets/{librecomponents => oc2rc}/models/item/cpu_tier_4.json (57%) create mode 100644 src/main/resources/assets/oc2rc/models/item/floppy.json create mode 100644 src/main/resources/assets/oc2rc/models/item/floppy_modern.json create mode 100644 src/main/resources/assets/oc2rc/models/item/hard_drive_extra_large.json create mode 100644 src/main/resources/assets/oc2rc/models/item/hard_drive_large.json create mode 100644 src/main/resources/assets/oc2rc/models/item/hard_drive_medium.json create mode 100644 src/main/resources/assets/oc2rc/models/item/hard_drive_small.json create mode 100644 src/main/resources/assets/oc2rc/models/item/memory_extra_large.json create mode 100644 src/main/resources/assets/oc2rc/models/item/memory_large.json create mode 100644 src/main/resources/assets/oc2rc/models/item/memory_medium.json create mode 100644 src/main/resources/assets/oc2rc/models/item/memory_small.json rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/cpu_tier_1.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/cpu_tier_2.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/cpu_tier_3.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/cpu_tier_4.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/floppy_base.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/floppy_modern.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/floppy_normal.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/floppy_slot.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/floppy_tint.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/hard_disk_platter.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/hard_drive_base.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/hard_drive_extra_large.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/hard_drive_large.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/hard_drive_medium.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/hard_drive_slot.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/hard_drive_small.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/hard_drive_tint.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/memory_extra_large.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/memory_large.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/memory_medium.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/memory_slot.png (100%) rename src/main/resources/assets/{librecomponents => oc2rc}/textures/item/memory_small.png (100%) delete mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_extra_large.json delete mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_medium.json delete mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_extra_large.json rename src/main/resources/data/{librecomponents/advancements/recipes/librecomponents.common => oc2rc/advancements/recipes/oc2rc/common}/floppy.json (82%) rename src/main/resources/data/{librecomponents/advancements/recipes/librecomponents.common => oc2rc/advancements/recipes/oc2rc/common}/floppy_modern.json (80%) create mode 100644 src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_extra_large.json rename src/main/resources/data/{librecomponents/advancements/recipes/librecomponents.common => oc2rc/advancements/recipes/oc2rc/common}/hard_drive_large.json (82%) create mode 100644 src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_medium.json rename src/main/resources/data/{librecomponents/advancements/recipes/librecomponents.common => oc2rc/advancements/recipes/oc2rc/common}/hard_drive_small.json (82%) create mode 100644 src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_extra_large.json rename src/main/resources/data/{librecomponents/advancements/recipes/librecomponents.common => oc2rc/advancements/recipes/oc2rc/common}/memory_large.json (83%) rename src/main/resources/data/{librecomponents/advancements/recipes/librecomponents.common => oc2rc/advancements/recipes/oc2rc/common}/memory_medium.json (83%) rename src/main/resources/data/{librecomponents/advancements/recipes/librecomponents.common => oc2rc/advancements/recipes/oc2rc/common}/memory_small.json (83%) rename src/main/resources/data/{librecomponents => oc2rc}/recipes/floppy.json (63%) rename src/main/resources/data/{librecomponents => oc2rc}/recipes/floppy_modern.json (61%) rename src/main/resources/data/{librecomponents => oc2rc}/recipes/hard_drive_extra_large.json (58%) rename src/main/resources/data/{librecomponents => oc2rc}/recipes/hard_drive_large.json (57%) rename src/main/resources/data/{librecomponents => oc2rc}/recipes/hard_drive_medium.json (57%) rename src/main/resources/data/{librecomponents => oc2rc}/recipes/hard_drive_small.json (61%) rename src/main/resources/data/{librecomponents => oc2rc}/recipes/memory_extra_large.json (59%) rename src/main/resources/data/{librecomponents => oc2rc}/recipes/memory_large.json (52%) rename src/main/resources/data/{librecomponents => oc2rc}/recipes/memory_medium.json (52%) rename src/main/resources/data/{librecomponents => oc2rc}/recipes/memory_small.json (56%) rename src/main/resources/data/{oc2 => oc2rc}/tags/items/device_needs_reboot.json (100%) rename src/main/resources/data/{oc2 => oc2rc}/tags/items/devices/floppy.json (100%) rename src/main/resources/data/{oc2 => oc2rc}/tags/items/devices/hard_drive.json (100%) rename src/main/resources/data/{oc2 => oc2rc}/tags/items/devices/memory.json (100%) rename src/main/resources/{mixins.librecomponents.json => mixins.oc2rc.json} (100%) diff --git a/build.gradle b/build.gradle index 0c31e2a..dc800eb 100644 --- a/build.gradle +++ b/build.gradle @@ -88,7 +88,7 @@ dependencies { implementation fg.deobf("curse.maven:markdownmanual-502485:3738124") runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:9.7.0.180") - implementation fg.deobf("curse.maven:libre-computers-1163239:6137004") +// implementation fg.deobf("curse.maven:libre-computers-1163239:6137004") } diff --git a/src/main/java/com/therealm18studios/lc/LibreComponents.java b/src/main/java/com/therealm18studios/lc/LibreComponents.java deleted file mode 100644 index 0bf6585..0000000 --- a/src/main/java/com/therealm18studios/lc/LibreComponents.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.therealm18studios.lc; - -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); - } -} diff --git a/src/main/java/com/therealm18studios/oc2rc/OC2RC.java b/src/main/java/com/therealm18studios/oc2rc/OC2RC.java new file mode 100644 index 0000000..13891cb --- /dev/null +++ b/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); + } +} 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 c5aef4f..02bf383 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 54c36ad..6648026 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", - new TranslatableComponent("manual." + LibreComponents.MOD_ID + ".items"), + TABS.register("oc2rc", () -> new ItemStackTab( + ManualModel.LANGUAGE_KEY + "/oc2rc/index.md", + new TranslatableComponent("manual." + OC2RC.MOD_ID + ".items"), new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()))); } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 2a547fc..7b3e866 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -4,28 +4,28 @@ 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.0.40,)" ordering = "NONE" side = "BOTH" -[[dependencies.librecomponents]] +[[dependencies.oc2rc]] modId = "minecraft" mandatory = true versionRange = "1.18.2" ordering = "NONE" side = "BOTH" -[[dependencies.librecomponents]] -modId = "oc2" +[[dependencies.oc2rc]] +modId = "oc2r" mandatory = false versionRange = "[1.1.0,)" side = "BOTH" 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/oc2rc/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/oc2rc/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/oc2rc/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/oc2rc/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/oc2rc/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/oc2rc/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/oc2rc/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/oc2rc/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/oc2rc/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/oc2rc/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/librecomponents/advancements/recipes/librecomponents.common/hard_drive_extra_large.json b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_extra_large.json deleted file mode 100644 index f441471..0000000 --- a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_extra_large.json +++ /dev/null @@ -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" - ] - ] -} diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_medium.json b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_medium.json deleted file mode 100644 index efd2742..0000000 --- a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_medium.json +++ /dev/null @@ -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" - ] - ] -} diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_extra_large.json b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_extra_large.json deleted file mode 100644 index 0236e6c..0000000 --- a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_extra_large.json +++ /dev/null @@ -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" - ] - ] -} 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 82% 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 index b7cd837..305342b 100644 --- a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy.json +++ b/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" } } }, 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 80% 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 index 3635714..fcbed3d 100644 --- 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 @@ -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" } } }, diff --git a/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_extra_large.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_extra_large.json new file mode 100644 index 0000000..8fb52a8 --- /dev/null +++ b/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" + ] + ] +} 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 82% 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 index 3b96f25..15e9631 100644 --- 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 @@ -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" } } }, diff --git a/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_medium.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/hard_drive_medium.json new file mode 100644 index 0000000..265d01c --- /dev/null +++ b/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" + ] + ] +} 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 82% 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 index 8046d37..0dfb3b5 100644 --- 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 @@ -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" } } }, diff --git a/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_extra_large.json b/src/main/resources/data/oc2rc/advancements/recipes/oc2rc/common/memory_extra_large.json new file mode 100644 index 0000000..9d62aa9 --- /dev/null +++ b/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" + ] + ] +} 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 83% 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 index e24b855..18dfa74 100644 --- 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 @@ -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" } } }, 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 83% 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 index aae9154..1ab287f 100644 --- 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 @@ -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" } } }, 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 83% 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 index 4302490..1d47ea2 100644 --- 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 @@ -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" } } }, diff --git a/src/main/resources/data/librecomponents/recipes/floppy.json b/src/main/resources/data/oc2rc/recipes/floppy.json similarity index 63% rename from src/main/resources/data/librecomponents/recipes/floppy.json rename to src/main/resources/data/oc2rc/recipes/floppy.json index fcc5625..fe03620 100644 --- a/src/main/resources/data/librecomponents/recipes/floppy.json +++ b/src/main/resources/data/oc2rc/recipes/floppy.json @@ -6,19 +6,19 @@ ], "key": { "I": { - "item": "oc2:floppy" + "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" } } diff --git a/src/main/resources/data/librecomponents/recipes/floppy_modern.json b/src/main/resources/data/oc2rc/recipes/floppy_modern.json similarity index 61% rename from src/main/resources/data/librecomponents/recipes/floppy_modern.json rename to src/main/resources/data/oc2rc/recipes/floppy_modern.json index cb1b482..acc3d09 100644 --- a/src/main/resources/data/librecomponents/recipes/floppy_modern.json +++ b/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" } } 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 58% 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 index 6e09081..49f1f56 100644 --- a/src/main/resources/data/librecomponents/recipes/hard_drive_extra_large.json +++ b/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" } } 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 57% rename from src/main/resources/data/librecomponents/recipes/hard_drive_large.json rename to src/main/resources/data/oc2rc/recipes/hard_drive_large.json index 03afa93..fc11898 100644 --- a/src/main/resources/data/librecomponents/recipes/hard_drive_large.json +++ b/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" } } 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 57% rename from src/main/resources/data/librecomponents/recipes/hard_drive_medium.json rename to src/main/resources/data/oc2rc/recipes/hard_drive_medium.json index 107b083..669345b 100644 --- a/src/main/resources/data/librecomponents/recipes/hard_drive_medium.json +++ b/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" } } 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 61% rename from src/main/resources/data/librecomponents/recipes/hard_drive_small.json rename to src/main/resources/data/oc2rc/recipes/hard_drive_small.json index a1446aa..bffa1ff 100644 --- a/src/main/resources/data/librecomponents/recipes/hard_drive_small.json +++ b/src/main/resources/data/oc2rc/recipes/hard_drive_small.json @@ -7,19 +7,19 @@ ], "key": { "I": { - "item": "oc2:hard_drive_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" } } 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 59% rename from src/main/resources/data/librecomponents/recipes/memory_extra_large.json rename to src/main/resources/data/oc2rc/recipes/memory_extra_large.json index 4fb29e3..9b3406a 100644 --- a/src/main/resources/data/librecomponents/recipes/memory_extra_large.json +++ b/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" } } diff --git a/src/main/resources/data/librecomponents/recipes/memory_large.json b/src/main/resources/data/oc2rc/recipes/memory_large.json similarity index 52% rename from src/main/resources/data/librecomponents/recipes/memory_large.json rename to src/main/resources/data/oc2rc/recipes/memory_large.json index 37bfda0..86c7a75 100644 --- a/src/main/resources/data/librecomponents/recipes/memory_large.json +++ b/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" } } diff --git a/src/main/resources/data/librecomponents/recipes/memory_medium.json b/src/main/resources/data/oc2rc/recipes/memory_medium.json similarity index 52% rename from src/main/resources/data/librecomponents/recipes/memory_medium.json rename to src/main/resources/data/oc2rc/recipes/memory_medium.json index 7dcd3c1..954c2d5 100644 --- a/src/main/resources/data/librecomponents/recipes/memory_medium.json +++ b/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" } } diff --git a/src/main/resources/data/librecomponents/recipes/memory_small.json b/src/main/resources/data/oc2rc/recipes/memory_small.json similarity index 56% rename from src/main/resources/data/librecomponents/recipes/memory_small.json rename to src/main/resources/data/oc2rc/recipes/memory_small.json index f3a507e..6f6c795 100644 --- a/src/main/resources/data/librecomponents/recipes/memory_small.json +++ b/src/main/resources/data/oc2rc/recipes/memory_small.json @@ -7,16 +7,16 @@ ], "key": { "I": { - "item": "oc2:memory_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" } } diff --git a/src/main/resources/data/oc2/tags/items/device_needs_reboot.json b/src/main/resources/data/oc2rc/tags/items/device_needs_reboot.json similarity index 100% rename from src/main/resources/data/oc2/tags/items/device_needs_reboot.json rename to src/main/resources/data/oc2rc/tags/items/device_needs_reboot.json diff --git a/src/main/resources/data/oc2/tags/items/devices/floppy.json b/src/main/resources/data/oc2rc/tags/items/devices/floppy.json similarity index 100% rename from src/main/resources/data/oc2/tags/items/devices/floppy.json rename to src/main/resources/data/oc2rc/tags/items/devices/floppy.json diff --git a/src/main/resources/data/oc2/tags/items/devices/hard_drive.json b/src/main/resources/data/oc2rc/tags/items/devices/hard_drive.json similarity index 100% rename from src/main/resources/data/oc2/tags/items/devices/hard_drive.json rename to src/main/resources/data/oc2rc/tags/items/devices/hard_drive.json diff --git a/src/main/resources/data/oc2/tags/items/devices/memory.json b/src/main/resources/data/oc2rc/tags/items/devices/memory.json similarity index 100% rename from src/main/resources/data/oc2/tags/items/devices/memory.json rename to src/main/resources/data/oc2rc/tags/items/devices/memory.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