From b8ade187e001c4a0e3abfd735b1916e86e3a030e Mon Sep 17 00:00:00 2001 From: Robert MacRae Date: Sat, 25 Jan 2025 19:30:07 -0400 Subject: [PATCH] now with recipes + removed oc2r support for lc support instead --- build.gradle | 60 ++++++++++--------- .../therealm18studios/lc/LibreComponents.java | 2 +- .../lc/common/item/ItemGroup.java | 2 +- .../lc/common/item/Items.java | 2 +- .../lc/data/ModItemModelProvider.java | 2 +- src/main/resources/META-INF/mods.toml | 8 +-- .../librecomponents.common/floppy.json | 34 +++++++++++ .../librecomponents.common/floppy_modern.json | 34 +++++++++++ .../hard_drive_extra_large.json | 47 +++++++++++++++ .../hard_drive_large.json | 47 +++++++++++++++ .../hard_drive_medium.json | 47 +++++++++++++++ .../hard_drive_small.json | 47 +++++++++++++++ .../memory_extra_large.json | 47 +++++++++++++++ .../librecomponents.common/memory_large.json | 47 +++++++++++++++ .../librecomponents.common/memory_medium.json | 47 +++++++++++++++ .../librecomponents.common/memory_small.json | 47 +++++++++++++++ .../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 +++++++++ .../data/librecomponents/recipes/floppy.json | 24 ++++++++ .../recipes/floppy_modern.json | 25 ++++++++ .../recipes/hard_drive_extra_large.json | 25 ++++++++ .../recipes/hard_drive_large.json | 24 ++++++++ .../recipes/hard_drive_medium.json | 24 ++++++++ .../recipes/hard_drive_small.json | 24 ++++++++ .../recipes/memory_extra_large.json | 25 ++++++++ .../librecomponents/recipes/memory_large.json | 21 +++++++ .../recipes/memory_medium.json | 21 +++++++ .../librecomponents/recipes/memory_small.json | 21 +++++++ .../tags/items/device_needs_reboot.json | 0 .../{oc2r => oc2}/tags/items/devices/cpu.json | 0 .../tags/items/devices/floppy.json | 0 .../tags/items/devices/hard_drive.json | 0 .../tags/items/devices/memory.json | 0 35 files changed, 827 insertions(+), 39 deletions(-) create mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy.json create mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy_modern.json create mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_extra_large.json create mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_large.json create mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_medium.json create mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_small.json create mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_extra_large.json create mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_large.json create mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_medium.json create mode 100644 src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_small.json create mode 100644 src/main/resources/data/librecomponents/recipes/cpu_tier_1.json create mode 100644 src/main/resources/data/librecomponents/recipes/cpu_tier_2.json create mode 100644 src/main/resources/data/librecomponents/recipes/cpu_tier_3.json create mode 100644 src/main/resources/data/librecomponents/recipes/cpu_tier_4.json create mode 100644 src/main/resources/data/librecomponents/recipes/floppy.json create mode 100644 src/main/resources/data/librecomponents/recipes/floppy_modern.json create mode 100644 src/main/resources/data/librecomponents/recipes/hard_drive_extra_large.json create mode 100644 src/main/resources/data/librecomponents/recipes/hard_drive_large.json create mode 100644 src/main/resources/data/librecomponents/recipes/hard_drive_medium.json create mode 100644 src/main/resources/data/librecomponents/recipes/hard_drive_small.json create mode 100644 src/main/resources/data/librecomponents/recipes/memory_extra_large.json create mode 100644 src/main/resources/data/librecomponents/recipes/memory_large.json create mode 100644 src/main/resources/data/librecomponents/recipes/memory_medium.json create mode 100644 src/main/resources/data/librecomponents/recipes/memory_small.json rename src/main/resources/data/{oc2r => oc2}/tags/items/device_needs_reboot.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/cpu.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/floppy.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/hard_drive.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/memory.json (100%) diff --git a/build.gradle b/build.gradle index 5bb6bed..6547bbe 100644 --- a/build.gradle +++ b/build.gradle @@ -71,6 +71,9 @@ repositories { } } } + flatDir { + dirs("libs") + } } dependencies { @@ -81,13 +84,14 @@ dependencies { // we can include these directly (and will have a local library mod using the local // versions). Can't get these to get properly resolved in the IDE otherwise (doesn't // pick them up via the library mod due to the embed configuration). - if (hasGithubPackageCredentials) { - compileOnly "li.cil.ceres:ceres:0.0.4" - compileOnly "li.cil.sedna:sedna:2.0.8" - compileOnly "li.cil.sedna:sedna-buildroot:0.0.8" - } - implementation "curse.maven:sedna-511276:3885542" - minecraftLibrary "org.apache.commons:commons-collections4:4.4" +// if (hasGithubPackageCredentials) { +// compileOnly "li.cil.ceres:ceres:0.0.4" +// compileOnly "li.cil.sedna:sedna:2.0.8" +// compileOnly "li.cil.sedna:sedna-buildroot:0.0.8" +// } +// implementation "curse.maven:sedna-511276:3885542" +// minecraftLibrary "org.apache.commons:commons-collections4:4.4" + implementation fileTree(dir: "libs", includes: ['*.jar']) implementation fg.deobf("curse.maven:markdownmanual-502485:4873115") implementation fg.deobf("curse.maven:architectury-api-419699:5137938") @@ -97,31 +101,31 @@ dependencies { runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.3.0.4") - compileOnly fg.deobf("mrtjp:ProjectRed:${minecraft_version}-${pr_version}:api") - runtimeOnly fg.deobf("io.codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:universal") - runtimeOnly fg.deobf("io.codechicken:CBMultipart:${minecraft_version}-${cbm_version}:universal") - runtimeOnly fg.deobf("mrtjp:ProjectRed:${minecraft_version}-${pr_version}:core") - runtimeOnly fg.deobf("mrtjp:ProjectRed:${minecraft_version}-${pr_version}:transmission") +// compileOnly fg.deobf("mrtjp:ProjectRed:${minecraft_version}-${pr_version}:api") +// runtimeOnly fg.deobf("io.codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:universal") +// runtimeOnly fg.deobf("io.codechicken:CBMultipart:${minecraft_version}-${cbm_version}:universal") +// runtimeOnly fg.deobf("mrtjp:ProjectRed:${minecraft_version}-${pr_version}:core") +// runtimeOnly fg.deobf("mrtjp:ProjectRed:${minecraft_version}-${pr_version}:transmission") - if (debug_embeddium) - { - runtimeOnly fg.deobf("curse.maven:embeddium-908741:5521846") - } +// if (debug_embeddium) +// { +// runtimeOnly fg.deobf("curse.maven:embeddium-908741:5521846") +// } - if (debug_embeddium_plus_plus) - { - runtimeOnly fg.deobf("curse.maven:embeddiumplus-931925:5436746") - } +// if (debug_embeddium_plus_plus) +// { +// runtimeOnly fg.deobf("curse.maven:embeddiumplus-931925:5436746") +// } - if (debug_oculus) - { - runtimeOnly fg.deobf("curse.maven:oculus-581495:5299671") - } +// if (debug_oculus) +// { +// runtimeOnly fg.deobf("curse.maven:oculus-581495:5299671") +// } - testImplementation "org.mockito:mockito-inline:4.3.1" - testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2" - implementation fg.deobf("curse.maven:oc2r-1037738:5544316") +// testImplementation "org.mockito:mockito-inline:4.3.1" +// testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2" +// testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2" +// implementation fg.deobf("curse.maven:oc2r-1037738:5544316") } System.setProperty("line.separator", "\n") diff --git a/src/main/java/com/therealm18studios/lc/LibreComponents.java b/src/main/java/com/therealm18studios/lc/LibreComponents.java index 1bc07a3..c7ae1bd 100644 --- a/src/main/java/com/therealm18studios/lc/LibreComponents.java +++ b/src/main/java/com/therealm18studios/lc/LibreComponents.java @@ -2,7 +2,7 @@ package com.therealm18studios.lc; import com.therealm18studios.lc.common.item.ItemGroup; import com.therealm18studios.lc.common.item.Items; -import li.cil.oc2r.common.ConfigManager; +import li.cil.oc2.common.ConfigManager; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; 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 4d47dac..e9fa4ab 100644 --- a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java +++ b/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java @@ -16,7 +16,7 @@ public final class ItemGroup { // Set name of tab to display .title(Component.translatable("item_group." + LibreComponents.MOD_ID + ".common")) // Set icon of creative tab - .icon(() -> new ItemStack(li.cil.oc2r.common.item.Items.COMPUTER.get())) + .icon(() -> new ItemStack(li.cil.oc2.common.item.Items.COMPUTER.get())) // Add default items to tab .displayItems((params, output) -> { // Items 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 8db0133..fa72fff 100644 --- a/src/main/java/com/therealm18studios/lc/common/item/Items.java +++ b/src/main/java/com/therealm18studios/lc/common/item/Items.java @@ -1,7 +1,7 @@ package com.therealm18studios.lc.common.item; import com.therealm18studios.lc.LibreComponents; -import li.cil.oc2r.common.item.*; +import li.cil.oc2.common.item.*; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; diff --git a/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java b/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java index 05505af..124e18a 100644 --- a/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java +++ b/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java @@ -1,7 +1,7 @@ package com.therealm18studios.lc.data; import com.therealm18studios.lc.LibreComponents; -import li.cil.oc2r.common.entity.Entities; +import li.cil.oc2.common.entity.Entities; import com.therealm18studios.lc.common.item.Items; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index f13fe21..6534130 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -25,14 +25,8 @@ versionRange = "1.20.1" ordering = "NONE" side = "BOTH" [[dependencies.librecomponents]] -modId = "oc2r" +modId = "oc2" mandatory = false versionRange = "[1.1.0,)" side = "BOTH" ordering = "AFTER" -[[dependencies.librecomponents]] -modId = "libracomputing" -mandatory = false -versionRange = "[0,)" -side = "BOTH" -ordering = "AFTER" diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy.json b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy.json new file mode 100644 index 0000000..b7cd837 --- /dev/null +++ b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "librecomponents:floppy" + ] + }, + "criteria": { + "has_disk_drive": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "oc2:disk_drive" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "librecomponents:floppy" + } + } + }, + "requirements": [ + [ + "has_disk_drive", + "has_the_recipe" + ] + ] +} diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy_modern.json b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy_modern.json new file mode 100644 index 0000000..3635714 --- /dev/null +++ b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy_modern.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "librecomponents:floppy_modern" + ] + }, + "criteria": { + "has_disk_drive": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "oc2:disk_drive" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "librecomponents:floppy_modern" + } + } + }, + "requirements": [ + [ + "has_disk_drive", + "has_the_recipe" + ] + ] +} 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 new file mode 100644 index 0000000..f441471 --- /dev/null +++ b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_extra_large.json @@ -0,0 +1,47 @@ +{ + "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_large.json b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_large.json new file mode 100644 index 0000000..3b96f25 --- /dev/null +++ b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_large.json @@ -0,0 +1,47 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "librecomponents:hard_drive_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_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 new file mode 100644 index 0000000..efd2742 --- /dev/null +++ b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_medium.json @@ -0,0 +1,47 @@ +{ + "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/hard_drive_small.json b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_small.json new file mode 100644 index 0000000..8046d37 --- /dev/null +++ b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_small.json @@ -0,0 +1,47 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "librecomponents:hard_drive_small" + ] + }, + "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_small" + } + } + }, + "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 new file mode 100644 index 0000000..0236e6c --- /dev/null +++ b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_extra_large.json @@ -0,0 +1,47 @@ +{ + "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/memory_large.json b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_large.json new file mode 100644 index 0000000..e24b855 --- /dev/null +++ b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_large.json @@ -0,0 +1,47 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "librecomponents:memory_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_large" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_robot", + "has_the_recipe" + ] + ] +} diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_medium.json b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_medium.json new file mode 100644 index 0000000..aae9154 --- /dev/null +++ b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_medium.json @@ -0,0 +1,47 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "librecomponents:memory_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:memory_medium" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_robot", + "has_the_recipe" + ] + ] +} diff --git a/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_small.json b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_small.json new file mode 100644 index 0000000..4302490 --- /dev/null +++ b/src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_small.json @@ -0,0 +1,47 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "librecomponents:memory_small" + ] + }, + "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_small" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_robot", + "has_the_recipe" + ] + ] +} diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_1.json b/src/main/resources/data/librecomponents/recipes/cpu_tier_1.json new file mode 100644 index 0000000..64a47f9 --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/cpu_tier_1.json @@ -0,0 +1,28 @@ +{ + "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 new file mode 100644 index 0000000..e3326fc --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/cpu_tier_2.json @@ -0,0 +1,28 @@ +{ + "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 new file mode 100644 index 0000000..a77fb2e --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/cpu_tier_3.json @@ -0,0 +1,28 @@ +{ + "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 new file mode 100644 index 0000000..5ee897f --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/cpu_tier_4.json @@ -0,0 +1,28 @@ +{ + "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/librecomponents/recipes/floppy.json b/src/main/resources/data/librecomponents/recipes/floppy.json new file mode 100644 index 0000000..6082b2f --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/floppy.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ITI", + "QBQ" + ], + "key": { + "I": { + "item": "oc2:floppy_modern" + }, + "T": { + "item": "oc2:transistor" + }, + "Q": { + "tag": "forge:gems/quartz" + }, + "B": { + "item": "oc2:circuit_board" + } + }, + "result": { + "item": "librecomponents:floppy" + } +} diff --git a/src/main/resources/data/librecomponents/recipes/floppy_modern.json b/src/main/resources/data/librecomponents/recipes/floppy_modern.json new file mode 100644 index 0000000..cb1b482 --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/floppy_modern.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ITI", + "QBQ", + "QBQ" + ], + "key": { + "I": { + "item": "librecomponents:floppy" + }, + "T": { + "item": "oc2:transistor" + }, + "Q": { + "tag": "forge:gems/quartz" + }, + "B": { + "item": "oc2:circuit_board" + } + }, + "result": { + "item": "librecomponents:floppy_modern" + } +} diff --git a/src/main/resources/data/librecomponents/recipes/hard_drive_extra_large.json b/src/main/resources/data/librecomponents/recipes/hard_drive_extra_large.json new file mode 100644 index 0000000..6e09081 --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/hard_drive_extra_large.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ETE", + "DBD", + "EBE" + ], + "key": { + "D": { + "item": "librecomponents:hard_drive_large" + }, + "T": { + "item": "oc2:transistor" + }, + "B": { + "item": "oc2:circuit_board" + }, + "E": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "librecomponents:hard_drive_extra_large" + } +} diff --git a/src/main/resources/data/librecomponents/recipes/hard_drive_large.json b/src/main/resources/data/librecomponents/recipes/hard_drive_large.json new file mode 100644 index 0000000..03afa93 --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/hard_drive_large.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "DTD", + "EBE" + ], + "key": { + "D": { + "item": "librecomponents:hard_drive_medium" + }, + "T": { + "item": "oc2:transistor" + }, + "B": { + "item": "oc2:circuit_board" + }, + "E": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "librecomponents:hard_drive_large" + } +} diff --git a/src/main/resources/data/librecomponents/recipes/hard_drive_medium.json b/src/main/resources/data/librecomponents/recipes/hard_drive_medium.json new file mode 100644 index 0000000..107b083 --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/hard_drive_medium.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GTG", + "EBE" + ], + "key": { + "G": { + "item": "librecomponents:hard_drive_small" + }, + "T": { + "item": "oc2:transistor" + }, + "B": { + "item": "oc2:circuit_board" + }, + "E": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "librecomponents:hard_drive_medium" + } +} diff --git a/src/main/resources/data/librecomponents/recipes/hard_drive_small.json b/src/main/resources/data/librecomponents/recipes/hard_drive_small.json new file mode 100644 index 0000000..1268375 --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/hard_drive_small.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ITI", + "EBE" + ], + "key": { + "I": { + "item": "oc2:hard_drive_extra_large" + }, + "T": { + "item": "oc2:transistor" + }, + "B": { + "item": "oc2:circuit_board" + }, + "E": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "librecomponents:hard_drive_small" + } +} diff --git a/src/main/resources/data/librecomponents/recipes/memory_extra_large.json b/src/main/resources/data/librecomponents/recipes/memory_extra_large.json new file mode 100644 index 0000000..4fb29e3 --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/memory_extra_large.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "DTD", + "EBE", + "DTD" + ], + "key": { + "D": { + "item": "librecomponents:memory_large" + }, + "T": { + "item": "oc2:transistor" + }, + "B": { + "item": "oc2:circuit_board" + }, + "E": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "librecomponents:memory_extra_large" + } +} diff --git a/src/main/resources/data/librecomponents/recipes/memory_large.json b/src/main/resources/data/librecomponents/recipes/memory_large.json new file mode 100644 index 0000000..37bfda0 --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/memory_large.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "DTD", + " B " + ], + "key": { + "D": { + "item": "librecomponents:memory_medium" + }, + "T": { + "item": "oc2:transistor" + }, + "B": { + "item": "oc2:circuit_board" + } + }, + "result": { + "item": "librecomponents:memory_large" + } +} diff --git a/src/main/resources/data/librecomponents/recipes/memory_medium.json b/src/main/resources/data/librecomponents/recipes/memory_medium.json new file mode 100644 index 0000000..7dcd3c1 --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/memory_medium.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GTG", + " B " + ], + "key": { + "G": { + "item": "librecomponents:memory_small" + }, + "T": { + "item": "oc2:transistor" + }, + "B": { + "item": "oc2:circuit_board" + } + }, + "result": { + "item": "librecomponents:memory_medium" + } +} diff --git a/src/main/resources/data/librecomponents/recipes/memory_small.json b/src/main/resources/data/librecomponents/recipes/memory_small.json new file mode 100644 index 0000000..75cc02a --- /dev/null +++ b/src/main/resources/data/librecomponents/recipes/memory_small.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ITI", + " B " + ], + "key": { + "I": { + "item": "oc2:memory_extra_large" + }, + "T": { + "item": "oc2:transistor" + }, + "B": { + "item": "oc2:circuit_board" + } + }, + "result": { + "item": "librecomponents:memory_small" + } +} diff --git a/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json b/src/main/resources/data/oc2/tags/items/device_needs_reboot.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/device_needs_reboot.json rename to src/main/resources/data/oc2/tags/items/device_needs_reboot.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/cpu.json b/src/main/resources/data/oc2/tags/items/devices/cpu.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/cpu.json rename to src/main/resources/data/oc2/tags/items/devices/cpu.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/floppy.json b/src/main/resources/data/oc2/tags/items/devices/floppy.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/floppy.json rename to src/main/resources/data/oc2/tags/items/devices/floppy.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json b/src/main/resources/data/oc2/tags/items/devices/hard_drive.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/hard_drive.json rename to src/main/resources/data/oc2/tags/items/devices/hard_drive.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/memory.json b/src/main/resources/data/oc2/tags/items/devices/memory.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/memory.json rename to src/main/resources/data/oc2/tags/items/devices/memory.json