Fixed librecomponets for support for oc2r

This commit is contained in:
Robert MacRae 2025-03-28 11:30:23 -03:00
parent c544072916
commit 9c1fb8576d
98 changed files with 211 additions and 207 deletions

View file

@ -31,7 +31,7 @@ def getGitRef() {
}
version = "${semver}+${getGitRef()}"
group = "com.therealm18studios.librecomponents"
group = "com.therealm18studios.oc2rc"
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
@ -71,15 +71,19 @@ repositories {
}
}
}
flatDir {
dirs("libs")
}
}
dependencies {
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
implementation fileTree(dir: 'libs', include: '*.jar')
implementation fg.deobf("curse.maven:markdownmanual-502485:4873115")
implementation fg.deobf("curse.maven:architectury-api-419699:5137938")
implementation fg.deobf("curse.maven:libre-computers-1163239:6126363")
// implementation fg.deobf("curse.maven:libre-computers-1163239:6126363")
runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.3.0.4")
}

Binary file not shown.

View file

@ -1,20 +1,20 @@
package com.therealm18studios.lc;
package com.therealm18studios.oc2rc;
import com.therealm18studios.lc.common.item.ItemGroup;
import com.therealm18studios.lc.common.item.Items;
import com.therealm18studios.lc.manual.Manuals;
import li.cil.oc2.common.ConfigManager;
import com.therealm18studios.oc2rc.common.item.ItemGroup;
import com.therealm18studios.oc2rc.common.item.Items;
import com.therealm18studios.oc2rc.manual.Manuals;
import li.cil.oc2r.common.ConfigManager;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@Mod("librecomponents")
public final class LibreComponents {
@Mod("oc2rc")
public final class OC2RC {
public static String MOD_ID = "librecomponents";
public static String MOD_ID = "oc2rc";
public LibreComponents() {
public OC2RC() {
ConfigManager.initialize();

View file

@ -1,6 +1,6 @@
package com.therealm18studios.lc.common.item;
package com.therealm18studios.oc2rc.common.item;
import com.therealm18studios.lc.LibreComponents;
import com.therealm18studios.oc2rc.OC2RC;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.CreativeModeTab;
@ -9,12 +9,12 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.RegistryObject;
public final class ItemGroup {
public static final DeferredRegister<CreativeModeTab> TAB_REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, LibreComponents.MOD_ID);
public static final DeferredRegister<CreativeModeTab> TAB_REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, OC2RC.MOD_ID);
@SuppressWarnings("unused")
public static final RegistryObject<CreativeModeTab> COMMON_TAB = TAB_REGISTER.register("common", () -> CreativeModeTab.builder()
// Set name of tab to display
.title(Component.translatable("item_group." + LibreComponents.MOD_ID + ".common"))
.title(Component.translatable("item_group." + OC2RC.MOD_ID + ".common"))
// Set icon of creative tab
.icon(() -> new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()))
// Add default items to tab

View file

@ -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<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, LibreComponents.MOD_ID);
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OC2RC.MOD_ID);
///////////////////////////////////////////////////////////////////

View file

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

View file

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

View file

@ -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": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах."
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах."
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 325 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 338 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 338 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 338 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

View file

@ -1,17 +0,0 @@
{
"replace": false,
"values": [
"librecomponents:hard_drive_small",
"librecomponents:hard_drive_medium",
"librecomponents:hard_drive_large",
"librecomponents:hard_drive_extra_large",
"librecomponents:memory_small",
"librecomponents:memory_medium",
"librecomponents:memory_large",
"librecomponents:memory_extra_large",
"librecomponents:cpu_tier_1",
"librecomponents:cpu_tier_2",
"librecomponents:cpu_tier_3",
"librecomponents:cpu_tier_4"
]
}

View file

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

View file

@ -1,7 +0,0 @@
{
"replace": false,
"values": [
"librecomponents:floppy",
"librecomponents:floppy_modern"
]
}

View file

@ -1,9 +0,0 @@
{
"replace": false,
"values": [
"librecomponents:hard_drive_small",
"librecomponents:hard_drive_medium",
"librecomponents:hard_drive_large",
"librecomponents:hard_drive_extra_large"
]
}

View file

@ -1,9 +0,0 @@
{
"replace": false,
"values": [
"librecomponents:memory_small",
"librecomponents:memory_medium",
"librecomponents:memory_large",
"librecomponents:memory_extra_large"
]
}

View file

@ -0,0 +1,17 @@
{
"replace": false,
"values": [
"oc2rc:hard_drive_small",
"oc2rc:hard_drive_medium",
"oc2rc:hard_drive_large",
"oc2rc:hard_drive_extra_large",
"oc2rc:memory_small",
"oc2rc:memory_medium",
"oc2rc:memory_large",
"oc2rc:memory_extra_large",
"oc2rc:cpu_tier_1",
"oc2rc:cpu_tier_2",
"oc2rc:cpu_tier_3",
"oc2rc:cpu_tier_4"
]
}

View file

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

View file

@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"oc2rc:floppy",
"oc2rc:floppy_modern"
]
}

View file

@ -0,0 +1,9 @@
{
"replace": false,
"values": [
"oc2rc:hard_drive_small",
"oc2rc:hard_drive_medium",
"oc2rc:hard_drive_large",
"oc2rc:hard_drive_extra_large"
]
}

View file

@ -0,0 +1,9 @@
{
"replace": false,
"values": [
"oc2rc:memory_small",
"oc2rc:memory_medium",
"oc2rc:memory_large",
"oc2rc:memory_extra_large"
]
}