BirDt/oc2r-low-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

now with recipes + removed oc2r support for lc support instead

Browse source
This commit is contained in:
Robert MacRae 2025-01-25 19:30:07 -04:00
parent 06a0ff2060
commit b8ade187e0
35 changed files with 827 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

60
build.gradle
View file

@ -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")

2
src/main/java/com/therealm18studios/lc/LibreComponents.java
View file

@ -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;

2
src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java
View file

@ -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

2
src/main/java/com/therealm18studios/lc/common/item/Items.java
View file

@ -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;

2
src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java
View file

@ -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;

8
src/main/resources/META-INF/mods.toml
View file

@ -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"

34
src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy.json Normal file
View file

@ -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"
]
]
}

34
src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/floppy_modern.json Normal file
View file

@ -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"
]
]
}

47
src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_extra_large.json Normal file
View file

@ -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"
]
]
}

47
src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_large.json Normal file
View file

@ -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"
]
]
}

47
src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_medium.json Normal file
View file

@ -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"
]
]
}

47
src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/hard_drive_small.json Normal file
View file

@ -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"
]
]
}

47
src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_extra_large.json Normal file
View file

@ -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"
]
]
}

47
src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_large.json Normal file
View file

@ -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"
]
]
}

47
src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_medium.json Normal file
View file

@ -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"
]
]
}

47
src/main/resources/data/librecomponents/advancements/recipes/librecomponents.common/memory_small.json Normal file
View file

@ -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"
]
]
}

28
src/main/resources/data/librecomponents/recipes/cpu_tier_1.json Normal file
View file

@ -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"
}
}

28
src/main/resources/data/librecomponents/recipes/cpu_tier_2.json Normal file
View file

@ -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"
}
}

28
src/main/resources/data/librecomponents/recipes/cpu_tier_3.json Normal file
View file

@ -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"
}
}

28
src/main/resources/data/librecomponents/recipes/cpu_tier_4.json Normal file
View file

@ -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"
}
}

24
src/main/resources/data/librecomponents/recipes/floppy.json Normal file
View file

@ -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"
}
}

25
src/main/resources/data/librecomponents/recipes/floppy_modern.json Normal file
View file

@ -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"
}
}

25
src/main/resources/data/librecomponents/recipes/hard_drive_extra_large.json Normal file
View file

@ -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"
}
}

24
src/main/resources/data/librecomponents/recipes/hard_drive_large.json Normal file
View file

@ -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"
}
}

24
src/main/resources/data/librecomponents/recipes/hard_drive_medium.json Normal file
View file

@ -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"
}
}

24
src/main/resources/data/librecomponents/recipes/hard_drive_small.json Normal file
View file

@ -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"
}
}

25
src/main/resources/data/librecomponents/recipes/memory_extra_large.json Normal file
View file

@ -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"
}
}

21
src/main/resources/data/librecomponents/recipes/memory_large.json Normal file
View file

@ -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"
}
}

21
src/main/resources/data/librecomponents/recipes/memory_medium.json Normal file
View file

@ -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"
}
}

21
src/main/resources/data/librecomponents/recipes/memory_small.json Normal file
View file

@ -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"
}
}

0
src/main/resources/data/oc2r/tags/items/device_needs_reboot.json → src/main/resources/data/oc2/tags/items/device_needs_reboot.json
View file

0
src/main/resources/data/oc2r/tags/items/devices/cpu.json → src/main/resources/data/oc2/tags/items/devices/cpu.json
View file

0
src/main/resources/data/oc2r/tags/items/devices/floppy.json → src/main/resources/data/oc2/tags/items/devices/floppy.json
View file

0
src/main/resources/data/oc2r/tags/items/devices/hard_drive.json → src/main/resources/data/oc2/tags/items/devices/hard_drive.json
View file

0
src/main/resources/data/oc2r/tags/items/devices/memory.json → src/main/resources/data/oc2/tags/items/devices/memory.json
View file