Fixed librecomponets for support for oc2r
|
|
@ -31,7 +31,7 @@ def getGitRef() {
|
||||||
}
|
}
|
||||||
|
|
||||||
version = "${semver}+${getGitRef()}"
|
version = "${semver}+${getGitRef()}"
|
||||||
group = "com.therealm18studios.librecomponents"
|
group = "com.therealm18studios.oc2rc"
|
||||||
|
|
||||||
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
|
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
|
||||||
|
|
||||||
|
|
@ -71,15 +71,19 @@ repositories {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
flatDir {
|
||||||
|
dirs("libs")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
|
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
|
||||||
annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
|
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:markdownmanual-502485:4873115")
|
||||||
implementation fg.deobf("curse.maven:architectury-api-419699:5137938")
|
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")
|
runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.3.0.4")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
BIN
libs/oc2r-1.20.1-forge-1.3.1+unknown-all.jar
Normal file
|
|
@ -1,20 +1,20 @@
|
||||||
package com.therealm18studios.lc;
|
package com.therealm18studios.oc2rc;
|
||||||
|
|
||||||
import com.therealm18studios.lc.common.item.ItemGroup;
|
import com.therealm18studios.oc2rc.common.item.ItemGroup;
|
||||||
import com.therealm18studios.lc.common.item.Items;
|
import com.therealm18studios.oc2rc.common.item.Items;
|
||||||
import com.therealm18studios.lc.manual.Manuals;
|
import com.therealm18studios.oc2rc.manual.Manuals;
|
||||||
import li.cil.oc2.common.ConfigManager;
|
import li.cil.oc2r.common.ConfigManager;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.fml.DistExecutor;
|
import net.minecraftforge.fml.DistExecutor;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||||
|
|
||||||
@Mod("librecomponents")
|
@Mod("oc2rc")
|
||||||
public final class LibreComponents {
|
public final class OC2RC {
|
||||||
|
|
||||||
public static String MOD_ID = "librecomponents";
|
public static String MOD_ID = "oc2rc";
|
||||||
|
|
||||||
public LibreComponents() {
|
public OC2RC() {
|
||||||
|
|
||||||
ConfigManager.initialize();
|
ConfigManager.initialize();
|
||||||
|
|
||||||
|
|
@ -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.core.registries.Registries;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.world.item.CreativeModeTab;
|
import net.minecraft.world.item.CreativeModeTab;
|
||||||
|
|
@ -9,12 +9,12 @@ import net.minecraftforge.registries.DeferredRegister;
|
||||||
import net.minecraftforge.registries.RegistryObject;
|
import net.minecraftforge.registries.RegistryObject;
|
||||||
|
|
||||||
public final class ItemGroup {
|
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")
|
@SuppressWarnings("unused")
|
||||||
public static final RegistryObject<CreativeModeTab> COMMON_TAB = TAB_REGISTER.register("common", () -> CreativeModeTab.builder()
|
public static final RegistryObject<CreativeModeTab> COMMON_TAB = TAB_REGISTER.register("common", () -> CreativeModeTab.builder()
|
||||||
// Set name of tab to display
|
// 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
|
// Set icon of creative tab
|
||||||
.icon(() -> new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()))
|
.icon(() -> new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()))
|
||||||
// Add default items to tab
|
// Add default items to tab
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package com.therealm18studios.lc.common.item;
|
package com.therealm18studios.oc2rc.common.item;
|
||||||
|
|
||||||
import com.therealm18studios.lc.LibreComponents;
|
import com.therealm18studios.oc2rc.OC2RC;
|
||||||
import li.cil.oc2.common.item.MemoryItem;
|
import li.cil.oc2r.common.item.MemoryItem;
|
||||||
import li.cil.oc2.common.item.HardDriveItem;
|
import li.cil.oc2r.common.item.HardDriveItem;
|
||||||
import li.cil.oc2.common.item.CPUItem;
|
import li.cil.oc2r.common.item.CPUItem;
|
||||||
import li.cil.oc2.common.item.FloppyItem;
|
import li.cil.oc2r.common.item.FloppyItem;
|
||||||
import net.minecraft.world.item.DyeColor;
|
import net.minecraft.world.item.DyeColor;
|
||||||
import net.minecraft.world.item.Item;
|
import net.minecraft.world.item.Item;
|
||||||
import net.minecraft.world.level.block.Block;
|
import net.minecraft.world.level.block.Block;
|
||||||
|
|
@ -17,7 +17,7 @@ import java.util.function.Function;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public final class Items {
|
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);
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package com.therealm18studios.lc.manual;
|
package com.therealm18studios.oc2rc.manual;
|
||||||
|
|
||||||
import com.therealm18studios.lc.LibreComponents;
|
import com.therealm18studios.oc2rc.OC2RC;
|
||||||
import com.therealm18studios.lc.common.item.Items;
|
import com.therealm18studios.oc2rc.common.item.Items;
|
||||||
import li.cil.manual.api.ManualModel;
|
import li.cil.manual.api.ManualModel;
|
||||||
import li.cil.manual.api.Tab;
|
import li.cil.manual.api.Tab;
|
||||||
import li.cil.manual.api.prefab.tab.ItemStackTab;
|
import li.cil.manual.api.prefab.tab.ItemStackTab;
|
||||||
|
|
@ -23,9 +23,9 @@ public final class Manuals {
|
||||||
public static void initialize() {
|
public static void initialize() {
|
||||||
TABS.register(FMLJavaModLoadingContext.get().getModEventBus());
|
TABS.register(FMLJavaModLoadingContext.get().getModEventBus());
|
||||||
|
|
||||||
TABS.register("librecomponents", () -> new ItemStackTab(
|
TABS.register("oc2rc", () -> new ItemStackTab(
|
||||||
ManualModel.LANGUAGE_KEY + "/librecomponents/index.md",
|
ManualModel.LANGUAGE_KEY + "/oc2rc/index.md",
|
||||||
Component.translatable("manual." + LibreComponents.MOD_ID + ".items"),
|
Component.translatable("manual." + OC2RC.MOD_ID + ".items"),
|
||||||
new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get())));
|
new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get())));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -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."
|
|
||||||
}
|
|
||||||
|
|
@ -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": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах."
|
|
||||||
}
|
|
||||||
|
|
@ -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."
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "minecraft:item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "librecomponents:item/floppy_base",
|
|
||||||
"layer1": "librecomponents:item/floppy_normal"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "minecraft:item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "librecomponents:item/floppy_base",
|
|
||||||
"layer1": "librecomponents:item/floppy_modern"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "minecraft:item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "librecomponents:item/hard_drive_base",
|
|
||||||
"layer1": "librecomponents:item/hard_drive_extra_large"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "minecraft:item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "librecomponents:item/hard_drive_base",
|
|
||||||
"layer1": "librecomponents:item/hard_drive_large"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "minecraft:item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "librecomponents:item/hard_drive_base",
|
|
||||||
"layer1": "librecomponents:item/hard_drive_medium"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "minecraft:item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "librecomponents:item/hard_drive_base",
|
|
||||||
"layer1": "librecomponents:item/hard_drive_small"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "minecraft:item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "librecomponents:item/memory_extra_large"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "minecraft:item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "librecomponents:item/memory_large"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "minecraft:item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "librecomponents:item/memory_medium"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "minecraft:item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "librecomponents:item/memory_small"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
18
src/main/resources/assets/oc2rc/lang/en_us.json
Normal 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."
|
||||||
|
}
|
||||||
20
src/main/resources/assets/oc2rc/lang/ru_ru.json
Normal 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": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах."
|
||||||
|
}
|
||||||
20
src/main/resources/assets/oc2rc/lang/zh_cn.json
Normal 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."
|
||||||
|
}
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"parent": "minecraft:item/generated",
|
"parent": "minecraft:item/generated",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0": "librecomponents:item/cpu_tier_1"
|
"layer0": "oc2rc:item/cpu_tier_1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"parent": "minecraft:item/generated",
|
"parent": "minecraft:item/generated",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0": "librecomponents:item/cpu_tier_2"
|
"layer0": "oc2rc:item/cpu_tier_2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"parent": "minecraft:item/generated",
|
"parent": "minecraft:item/generated",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0": "librecomponents:item/cpu_tier_3"
|
"layer0": "oc2rc:item/cpu_tier_3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"parent": "minecraft:item/generated",
|
"parent": "minecraft:item/generated",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0": "librecomponents:item/cpu_tier_4"
|
"layer0": "oc2rc:item/cpu_tier_4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
7
src/main/resources/assets/oc2rc/models/item/floppy.json
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "oc2rc:item/floppy_base",
|
||||||
|
"layer1": "oc2rc:item/floppy_normal"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "oc2rc:item/floppy_base",
|
||||||
|
"layer1": "oc2rc:item/floppy_modern"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "oc2rc:item/hard_drive_base",
|
||||||
|
"layer1": "oc2rc:item/hard_drive_extra_large"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "oc2rc:item/hard_drive_base",
|
||||||
|
"layer1": "oc2rc:item/hard_drive_large"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "oc2rc:item/hard_drive_base",
|
||||||
|
"layer1": "oc2rc:item/hard_drive_medium"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "oc2rc:item/hard_drive_base",
|
||||||
|
"layer1": "oc2rc:item/hard_drive_small"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "oc2rc:item/memory_extra_large"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "oc2rc:item/memory_large"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "oc2rc:item/memory_medium"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "oc2rc:item/memory_small"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Before Width: | Height: | Size: 325 B After Width: | Height: | Size: 325 B |
|
Before Width: | Height: | Size: 338 B After Width: | Height: | Size: 338 B |
|
Before Width: | Height: | Size: 338 B After Width: | Height: | Size: 338 B |
|
Before Width: | Height: | Size: 338 B After Width: | Height: | Size: 338 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 973 B After Width: | Height: | Size: 973 B |
|
Before Width: | Height: | Size: 973 B After Width: | Height: | Size: 973 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 365 B After Width: | Height: | Size: 365 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 974 B After Width: | Height: | Size: 974 B |
|
Before Width: | Height: | Size: 974 B After Width: | Height: | Size: 974 B |
|
Before Width: | Height: | Size: 974 B After Width: | Height: | Size: 974 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 974 B After Width: | Height: | Size: 974 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
|
@ -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"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
{
|
|
||||||
"replace": false,
|
|
||||||
"values": [
|
|
||||||
"librecomponents:cpu_tier_1",
|
|
||||||
"librecomponents:cpu_tier_2",
|
|
||||||
"librecomponents:cpu_tier_3",
|
|
||||||
"librecomponents:cpu_tier_4"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"replace": false,
|
|
||||||
"values": [
|
|
||||||
"librecomponents:floppy",
|
|
||||||
"librecomponents:floppy_modern"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
{
|
|
||||||
"replace": false,
|
|
||||||
"values": [
|
|
||||||
"librecomponents:hard_drive_small",
|
|
||||||
"librecomponents:hard_drive_medium",
|
|
||||||
"librecomponents:hard_drive_large",
|
|
||||||
"librecomponents:hard_drive_extra_large"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
{
|
|
||||||
"replace": false,
|
|
||||||
"values": [
|
|
||||||
"librecomponents:memory_small",
|
|
||||||
"librecomponents:memory_medium",
|
|
||||||
"librecomponents:memory_large",
|
|
||||||
"librecomponents:memory_extra_large"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
@ -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"
|
||||||
|
]
|
||||||
|
}
|
||||||
9
src/main/resources/data/oc2r/tags/items/devices/cpu.json
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"replace": false,
|
||||||
|
"values": [
|
||||||
|
"oc2rc:cpu_tier_1",
|
||||||
|
"oc2rc:cpu_tier_2",
|
||||||
|
"oc2rc:cpu_tier_3",
|
||||||
|
"oc2rc:cpu_tier_4"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"replace": false,
|
||||||
|
"values": [
|
||||||
|
"oc2rc:floppy",
|
||||||
|
"oc2rc:floppy_modern"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"replace": false,
|
||||||
|
"values": [
|
||||||
|
"oc2rc:hard_drive_small",
|
||||||
|
"oc2rc:hard_drive_medium",
|
||||||
|
"oc2rc:hard_drive_large",
|
||||||
|
"oc2rc:hard_drive_extra_large"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"replace": false,
|
||||||
|
"values": [
|
||||||
|
"oc2rc:memory_small",
|
||||||
|
"oc2rc:memory_medium",
|
||||||
|
"oc2rc:memory_large",
|
||||||
|
"oc2rc:memory_extra_large"
|
||||||
|
]
|
||||||
|
}
|
||||||