From 06a0ff2060479f6acf8281ef442dd4bed7215a1b Mon Sep 17 00:00:00 2001 From: TheRealM18 Date: Sun, 21 Jul 2024 21:14:33 -0300 Subject: [PATCH] init commit of working things --- .editorconfig | 24 + .gitattributes | 8 + .gitignore | 38 ++ LICENSE | 29 ++ LICENSE-JCODEC | 21 + README.md | 38 ++ build.gradle | 240 ++++++++++ changelog.md | 1 + gradle.properties | 20 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 234 ++++++++++ gradlew.bat | 89 ++++ minecraft.gradle | 4 + settings.gradle | 27 ++ .../therealm18studios/lc/LibreComponents.java | 21 + .../lc/common/item/ItemGroup.java | 40 ++ .../lc/common/item/Items.java | 91 ++++ .../lc/data/DataGenerators.java | 33 ++ .../lc/data/ModItemModelProvider.java | 55 +++ .../lc/data/ModRecipesProvider.java | 441 ++++++++++++++++++ src/main/resources/META-INF/mods.toml | 38 ++ .../assets/librecomponents/lang/en_us.json | 16 + .../assets/librecomponents/lang/ru_ru.json | 20 + .../assets/librecomponents/lang/zh_cn.json | 20 + .../models/item/cpu_tier_1.json | 6 + .../models/item/cpu_tier_2.json | 6 + .../models/item/cpu_tier_3.json | 6 + .../models/item/cpu_tier_4.json | 6 + .../librecomponents/models/item/floppy.json | 7 + .../models/item/floppy_modern.json | 7 + .../models/item/hard_drive_extra_large.json | 7 + .../models/item/hard_drive_large.json | 7 + .../models/item/hard_drive_medium.json | 7 + .../models/item/hard_drive_small.json | 7 + .../models/item/memory_extra_large.json | 6 + .../models/item/memory_large.json | 6 + .../models/item/memory_medium.json | 6 + .../models/item/memory_small.json | 6 + .../textures/item/cpu_tier_1.png | Bin 0 -> 325 bytes .../textures/item/cpu_tier_2.png | Bin 0 -> 338 bytes .../textures/item/cpu_tier_3.png | Bin 0 -> 338 bytes .../textures/item/cpu_tier_4.png | Bin 0 -> 338 bytes .../textures/item/floppy_base.png | Bin 0 -> 2175 bytes .../textures/item/floppy_slot.png | Bin 0 -> 1910 bytes .../textures/item/floppy_tint.png | Bin 0 -> 2349 bytes .../textures/item/hard_disk_platter.png | Bin 0 -> 365 bytes .../textures/item/hard_drive_base.png | Bin 0 -> 2103 bytes .../textures/item/hard_drive_slot.png | Bin 0 -> 1923 bytes .../textures/item/hard_drive_tint.png | Bin 0 -> 2175 bytes .../textures/item/memory_extra_large.png | Bin 0 -> 1951 bytes .../textures/item/memory_large.png | Bin 0 -> 2106 bytes .../textures/item/memory_medium.png | Bin 0 -> 2303 bytes .../textures/item/memory_slot.png | Bin 0 -> 1952 bytes .../textures/item/memory_small.png | Bin 0 -> 2271 bytes .../oc2r/tags/items/device_needs_reboot.json | 17 + .../data/oc2r/tags/items/devices/cpu.json | 9 + .../data/oc2r/tags/items/devices/floppy.json | 7 + .../oc2r/tags/items/devices/hard_drive.json | 9 + .../data/oc2r/tags/items/devices/memory.json | 9 + src/main/resources/mixins.ld.json | 14 + src/main/resources/pack.mcmeta | 6 + temp.github/ISSUE_TEMPLATE/bug_report.md | 45 ++ temp.github/ISSUE_TEMPLATE/feature_request.md | 20 + temp.github/workflows/build.yml | 37 ++ temp.github/workflows/publish.yml | 101 ++++ 66 files changed, 1917 insertions(+) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 LICENSE-JCODEC create mode 100644 README.md create mode 100644 build.gradle create mode 100644 changelog.md create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 minecraft.gradle create mode 100644 settings.gradle create mode 100644 src/main/java/com/therealm18studios/lc/LibreComponents.java create mode 100644 src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java create mode 100644 src/main/java/com/therealm18studios/lc/common/item/Items.java create mode 100644 src/main/java/com/therealm18studios/lc/data/DataGenerators.java create mode 100644 src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java create mode 100644 src/main/java/com/therealm18studios/lc/data/ModRecipesProvider.java create mode 100644 src/main/resources/META-INF/mods.toml create mode 100644 src/main/resources/assets/librecomponents/lang/en_us.json create mode 100644 src/main/resources/assets/librecomponents/lang/ru_ru.json create mode 100644 src/main/resources/assets/librecomponents/lang/zh_cn.json create mode 100644 src/main/resources/assets/librecomponents/models/item/cpu_tier_1.json create mode 100644 src/main/resources/assets/librecomponents/models/item/cpu_tier_2.json create mode 100644 src/main/resources/assets/librecomponents/models/item/cpu_tier_3.json create mode 100644 src/main/resources/assets/librecomponents/models/item/cpu_tier_4.json create mode 100644 src/main/resources/assets/librecomponents/models/item/floppy.json create mode 100644 src/main/resources/assets/librecomponents/models/item/floppy_modern.json create mode 100644 src/main/resources/assets/librecomponents/models/item/hard_drive_extra_large.json create mode 100644 src/main/resources/assets/librecomponents/models/item/hard_drive_large.json create mode 100644 src/main/resources/assets/librecomponents/models/item/hard_drive_medium.json create mode 100644 src/main/resources/assets/librecomponents/models/item/hard_drive_small.json create mode 100644 src/main/resources/assets/librecomponents/models/item/memory_extra_large.json create mode 100644 src/main/resources/assets/librecomponents/models/item/memory_large.json create mode 100644 src/main/resources/assets/librecomponents/models/item/memory_medium.json create mode 100644 src/main/resources/assets/librecomponents/models/item/memory_small.json create mode 100644 src/main/resources/assets/librecomponents/textures/item/cpu_tier_1.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/cpu_tier_2.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/cpu_tier_3.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/cpu_tier_4.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/floppy_base.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/floppy_slot.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/floppy_tint.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/hard_disk_platter.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/hard_drive_base.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/hard_drive_slot.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/hard_drive_tint.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/memory_extra_large.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/memory_large.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/memory_medium.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/memory_slot.png create mode 100644 src/main/resources/assets/librecomponents/textures/item/memory_small.png create mode 100644 src/main/resources/data/oc2r/tags/items/device_needs_reboot.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/cpu.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/floppy.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/hard_drive.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/memory.json create mode 100644 src/main/resources/mixins.ld.json create mode 100644 src/main/resources/pack.mcmeta create mode 100644 temp.github/ISSUE_TEMPLATE/bug_report.md create mode 100644 temp.github/ISSUE_TEMPLATE/feature_request.md create mode 100644 temp.github/workflows/build.yml create mode 100644 temp.github/workflows/publish.yml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..f57af0c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,24 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 4 +insert_final_newline = true + +[*.java] +trim_trailing_whitespace = true +max_line_length = 120 +ij_java_generate_final_locals = true +ij_java_generate_final_parameters = true + +[*.yml] +indent_size = 2 +tab_width = 2 + +[*.properties] +ij_properties_keep_blank_lines = true + +[*.json] +indent_size = 2 +tab_width = 2 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..4876553 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/cache text eol=lf +src/generated/**/*.json text eol=lf + +# Files provided to VM. +src/main/scripts/**/*.lua text eol=lf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..69022a7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +#system +.DS_Store + +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run +runclient +logs +/assets/ + +# Files from Forge MDK +forge*changelog.txt +/src/generated/ + +#vscode +.vscode + +# Don't ignore bin from scripts +!/src/main/scripts/bin/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c8f3b7e --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +MIT License + +Copyright (c) 2020-2021 Florian "Sangar" Nücke + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +------------------------------------------------------------------------------- + +All images / textures and localization strings (resources) are put in the +public domain, unless explicitly excluded below. More specifically, see CC0 1.0 +Universal: + + http://creativecommons.org/publicdomain/zero/1.0/ diff --git a/LICENSE-JCODEC b/LICENSE-JCODEC new file mode 100644 index 0000000..85cf456 --- /dev/null +++ b/LICENSE-JCODEC @@ -0,0 +1,21 @@ +Copyright 2008-2019 JCodecProject + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. Redistributions in binary form +must reproduce the above copyright notice, this list of conditions and the +following disclaimer in the documentation and/or other materials provided with +the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..59d870c --- /dev/null +++ b/README.md @@ -0,0 +1,38 @@ +# OpenComputers II: Reimagined + +[Searching for an Artist](#artists) + +*OpenComputers II: Reimagined* is a Minecraft mod adding virtual computers to the game. It is a fork of the mod originally made by [Sangar (fnuecke)], this fork is maintained North Western Development. These computers run a virtual machine emulating a 64-Bit RISC-V architecture capable of booting Linux. On top of this, a high-level Lua API is provided to communicate with various devices in the game world. This enables adding virtual devices using a simple, Java-friendly API, without having to implement actual kernel drivers. + +The original mod was a successor to [OpenComputers]. At least in spirit. While many of the implementation details have changed quite dramatically, the core concepts of customizable hardware, persistence and sand-boxing are shared. + +The underlying VM, which is written entirely in Java, is called [Sedna] and was written by [Sangar (fnuecke)] as well. + +## Artists + +We are looking for artists to assist with models and textures going forward. Artists will be entitled to a negotiated percentage of CurseForge rewards or any other donation platforms that may be employed. Artists will also receive special credits throughout the mod and it's repos. + +## Why the Fork? + +*OpenComputers II: Reimagined* aims to fix bugs with OC2 while adding new features and attempting to keep up with the latest popular versions of Minecraft. We did attempt to reach [Sangar (fnuecke)] on Twitter but got no response, so we've decided to continue with the fork and release separately on Curse under a new name. +The name change is simply an attempt to ensure it is well known that [Sangar (fnuecke)] is not responsible for this version, so they're not blasted with issues from it. We will be doing everything we can to ensure [Sangar (fnuecke)] does still get the credit they deserve for the mod though. + +## Gameplay Documentation +For documentation on how the to get computers up and running, and how to use them, see the [documentation]. It is available as a manual item in the game. + +## Development Documentation +The original section that was found here is preserved below, however it should be taken with a grain of salt as the current team has a ways to go in being 100% up to speed with where the device APIs are at the moment. So everything below is subject to change, though it is likely to remain mostly the same. + +~~While the mod isn't quite yet ready for release due to some remaining technical and usability issues, the API should be mostly stable at this point. For most people the high level device API will be sufficient, and is much more accessible. It centers around the [`RPCDevice`][RPC Device]. For a sample block implementation, see the [redstone interface]. For a sample item implementation, see the [sound card]. If you wish to dive deeper, and provide emulated hardware that requires a Linux driver, this centers around the [`VMDevice`][VM Device]. For a sample block implementation, see the [disk drive]. For a sample item implementation, see the [network card].~~ + +[OpenComputers]: https://github.com/MightyPirates/OpenComputers +[RPC Device]: src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java +[redstone interface]: src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java +[sound card]: src/main/java/li/cil/oc2r/common/bus/device/rpc/item/SoundCardItemDevice.java +[VM Device]: src/main/java/li/cil/oc2r/api/bus/device/vm/VMDevice.java +[disk drive]: src/main/java/li/cil/oc2r/common/blockentity/DiskDriveBlockEntity.java +[network card]: src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkInterfaceCardDevice.java +[documentation]: src/main/resources/assets/oc2r/doc/en_us/index.md +[GithubPackagesGradle]: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry +[Sangar (fnuecke)]: https://github.com/fnuecke +[Sedna]: https://github.com/fnuecke/sedna diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..5bb6bed --- /dev/null +++ b/build.gradle @@ -0,0 +1,240 @@ +plugins { + id "idea" + id "maven-publish" + id 'net.minecraftforge.gradle' version '[6.0,6.2)' + id "com.matthewprenger.cursegradle" version "1.4.0" + id 'org.spongepowered.mixin' version '0.7.+' +} + +apply plugin: 'org.spongepowered.mixin' +apply from: "minecraft.gradle" + +allprojects { + gradle.projectsEvaluated { + tasks.withType(JavaCompile) { + options.compilerArgs << "-Xmaxerrs" << "1000" + } + } +} + +def getGitRef() { + try { + final def stdout = new ByteArrayOutputStream() + exec { + commandLine "git", "rev-parse", "--short", "HEAD" + standardOutput = stdout + } + return stdout.toString().trim() + } catch (final Throwable ignored) { + return "unknown" + } +} + +version = "${semver}+${getGitRef()}" +group = "li.cil.oc2r" + +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +tasks.withType(JavaCompile).configureEach { + options.encoding = "utf-8" +} + +final def hasGithubPackageCredentials = + (project.hasProperty("gpr.user") && project.hasProperty("gpr.key")) || + (System.getenv("GITHUB_ACTOR") && System.getenv("GITHUB_TOKEN")) + +repositories { + mavenCentral() + maven { + url "https://cursemaven.com" + } + maven { + // location of the maven that hosts JEI files since January 2023 + name = "Jared's maven" + url = "https://maven.blamejared.com/" + } + maven { url = "https://proxy-maven.covers1624.net/" } + if (hasGithubPackageCredentials) { + final def GithubPackages = [ + ["fnuecke/ceres", "li.cil.ceres"], + ["fnuecke/sedna", "li.cil.sedna"], + ["fnuecke/buildroot", "li.cil.sedna"] + ] + GithubPackages.each { final repo, final group -> + maven { + url = uri("https://maven.pkg.github.com/${repo}") + credentials { + username = project.findProperty("gpr.user") ?: System.getenv("GPR_USER") + password = project.findProperty("gpr.key") ?: System.getenv("GPR_KEY") + } + content { includeGroup group } + } + } + } +} + +dependencies { + minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + annotationProcessor "org.spongepowered:mixin:0.8.5:processor" + + // Specify the libs embedded in the library mod explicitly for local development, where + // 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" + + implementation fg.deobf("curse.maven:markdownmanual-502485:4873115") + implementation fg.deobf("curse.maven:architectury-api-419699:5137938") + + compileOnly fg.deobf("mezz.jei:jei-1.20.1-common-api:15.3.0.4") + compileOnly fg.deobf("mezz.jei:jei-1.20.1-forge-api:15.3.0.4") + + 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") + + 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_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") +} + +System.setProperty("line.separator", "\n") + +minecraft { + mappings channel: "official", version: minecraft_version + + runs { + all { + property "forge.logging.markers", "REGISTRIES" + property "forge.logging.console.level", "debug" + + mods { + librecomponents { + source sourceSets.main + } + } + } + + client { + workingDirectory project.file("runclient") + property "forge.enabledGameTestNamespaces", "librecomponents" + } + + server { + workingDirectory project.file("run") + property "forge.enabledGameTestNamespaces", "librecomponents" + arg "--nogui" + } + + gameTestServer { + workingDirectory project.file('run') + property "forge.enabledGameTestNamespaces", "librecomponents" + } + + data { + workingDirectory project.file("run") + args "--mod", "librecomponents", "--all", "--output", file("src/generated/resources/"), "--existing", file("src/main/resources") + } + } +} + +task copyGeneratedResources(type: Copy) { + from "src/generated" + into "src/main" + exclude "resources/.cache" +} + +jar { + finalizedBy "reobfJar" + + manifest { + attributes([ + "FMLAT" : "accesstransformer.cfg", + "Specification-Title" : "librecomponents", + "Specification-Vendor" : "The Realm 18 Studios", + "Specification-Version" : "1", + "Implementation-Title" : project.name, + "Implementation-Version" : "${semver}", + "Implementation-Vendor" : "The Realm 18 Studios", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + "MixinConfigs" : "mixins.ld.json", + "ContainedDeps" : "commons-collections4-4.4.jar" + ]) + } +} + +publishing { + publications { + mavenJava(MavenPublication) { + groupId = project.group + artifactId = project.name + version = semver + artifact jar + } + } + repositories { + maven { + name = "GitHubPackages" + url = System.getenv("GITHUB_MAVEN_URL") ?: "" + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } +} +// +//curseforge { +// apiKey = System.getenv("CURSEFORGE_API_KEY") ?: "" +// project { +// id = curse_project_id +// releaseType = System.getenv('CURSEFORGE_RELEASE_TYPE') ?: "alpha" +// changelogType = 'markdown' +// changelog = System.getenv("CHANGELOG") ?: "Changelog not available." +// addGameVersion "Forge" +// addGameVersion minecraft_version +// addGameVersion "Java 17" +// relations { +// requiredDependency "markdownmanual" +// requiredDependency "sedna" +// } +// } +//} + +idea { + module { + for (final String exclude in ["assets", "run", "out", "logs", "src/generated"]) { + excludeDirs += file(exclude) + } + } +} + +test { + useJUnitPlatform() +} diff --git a/changelog.md b/changelog.md new file mode 100644 index 0000000..2472727 --- /dev/null +++ b/changelog.md @@ -0,0 +1 @@ +* Initial release. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..a50cc75 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,20 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false + +forge_version=47.2.32 + +semver=1.1.0 + +# curse_project_id=1037738 + +pr_version=4.19.0-beta+3 +ccl_version=4.4.0.+ +cbm_version=3.3.0.+ + +debug_embeddium=false + +debug_embeddium_plus_plus=false + +debug_oculus=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..48c0a02 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/minecraft.gradle b/minecraft.gradle new file mode 100644 index 0000000..073b468 --- /dev/null +++ b/minecraft.gradle @@ -0,0 +1,4 @@ +ext { + minecraft_version = '1.20.1' + minecraft_sdk = 'forge' +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..07e5b02 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,27 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { url = 'https://maven.minecraftforge.net/' } + maven { url "https://repo.spongepowered.org/repository/maven-public/" } + } +} + +apply from: 'minecraft.gradle' +rootProject.name = "librecomponents-${minecraft_version}-${minecraft_sdk}" + +def substituteLocal(final directoryName, final libraryName) { + final def path = new File("../${directoryName}"); + if (path.exists()) { + println("Found local [${directoryName}] project, substituting...") + includeBuild(path) { + dependencySubstitution { + substitute module(libraryName) using project(':') + } + } + } +} + +substituteLocal('sedna-mc', 'curse.maven:sedna-511276') +substituteLocal('ceres', 'li.cil.ceres:ceres') +substituteLocal('sedna', 'li.cil.sedna:sedna') +substituteLocal('buildroot', 'li.cil.sedna:sedna-buildroot') diff --git a/src/main/java/com/therealm18studios/lc/LibreComponents.java b/src/main/java/com/therealm18studios/lc/LibreComponents.java new file mode 100644 index 0000000..1bc07a3 --- /dev/null +++ b/src/main/java/com/therealm18studios/lc/LibreComponents.java @@ -0,0 +1,21 @@ +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 net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; + +@Mod("librecomponents") +public final class LibreComponents { + + public static String MOD_ID = "librecomponents"; + + public LibreComponents() { + + ConfigManager.initialize(); + + Items.initialize(); + ItemGroup.TAB_REGISTER.register(FMLJavaModLoadingContext.get().getModEventBus()); + } +} diff --git a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java b/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java new file mode 100644 index 0000000..4d47dac --- /dev/null +++ b/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java @@ -0,0 +1,40 @@ +package com.therealm18studios.lc.common.item; + +import com.therealm18studios.lc.LibreComponents; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.RegistryObject; + +public final class ItemGroup { + public static final DeferredRegister TAB_REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, LibreComponents.MOD_ID); + + @SuppressWarnings("unused") + public static final RegistryObject COMMON_TAB = TAB_REGISTER.register("common", () -> CreativeModeTab.builder() + // Set name of tab to display + .title(Component.translatable("item_group." + LibreComponents.MOD_ID + ".common")) + // Set icon of creative tab + .icon(() -> new ItemStack(li.cil.oc2r.common.item.Items.COMPUTER.get())) + // Add default items to tab + .displayItems((params, output) -> { + // Items + output.accept(Items.MEMORY_SMALL.get()); + output.accept(Items.MEMORY_MEDIUM.get()); + output.accept(Items.MEMORY_LARGE.get()); + output.accept(Items.MEMORY_EXTRA_LARGE.get()); + output.accept(Items.HARD_DRIVE_SMALL.get()); + output.accept(Items.HARD_DRIVE_MEDIUM.get()); + output.accept(Items.HARD_DRIVE_LARGE.get()); + output.accept(Items.HARD_DRIVE_EXTRA_LARGE.get()); + output.accept(Items.CPU_TIER_1.get()); + output.accept(Items.CPU_TIER_2.get()); + output.accept(Items.CPU_TIER_3.get()); + output.accept(Items.CPU_TIER_4.get()); + output.accept(Items.FLOPPY.get()); + output.accept(Items.FLOPPY_MODERN.get()); + }) + .build() + ); +} diff --git a/src/main/java/com/therealm18studios/lc/common/item/Items.java b/src/main/java/com/therealm18studios/lc/common/item/Items.java new file mode 100644 index 0000000..8db0133 --- /dev/null +++ b/src/main/java/com/therealm18studios/lc/common/item/Items.java @@ -0,0 +1,91 @@ +package com.therealm18studios.lc.common.item; + +import com.therealm18studios.lc.LibreComponents; +import li.cil.oc2r.common.item.*; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Item; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +import java.util.function.Supplier; + +public final class Items { + private static final DeferredRegister ITEMS; + public static final RegistryObject MEMORY_SMALL; + public static final RegistryObject MEMORY_MEDIUM; + public static final RegistryObject MEMORY_LARGE; + public static final RegistryObject MEMORY_EXTRA_LARGE; + public static final RegistryObject HARD_DRIVE_SMALL; + public static final RegistryObject HARD_DRIVE_MEDIUM; + public static final RegistryObject HARD_DRIVE_LARGE; + public static final RegistryObject HARD_DRIVE_EXTRA_LARGE; + public static final RegistryObject CPU_TIER_1; + public static final RegistryObject CPU_TIER_2; + public static final RegistryObject CPU_TIER_3; + public static final RegistryObject CPU_TIER_4; + public static final RegistryObject FLOPPY; + public static final RegistryObject FLOPPY_MODERN; + + public Items() { + } + + public static void initialize() { + ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus()); + } + + private static RegistryObject register(String name) { + return register(name, ModItem::new); + } + + private static RegistryObject register(String name, Supplier factory) { + return ITEMS.register(name, factory); + } + + static { + ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, LibreComponents.MOD_ID); + MEMORY_SMALL = register("memory_small", () -> { + return new MemoryItem(33554432); + }); + MEMORY_MEDIUM = register("memory_medium", () -> { + return new MemoryItem(67108864); + }); + MEMORY_LARGE = register("memory_large", () -> { + return new MemoryItem(134217728); + }); + MEMORY_EXTRA_LARGE = register("memory_extra_large", () -> { + return new MemoryItem(268435456); + }); + HARD_DRIVE_SMALL = register("hard_drive_small", () -> { + return new HardDriveItem(33554432, DyeColor.PINK); + }); + HARD_DRIVE_MEDIUM = register("hard_drive_medium", () -> { + return new HardDriveItem(67108864, DyeColor.RED); + }); + HARD_DRIVE_LARGE = register("hard_drive_large", () -> { + return new HardDriveItem(134217728, DyeColor.BLUE); + }); + HARD_DRIVE_EXTRA_LARGE = register("hard_drive_extra_large", () -> { + return new HardDriveItem(268435456, DyeColor.BLACK); + }); + CPU_TIER_1 = register("cpu_tier_1", () -> { + return new CPUItem(250000000); + }); + CPU_TIER_2 = register("cpu_tier_2", () -> { + return new CPUItem(300000000); + }); + CPU_TIER_3 = register("cpu_tier_3", () -> { + return new CPUItem(350000000); + }); + CPU_TIER_4 = register("cpu_tier_4", () -> { + return new CPUItem(400000000); + }); + FLOPPY = register("floppy", () -> { + return new FloppyItem(2949120); + }); + FLOPPY_MODERN = register("floppy_modern", () -> { + return new FloppyItem(5898240); + }); + } +} diff --git a/src/main/java/com/therealm18studios/lc/data/DataGenerators.java b/src/main/java/com/therealm18studios/lc/data/DataGenerators.java new file mode 100644 index 0000000..61b7444 --- /dev/null +++ b/src/main/java/com/therealm18studios/lc/data/DataGenerators.java @@ -0,0 +1,33 @@ +package com.therealm18studios.lc.data; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.DataProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.data.event.GatherDataEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +public final class DataGenerators { + @SubscribeEvent + public static void gatherData(final GatherDataEvent event) { + final DataGenerator generator = event.getGenerator(); + final ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); + +// generator.addProvider( +// event.includeServer(), +// (DataProvider.Factory) output -> new LootTableProvider( +// output, +// Set.of(), +// Collections.singletonList( +// new LootTableProvider.SubProviderEntry( +// ModLootTableProvider.ModBlockLootTables::new, +// LootContextParamSets.BLOCK +// ) +// ) +// ) +// ); + generator.addProvider(event.includeServer(), (DataProvider.Factory) ModRecipesProvider::new); + generator.addProvider(event.includeClient(), new ModItemModelProvider(generator.getPackOutput(), existingFileHelper)); + } +} diff --git a/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java b/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java new file mode 100644 index 0000000..05505af --- /dev/null +++ b/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java @@ -0,0 +1,55 @@ +package com.therealm18studios.lc.data; + +import com.therealm18studios.lc.LibreComponents; +import li.cil.oc2r.common.entity.Entities; +import com.therealm18studios.lc.common.item.Items; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraftforge.client.model.generators.ItemModelBuilder; +import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.registries.RegistryObject; + +public final class ModItemModelProvider extends ItemModelProvider { + public ModItemModelProvider(final PackOutput output, final ExistingFileHelper existingFileHelper) { + super(output, LibreComponents.MOD_ID, existingFileHelper); + } + + @Override + protected void registerModels() { + simple(Items.MEMORY_SMALL); + simple(Items.MEMORY_MEDIUM); + simple(Items.MEMORY_LARGE); + simple(Items.MEMORY_EXTRA_LARGE); + simple(Items.CPU_TIER_1); + simple(Items.CPU_TIER_2); + simple(Items.CPU_TIER_3); + simple(Items.CPU_TIER_4); + simple(Items.HARD_DRIVE_SMALL, "item/hard_drive_base") + .texture("layer1", "item/hard_drive_tint"); + simple(Items.HARD_DRIVE_MEDIUM, "item/hard_drive_base") + .texture("layer1", "item/hard_drive_tint"); + simple(Items.HARD_DRIVE_LARGE, "item/hard_drive_base") + .texture("layer1", "item/hard_drive_tint"); + simple(Items.HARD_DRIVE_EXTRA_LARGE, "item/hard_drive_base") + .texture("layer1", "item/hard_drive_tint"); + simple(Items.FLOPPY, "item/floppy_base") + .texture("layer1", "item/floppy_tint"); + simple(Items.FLOPPY_MODERN, "item/floppy_base") + .texture("layer1", "item/floppy_tint"); + + withExistingParent(Entities.ROBOT.getId().getPath(), "template_shulker_box"); + } + + private void simple(final RegistryObject item) { + simple(item, "item/" + item.getId().getPath()); + } + + private ItemModelBuilder simple(final RegistryObject item, final String texturePath) { + return singleTexture(item.getId().getPath(), + new ResourceLocation("item/generated"), + "layer0", + new ResourceLocation(LibreComponents.MOD_ID, texturePath)); + } +} diff --git a/src/main/java/com/therealm18studios/lc/data/ModRecipesProvider.java b/src/main/java/com/therealm18studios/lc/data/ModRecipesProvider.java new file mode 100644 index 0000000..24136cf --- /dev/null +++ b/src/main/java/com/therealm18studios/lc/data/ModRecipesProvider.java @@ -0,0 +1,441 @@ +package com.therealm18studios.lc.data; + +import com.therealm18studios.lc.common.item.Items; +import net.minecraft.advancements.critereon.InventoryChangeTrigger; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.*; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.level.ItemLike; +import net.minecraftforge.common.Tags; + +import java.util.function.Consumer; + +public final class ModRecipesProvider extends RecipeProvider { + public ModRecipesProvider(final PackOutput output) { + super(output); + } + + @Override + protected void buildRecipes(final Consumer consumer) { +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.COMPUTER.get()) +// .pattern("ICI") +// .pattern("XTX") +// .pattern("IBI") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('C', Tags.Items.CHESTS_WOODEN) +// .define('X', Items.BUS_INTERFACE.get()) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) +// .unlockedBy("has_circuit_board", inventoryChange(Items.CIRCUIT_BOARD.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.BUS_CABLE.get(), 16) +// .pattern("III") +// .pattern("GTG") +// .pattern("III") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('G', Tags.Items.INGOTS_GOLD) +// .define('T', Items.TRANSISTOR.get()) +// .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) +// .save(consumer); +// +// ShapelessRecipeBuilder +// .shapeless(RecipeCategory.MISC, Items.BUS_INTERFACE.get()) +// .requires(Items.TRANSISTOR.get()) +// .requires(Items.BUS_CABLE.get()) +// .unlockedBy("has_bus_cable", inventoryChange(Items.BUS_CABLE.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.NETWORK_CONNECTOR.get(), 4) +// .pattern("IGI") +// .pattern("ITI") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('G', Tags.Items.GLASS) +// .define('T', Items.TRANSISTOR.get()) +// .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.NETWORK_HUB.get()) +// .pattern("ICI") +// .pattern("XTX") +// .pattern("IBI") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('C', Items.NETWORK_CONNECTOR.get()) +// .define('X', Items.BUS_INTERFACE.get()) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_network_connector", inventoryChange(Items.NETWORK_CONNECTOR.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.REDSTONE_INTERFACE.get()) +// .pattern("ICI") +// .pattern("XTX") +// .pattern("IBI") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('C', net.minecraft.world.item.Items.COMPARATOR) +// .define('T', Items.TRANSISTOR.get()) +// .define('X', Items.BUS_INTERFACE.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.DISK_DRIVE.get()) +// .pattern("IUI") +// .pattern("XTD") +// .pattern("IBI") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('U', ItemTags.BUTTONS) +// .define('T', Items.TRANSISTOR.get()) +// .define('X', Items.BUS_INTERFACE.get()) +// .define('D', net.minecraft.world.item.Items.DISPENSER) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.KEYBOARD.get()) +// .pattern("UUU") +// .pattern("XTU") +// .pattern("IBI") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('U', ItemTags.BUTTONS) +// .define('T', Items.TRANSISTOR.get()) +// .define('X', Items.BUS_INTERFACE.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.CHARGER.get()) +// .pattern("IPI") +// .pattern("XTX") +// .pattern("IRI") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('P', net.minecraft.world.item.Items.LIGHT_WEIGHTED_PRESSURE_PLATE) +// .define('T', Items.TRANSISTOR.get()) +// .define('X', Items.BUS_INTERFACE.get()) +// .define('R', Tags.Items.STORAGE_BLOCKS_REDSTONE) +// .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.PROJECTOR.get()) +// .pattern("GLG") +// .pattern("XTD") +// .pattern("GBG") +// .define('G', Tags.Items.INGOTS_GOLD) +// .define('L', net.minecraft.world.item.Items.REDSTONE_LAMP) +// .define('D', Tags.Items.GEMS_DIAMOND) +// .define('T', Items.TRANSISTOR.get()) +// .define('X', Items.BUS_INTERFACE.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) +// .save(consumer); +// +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.WRENCH.get()) +// .pattern("I I") +// .pattern(" T ") +// .pattern(" I ") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) +// .save(consumer); +// +// WrenchRecipeBuilder +// .wrenchRecipe(Items.MANUAL.get()) +// .requires(net.minecraft.world.item.Items.BOOK) +// .unlockedBy("has_book", inventoryChange(net.minecraft.world.item.Items.BOOK)) +// .unlockedBy("has_wrench", inventoryChange(Items.WRENCH.get())) +// .save(consumer); +// +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.NETWORK_CABLE.get(), 8) +// .pattern("SSS") +// .pattern("GTG") +// .pattern("SSS") +// .define('S', Tags.Items.STRING) +// .define('G', Tags.Items.GLASS) +// .define('T', Items.TRANSISTOR.get()) +// .unlockedBy("has_network_connector", inventoryChange(Items.NETWORK_CONNECTOR.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.ROBOT.get()) +// .pattern("ICI") +// .pattern("PTP") +// .pattern("IBI") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('C', Tags.Items.CHESTS_WOODEN) +// .define('P', net.minecraft.world.item.Items.PISTON) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) +// .unlockedBy("has_circuit_board", inventoryChange(Items.CIRCUIT_BOARD.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.MEMORY_SMALL.get(), 2) +// .pattern("ITI") +// .pattern(" B ") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.MEMORY_MEDIUM.get(), 2) +// .pattern("GTG") +// .pattern(" B ") +// .define('G', Tags.Items.INGOTS_GOLD) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.MEMORY_LARGE.get(), 2) +// .pattern("DTD") +// .pattern(" B ") +// .define('D', Tags.Items.GEMS_DIAMOND) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.MEMORY_EXTRA_LARGE.get(), 2) +// .pattern("DTD") +// .pattern("EBE") +// .pattern("DTD") +// .define('D', Tags.Items.GEMS_DIAMOND) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .define('E', Tags.Items.GEMS_EMERALD) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.HARD_DRIVE_SMALL.get()) +// .pattern("ITI") +// .pattern("EBE") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .define('E', Tags.Items.GEMS_EMERALD) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.HARD_DRIVE_MEDIUM.get()) +// .pattern("GTG") +// .pattern("EBE") +// .define('G', Tags.Items.INGOTS_GOLD) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .define('E', Tags.Items.GEMS_EMERALD) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.HARD_DRIVE_LARGE.get()) +// .pattern("DTD") +// .pattern("EBE") +// .define('D', Tags.Items.GEMS_DIAMOND) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .define('E', Tags.Items.GEMS_EMERALD) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.HARD_DRIVE_EXTRA_LARGE.get()) +// .pattern("ETE") +// .pattern("DBD") +// .pattern("EBE") +// .define('D', Tags.Items.GEMS_DIAMOND) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .define('E', Tags.Items.GEMS_EMERALD) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// WrenchRecipeBuilder +// .wrenchRecipe(Items.HARD_DRIVE_CUSTOM.get()) +// .requires(Items.HARD_DRIVE_LARGE.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.FLASH_MEMORY.get()) +// .pattern("ITI") +// .pattern("RBR") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .define('R', Tags.Items.DUSTS_REDSTONE) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// WrenchRecipeBuilder +// .wrenchRecipe(Items.FLASH_MEMORY_CUSTOM.get()) +// .requires(Items.FLASH_MEMORY.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.REDSTONE_INTERFACE_CARD.get()) +// .pattern("IRT") +// .pattern(" B ") +// .define('R', net.minecraft.world.item.Items.REDSTONE_TORCH) +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.NETWORK_INTERFACE_CARD.get()) +// .pattern("IGT") +// .pattern(" B ") +// .define('G', Tags.Items.GLASS) +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.NETWORK_TUNNEL_CARD.get()) +// .pattern("IET") +// .pattern(" B ") +// .define('E', Tags.Items.ENDER_PEARLS) +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.FILE_IMPORT_EXPORT_CARD.get()) +// .pattern("IET") +// .pattern(" B ") +// .define('E', net.minecraft.world.item.Items.PAPER) +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.SOUND_CARD.get()) +// .pattern("IST") +// .pattern(" B ") +// .define('S', net.minecraft.world.item.Items.NOTE_BLOCK) +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_computer", inventoryChange(Items.COMPUTER.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.FLOPPY.get()) +// .pattern("ITI") +// .pattern("QBQ") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .define('Q', Tags.Items.GEMS_QUARTZ) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_disk_drive", inventoryChange(Items.DISK_DRIVE.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.FLOPPY_MODERN.get()) +// .pattern("ITI") +// .pattern("QBQ") +// .pattern("QBQ") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('T', Items.TRANSISTOR.get()) +// .define('Q', Tags.Items.GEMS_QUARTZ) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_disk_drive", inventoryChange(Items.DISK_DRIVE.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.INVENTORY_OPERATIONS_MODULE.get()) +// .pattern("TCG") +// .pattern(" B ") +// .define('T', Items.TRANSISTOR.get()) +// .define('C', Tags.Items.CHESTS_WOODEN) +// .define('G', Tags.Items.INGOTS_GOLD) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.BLOCK_OPERATIONS_MODULE.get()) +// .pattern("TPG") +// .pattern(" B ") +// .define('T', Items.TRANSISTOR.get()) +// .define('P', net.minecraft.world.item.Items.DIAMOND_PICKAXE) +// .define('G', Tags.Items.INGOTS_GOLD) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.NETWORK_TUNNEL_MODULE.get()) +// .pattern("TEG") +// .pattern(" B ") +// .define('T', Items.TRANSISTOR.get()) +// .define('E', Tags.Items.ENDER_PEARLS) +// .define('G', Tags.Items.INGOTS_GOLD) +// .define('B', Items.CIRCUIT_BOARD.get()) +// .unlockedBy("has_robot", inventoryChange(Items.ROBOT.get())) +// .save(consumer); +// +// +// ShapedRecipeBuilder +// .shaped(RecipeCategory.MISC, Items.TRANSISTOR.get(), 12) +// .pattern("RCR") +// .pattern("III") +// .define('I', Tags.Items.INGOTS_IRON) +// .define('R', Tags.Items.DUSTS_REDSTONE) +// .define('C', net.minecraft.world.item.Items.COMPARATOR) +// .unlockedBy("has_gold", inventoryChange(net.minecraft.world.item.Items.GOLD_INGOT)) +// .save(consumer); +// +// ShapelessRecipeBuilder +// .shapeless(RecipeCategory.MISC, Items.CIRCUIT_BOARD.get(), 6) +// .requires(Tags.Items.INGOTS_GOLD) +// .requires(net.minecraft.world.item.Items.CLAY_BALL) +// .requires(Items.TRANSISTOR.get()) +// .unlockedBy("has_transistor", inventoryChange(Items.TRANSISTOR.get())) +// .save(consumer); + } + + private static InventoryChangeTrigger.TriggerInstance inventoryChange(final ItemLike item) { + return InventoryChangeTrigger.TriggerInstance.hasItems(item); + } +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..f13fe21 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,38 @@ +modLoader = "javafml" +loaderVersion = "[47,)" +issueTrackerURL = "https://github.com/fnuecke/oc2r/issues" +license = "MIT" + +[[mods]] +modId = "librecomponents" +version = "${file.jarVersion}" +displayName = "Libre Components" +authors = "The Realm 18 Studios" +description = ''' +Libre Drives all the extra components you need. +''' + +[[dependencies.librecomponents]] +modId = "forge" +mandatory = true +versionRange = "[40.1.68,)" +ordering = "NONE" +side = "BOTH" +[[dependencies.librecomponents]] +modId = "minecraft" +mandatory = true +versionRange = "1.20.1" +ordering = "NONE" +side = "BOTH" +[[dependencies.librecomponents]] +modId = "oc2r" +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/assets/librecomponents/lang/en_us.json b/src/main/resources/assets/librecomponents/lang/en_us.json new file mode 100644 index 0000000..2ac0e35 --- /dev/null +++ b/src/main/resources/assets/librecomponents/lang/en_us.json @@ -0,0 +1,16 @@ +{ + "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": "Floppy Disk", + "item.librecomponents.floppy.desc": "Portable storage used to transfer data between Computers.", + "item.librecomponents.floppy_modern": "Modern Floppy Disk", + "item.librecomponents.floppy_modern.desc": "Newer version of portable storage used to transfer data between Computers." +} diff --git a/src/main/resources/assets/librecomponents/lang/ru_ru.json b/src/main/resources/assets/librecomponents/lang/ru_ru.json new file mode 100644 index 0000000..d03c699 --- /dev/null +++ b/src/main/resources/assets/librecomponents/lang/ru_ru.json @@ -0,0 +1,20 @@ +{ + "item_group.librecomponents.common": "Libre Components", + + "item.librecomponents.cpu_tier_1": "CPU уровень 5", + "item.librecomponents.cpu_tier_1.desc": "Processes computer instructions.", + "item.librecomponents.cpu_tier_2": "CPU уровень 6", + "item.librecomponents.cpu_tier_2.desc": "Processes computer instructions.", + "item.librecomponents.cpu_tier_3": "CPU уровень 7", + "item.librecomponents.cpu_tier_3.desc": "Processes computer instructions.", + "item.librecomponents.cpu_tier_4": "CPU уровень 8", + "item.librecomponents.cpu_tier_4.desc": "Processes computer instructions.", + "item.librecomponents.floppy": "Дискета", + "item.librecomponents.floppy.desc": "Съемный накопитель для переноса данных между компьютерами.", + "item.librecomponents.floppy_modern": "Современная дискета", + "item.librecomponents.floppy_modern.desc": "Новая версия портативного хранилища, используемого для передачи данных между компьютерами.", + "item.librecomponents.hard_drive": "Жесткий диск", + "item.librecomponents.hard_drive.desc": "Накопитель для операционных систем и данных.", + "item.librecomponents.memory": "Память", + "item.librecomponents.memory.desc": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах." +} diff --git a/src/main/resources/assets/librecomponents/lang/zh_cn.json b/src/main/resources/assets/librecomponents/lang/zh_cn.json new file mode 100644 index 0000000..9277d28 --- /dev/null +++ b/src/main/resources/assets/librecomponents/lang/zh_cn.json @@ -0,0 +1,20 @@ +{ + "item_group.librecomponents.common": "Libre Components", + + "item.librecomponents.cpu_tier_1": "CPU Tier 5", + "item.librecomponents.cpu_tier_1.desc": "Processes computer instructions.", + "item.librecomponents.cpu_tier_2": "CPU Tier 6", + "item.librecomponents.cpu_tier_2.desc": "Processes computer instructions.", + "item.librecomponents.cpu_tier_3": "CPU Tier 7", + "item.librecomponents.cpu_tier_3.desc": "Processes computer instructions.", + "item.librecomponents.cpu_tier_4": "CPU Tier 8", + "item.librecomponents.cpu_tier_4.desc": "Processes computer instructions.", + "item.librecomponents.floppy": "软盘", + "item.librecomponents.floppy.desc": "Portable storage used to transfer data between Computers.", + "item.librecomponents.floppy_modern": "现代软盘", + "item.librecomponents.floppy_modern.desc": "用于在计算机之间传输数据的较新版本的便携式存储。", + "item.librecomponents.hard_drive": "硬盘", + "item.librecomponents.hard_drive.desc": "Mass storage for operating systems and data.", + "item.librecomponents.memory": "内存条", + "item.librecomponents.memory.desc": "Random Access Memory (RAM) used in Computers and Robots." +} diff --git a/src/main/resources/assets/librecomponents/models/item/cpu_tier_1.json b/src/main/resources/assets/librecomponents/models/item/cpu_tier_1.json new file mode 100644 index 0000000..ab2613d --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/cpu_tier_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/cpu_tier_1" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/cpu_tier_2.json b/src/main/resources/assets/librecomponents/models/item/cpu_tier_2.json new file mode 100644 index 0000000..6376e0e --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/cpu_tier_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/cpu_tier_2" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/cpu_tier_3.json b/src/main/resources/assets/librecomponents/models/item/cpu_tier_3.json new file mode 100644 index 0000000..c057d30 --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/cpu_tier_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/cpu_tier_3" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/cpu_tier_4.json b/src/main/resources/assets/librecomponents/models/item/cpu_tier_4.json new file mode 100644 index 0000000..dd69d2c --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/cpu_tier_4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/cpu_tier_4" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/floppy.json b/src/main/resources/assets/librecomponents/models/item/floppy.json new file mode 100644 index 0000000..e91cceb --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/floppy.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/floppy_base", + "layer1": "librecomponents:item/floppy_tint" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/floppy_modern.json b/src/main/resources/assets/librecomponents/models/item/floppy_modern.json new file mode 100644 index 0000000..e91cceb --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/floppy_modern.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/floppy_base", + "layer1": "librecomponents:item/floppy_tint" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/hard_drive_extra_large.json b/src/main/resources/assets/librecomponents/models/item/hard_drive_extra_large.json new file mode 100644 index 0000000..c23888e --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/hard_drive_extra_large.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/hard_drive_base", + "layer1": "librecomponents:item/hard_drive_tint" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/hard_drive_large.json b/src/main/resources/assets/librecomponents/models/item/hard_drive_large.json new file mode 100644 index 0000000..c23888e --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/hard_drive_large.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/hard_drive_base", + "layer1": "librecomponents:item/hard_drive_tint" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/hard_drive_medium.json b/src/main/resources/assets/librecomponents/models/item/hard_drive_medium.json new file mode 100644 index 0000000..c23888e --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/hard_drive_medium.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/hard_drive_base", + "layer1": "librecomponents:item/hard_drive_tint" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/hard_drive_small.json b/src/main/resources/assets/librecomponents/models/item/hard_drive_small.json new file mode 100644 index 0000000..c23888e --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/hard_drive_small.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/hard_drive_base", + "layer1": "librecomponents:item/hard_drive_tint" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/memory_extra_large.json b/src/main/resources/assets/librecomponents/models/item/memory_extra_large.json new file mode 100644 index 0000000..3cb8ba5 --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/memory_extra_large.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/memory_extra_large" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/memory_large.json b/src/main/resources/assets/librecomponents/models/item/memory_large.json new file mode 100644 index 0000000..f1eef99 --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/memory_large.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/memory_large" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/memory_medium.json b/src/main/resources/assets/librecomponents/models/item/memory_medium.json new file mode 100644 index 0000000..7405107 --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/memory_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/memory_medium" + } +} diff --git a/src/main/resources/assets/librecomponents/models/item/memory_small.json b/src/main/resources/assets/librecomponents/models/item/memory_small.json new file mode 100644 index 0000000..bbedc60 --- /dev/null +++ b/src/main/resources/assets/librecomponents/models/item/memory_small.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "librecomponents:item/memory_small" + } +} diff --git a/src/main/resources/assets/librecomponents/textures/item/cpu_tier_1.png b/src/main/resources/assets/librecomponents/textures/item/cpu_tier_1.png new file mode 100644 index 0000000000000000000000000000000000000000..f5df7d6c67ba9950481317a65bf41d849a14b5b5 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}Z0G|-o=g*&Czk2o9v18(f##|zzKw%|MpBvY&pFMk)jfeN}p+lQDZ{Dze z{o(}+`uqAC>g$&-Su$@5kDdCbJzu^BEfMHYZ9S)#0XMsm#F#`kNVGw3K zp1&dmC|Ks{;uxY49D6>R@2~=oOJK6KfJbG^U;S;#GErNNS%G|~0G|-o8`rj6Jiq+dkxAl)##|zzKw%|MpBvY&pFMk)jfeNxv15l19eV!! z`Sq(;H*em&Vg35W3l{YE^)=MjFI}=^+LS3k^>38&oq?2CNswRge{6t(@zQ}OKoy(? z9+AZi419+{nDKc2iWHz=xu=U`h(>Vi`Dnf)3LFlBqFsxx_4V)izgBF?wwXKQpQxxL z9E(qrNM6J2aHLmQLFqxn3<;f+73vQ-_Wo}XsPW-{6Laq442G7>{!8B*3l1-1;6BA& z=@jbVu>Qg?ra1kj+sd>QmM#8#_3s+tHTPCNS%G|~0G|-o1CO7szV~p>^*iE*##|zzKw%|MpBvY&pFMk)jfeNxv15l19eV!! z`Sq(;H*em&Vg35W3l{YE^)=MjFI}=^+LS3k_17O{14#z4k|4j}|JVQn5RKs2^U-`q6gV6LSywH-*4Mx5|5`qe+{-)TpQxxL z9E(qrNM;o1%y`T)r})H11K$ZBy$)D?`X}u4!O)kXZSHAHIpGU|w-$fds~EFE^Fh-m zhj{^_94EE6>}$C0y>jhbE|-@tYD(>2vs{oiW#s;JrR(8U341Rlu7EuLNJEg*Jzf1= J);T3K0RRP*jx+!O literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/librecomponents/textures/item/cpu_tier_4.png b/src/main/resources/assets/librecomponents/textures/item/cpu_tier_4.png new file mode 100644 index 0000000000000000000000000000000000000000..c807186582e703a2fbd6e8f466a3ba23031f969b GIT binary patch literal 338 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 Uawzb0YpEo9RL6T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/librecomponents/textures/item/floppy_tint.png b/src/main/resources/assets/librecomponents/textures/item/floppy_tint.png new file mode 100644 index 0000000000000000000000000000000000000000..d9bf9adea3ea90dbd319c5a17d2b5860308a602b GIT binary patch literal 2349 zcmb7GYfuwc6yAskqO??PrIyyrVwF*oO#(sKNl-|_V=y5`3`i9X$tKz6v0-|xlMu@@z@*^o1ddd)aID9;W~JBgpbIM z0s;$0YuI*+*-D{yG3??+!Ea_8f!Qt-+9ZaPvx2zV;<>NwB;mSO_n8BlGnk56V8wwX0#{s@OY#6FhGz*tEi-lIf))-7flEW>pc`}= zS|ioaAX5QPz~}Jz96@LzUx`fj(l~9#Tq}1+ zM4D;$%Dpt>OdFtPjnyEA?HnDZ*JPM!I6`kGY&IODLE6VU4|CZxioWiCxcRip3c&cSfl}zlNgTF z>v5oZHe1QG6`Riu;|d2mWEn9)Hdw~s5HwiWCnGX!Dz5T=Z7Oc`f287e7%r8UZ?rEJ zx5O_*5+OrmbQ`=h%D@radtgL@S&Q@!Td?RK*O(Q|Xc7$Ld6jp^LlDb>gN7K=2oMxh zlu=X_?-A*@vPSyhxWKm#`&D>5)dj}9-D_kHL|Hh+F>lMA3zCM`Bk}8(&S>)SajrQK z)jPuCX^K=%h-@EelD+pOb#dglA1)j`)cibC-&E>p3frf9+_Stv_bA0y*IB%7<`MIy z#>RpC5k73ud~Pw!2+LM}?G{W(aqXLm}fU1iS^9wV!B$D5}ll?$eOxXd9I7UAn@R`jVu+JHl}+=17D3A?3w;%I(q1 z?%(oiLrWH`4>!G0Ld^Ml#iU=HHLB9NCYW_#+D`$WH=4?kO*!g_w(bw=Ob-_%l~;LH zkLz62!^%8o=(uZAGk?XSZLtd}2pR)!X3TgNR9xZ@uE-K6jZ6$%v!h79s&3ANyc&hR zC3?a{pHU)**F$(~t%u!X)>e4THGK;!QL4=MAB$hTUH9j#!iv_%PwTJlyqnimz31cZ zT@!Niy=yx%wcr27veh*6PnT_U&WtCF)v3Y$V>fzjzSLH7$xMi?to{I$nFL-zCb3E?{O=yvs9eyL)|O{<6Uz_rni zvg_8>EjiT@thLwg|0T-Vgh2u8&YU~A!v20(LBq5{*iqS7HBmNi*(d2z6DMv1L|9_x zjm%Z8(jO|wPvqWs;!{?+U$FK}YeHvlYI?x=w2Is0QBh!?#(U1T%iZ{s`0V%Ts+&u^ z7G-9sbL(4f3!jxbgQBEOon5utR{UxnrL68qIQOVzO5F3q?Fl)a_e`gWHNGL<%v(;J LOd;JLwbbzsK1@Z{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/librecomponents/textures/item/hard_disk_platter.png b/src/main/resources/assets/librecomponents/textures/item/hard_disk_platter.png new file mode 100644 index 0000000000000000000000000000000000000000..8be91ff8efafb22f860a6ec519c68304d359c787 GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4NRUcjv*HQODFsDxf%!@Tb`e(+EKluajWtU z#_0vz+1czH3OL;bw50`wl)~oC+_K`^-;>q*m!vIw`F-nLwm;mD1CwH}_bxwT;wzGS zJM5aautwap)^MZJ*yiVzlialKbsjHVa^w5nlp>Y;9jxKPzxD{-Zw+rb*?gT#`rhu+b3J0f)8*82UAC>U=+(iv3%l>X z@3CHd<9n@V&y-ZoM2UH}7ff|HnAS=Nsw*&GHjyj~ZTFk=-110ajosn}t5%)eq!U*w zmhCusS?0FNd6^}#v7yGgb=HtcRlU|Pqf z+Jb^st+azUPMIEv7g{ZhR!}^OiYKi{#}O5$RE1_BoyyRT^xFhEMB6_$+4ue4`@Q$Q zYfH46gh?SYLLdm5l$5AU1^=Pk6Fe6D&i3|W5Hw~PnWkfP>J(H@Sp^tQ3+G13$wpWS*`wWb*pv6H5gV^01`J)gb^`4 zcfh0-+6g3;U?>NzCsYL>9pS#rad||OteBBVA#6t0B!fj!F8~=N{^B`DWN~nnTWKSK zYw?hYZU~dXOT?gOxO)2BWWE&QQjKa!7h%yUNl+&SuntBs1ZKVhR8SU*UIE5{07gDv zgLOcCn3}=?6!8L-q)=#S%0OBG#-t|1^O97GC{avQ6kjax(}1F(z?L)=DlryliG^Yj zUnt^>m!yfJQDF=k5wS=pLWTYd`n199;24YjpFTGMJSnb6S(3F7KFL23atrI1{Gx^A z#sIZoHlqx7@o~a{IV>z3Yr<$e7pKVrLW*#MV<87PeA06gDKf%?6hx?2qlqNLQgq=k zrz?p3kxqT{$K(0B3dQtXm1VGCqDwn2cM{|sy-9kxMyQb=_O={TxYkq%LE1jKj^7;a4 zO?6g|E7esbIau){|IW8xS6yuSuF0krEcn3u_)u8mmz9gVzc`;2JsmP{s$G7b`+#f^hY<&i=NB$0c%V&#}{!CoTJ=`$pgo{NB5frB@WE zdt=?l66%}Ndzf*;e*}F7)sws9I?&41=|^t8UP-<8_s27SscKB!m12ei4$i+i^P?N) zTBN)vJ+`BFR+G7BWk&7saVNq&*?j>87mQtx%<0@0aJ)S+lYyWKZ*WflR8ct{ln6>v z%G09DE^U)-c5A0@h&!;p>D=ZS<@e}2uT97coVRb?nx8@vO`T=m-1kW0bLQO46K{wW zZhvQB%F2h?y>&XXV`f6vG0onZ>ylk{hK4pzaWLeSGAD9wd!BC2DQ{_woC8Oy zPj?jr@;1UfQfEbUKwG3*QBHhLloa19oVD}Pxoa^2t&!a>X|Q{paN=!SU2ntWlfsFb zb^UAWvju1JTWodh_UO={fSTM(Wg_#2+&xdS%0%y%UTg3iwXRaPviT)vr$HO5t~Pk4 zOeq!3O*&lTsJ(IEk7t)3lzOG!M}@ItE3X*$9aSzr^N8)s-~MKg^k#c^@4MdJ-k{&+ Vy4QcmC)>F1eUeI}JP^Oe{V%1<@}K|! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/librecomponents/textures/item/hard_drive_slot.png b/src/main/resources/assets/librecomponents/textures/item/hard_drive_slot.png new file mode 100644 index 0000000000000000000000000000000000000000..7d39a32dfccdda0f5ee9a7ed466caac85abaa814 GIT binary patch literal 1923 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/librecomponents/textures/item/memory_extra_large.png b/src/main/resources/assets/librecomponents/textures/item/memory_extra_large.png new file mode 100644 index 0000000000000000000000000000000000000000..eba0970e181e2defee1a9ea2bd281c754ed55f60 GIT binary patch literal 1951 zcmah}4NMbf7%ssngAqi=&Yx^LjY<>|#2J-1G)804%uP2VZVo3iPThBHE#PooazEeuKJW9r z@AJL)uCtcRO-`Jgs8XqtO~sTAyvHhcLOgh8sZ;DKRopVpV6d7D2FMx|Je;2ej_z%n zyK|`d6S|7rYtQ;7BqePy87AhsE_R%9{k(|AbIp zb)P=H|L%ilLb+v6!5z;)SM!|{2g}Qv>*5P92OclKey}K|ZCQ%9)AmpM)CaBWk1hFe z&e5^X)m!>M+1|UdN9#M%lV*6dy;YNwm)x}JOFnTj(p-J2?@G6B&7p>}&HIk5=u7u) zdHmrOG{kxD?QY)N2~GpEnjJ>cPtJ7D#1>){MWHB~nwom%O#RA-duIK)3Wi~Tx_Pq! zVUTQVb_SIJmKlx?8ob8Jwi5fZ;g{-0=Hf}f_qteIDydXSfi3#wnm{AxCL*xn)c3P~EK?t&t7SSRY z48kEuA7ng)jd~{<4pt=WlVy=W(VChXq$U>;f?gEY>2xTjK{XmRK&Yi!UZz88UdoJ+ zL}@5iatAq4<^Xla*FC6h47AeFK5D#A^>3!{6f$Ux_~8NJZiIYA=dAtxB$ybKvv+$AL=Q6!4nfELS_*dz?BO_ zgLW`+q63G7CEMINkjZGs$94JnY7GK5Rg@x30ou!&S>7xAA{!1`7jeumqf&^!N;&Zb zJO@hGL@Atu4icWBL7!8X{?`u9g0O&2WoVhEXc;7|!9bs3xEj|uuo(odBXY4E3@0#5 zX%7Gv7|v7sDrmU7A#mwIjKx9}bCN6sYh&hU&)V6_A*QI&&nX*$Alj{zM#5rHV5;0K z6HWlwCBY-t&_Q;#7n~mn&-QpYP<}0BRr(gf5uKuCgrdgB0s>GHuEz4znAU+|L>^A$ zX>%}5xFmGM{ll#^!u}EatMro$EfI`o-wA2dd*PT}%r2@(V5~GuC7*q4v&sf91cQw60A6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/librecomponents/textures/item/memory_large.png b/src/main/resources/assets/librecomponents/textures/item/memory_large.png new file mode 100644 index 0000000000000000000000000000000000000000..753473a5125b5cb0117fa5d605ec59dfd276a811 GIT binary patch literal 2106 zcmah~X;2eq7~T{QL{O$`u?QL#P=qGC8xF~uKsh2u34;(y01ra4Nmi0-L(nv zQBDr74iE%6#Y9IYf^TQ$u^$IMXFYx?gP^hVNr{w}isNuOrRB;LR3^bSYxMw!AVH{E zFOz2xG&_?}kvbvVd!z|wlL{f65-3K+`UpZzM&}xcq}+IkJU2_uSHPhm4gxa{5@-op z#x`p;IwNit!q&Vv_|2FRm~C~TvxKlzoWPEt3(vxZ8P$}2sG~PxhTsu_G^uq|e|N3+jWLY0XgMHakkmIucvZkCvFHgTkuXv@200;GPUvV)D-#Sa zcm$=P3`sy5gb>Dt%?YHL&`2XmEuk|4(g7Cq7MMB`93st@RZJ;BQh#gQFccFJkzk;d zqy}Kd#Hes~j3^=q;|B$CcwAcp43Bt>R;D822%U;n4;3En3ftzalO;8pXsh@oEILGoZP0)+YVzhX&%jNsAc@Y=Qj zGuUik3xRcp4DB;;7}|)04y-`~*mvt%8dg9MYZVDJIzpQeUvF|wI$bA`D8!5*SxejneQj6xap(nENBe* zTP&__zx3F$r2XIiybxjgZB~|7x#G#1u(P)u(tPfi&PTZ{>YMXPO-A|7vTt@(`rlY< zpL75D=etf<36=W?vR|gP8NySVfAbRjxF;>loM_Ii{l569_g`fd^0pImPUys3pFH{9 zhrXdDrF$RkZcX!=3T2fX^n0?dt4SJ@l`6CFg&lDV`|CIKe;5VNbJ<>-u5`gY3Z7(wzS|f$H#dC2n#~@5!rj{6s?n+k57Ue>5F^+2Xv*-re2dJ5S9oYGj#7RS&#? zP6w~93Hs<%BLq#H!aOXfxO6(WqmN=D!z97$f7o&;)(&%P$)8rXcmQ%AfWDpFaFrch zR1o}hI_Gfx9m$>UDZwsf_Ein_?vvbee2+~Me&wvGXx-rvKdoo;-EA*+-|Xt@YC|Tt z1=m(PPtL4coUX;rLFkd4mL*@5Zxy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/librecomponents/textures/item/memory_medium.png b/src/main/resources/assets/librecomponents/textures/item/memory_medium.png new file mode 100644 index 0000000000000000000000000000000000000000..c2bf7c58a9383fd25be6571aed5a577c4fd457d0 GIT binary patch literal 2303 zcmcImX;2eq7~Y6gL{Uc^
40$wCqaYKw?< zTI<2o)?mve3au9ws;C?y)U(BEovF8?l~z$u>p?x}w+R9Y)?fXR#6C_cXoYL@c1(i(jOd1`)At)fo zq{HQD1kFh%Qb?@`?mXB4b4Y~Oc-Vo_GKRGyV47b@VOK!*Sm1{`Pz z8t0faYOMh?iD0W=418y<`7p;yq0>Zgf+U6`rt}2Im*>kv;6MjXfL@`*VngTm8iSJv zR?)N$2*GC%KFUM*1L-;yMN~-eKy?N)A#qv~ zNFuPtwVEXKV4U>TBR^T)qiqjxd0RpBILAj_viuhxw5JONe1jP`< z8pX<|6r|GpE;cjKoB+U=NU(6yKvR0N^~yHpi->gF$#zte*7;^8oZ;hgraBR<(^HBJ zIiawIw$49;8Ym@g#PvjQ3TUth4pu5jpo5tc!wfnH_Aa#J1fntOz|i`_}DE6na7{T zpBJ!~K6am7om5s-@^$I=-q+XIXWV_UxU^-LNV)T$^d8wseMo%c8MlCK6|!JctSPIe z*m7vbrIM}klTGeTS_#i1TYme#XHemm?;dPFE_0g*r4{b+di2?ihJ=W;MBFSCosU}B zUAwM(!UEWzy{Tr2l8w3MK21kk=CHEIpq^J&kL26!EsK7cG-Ji4LpMF!;@(&7SPx5B z`zpdJzg_P;D=TDv{>Jk?4LRouj$BF2SncBM;&`Km-BH*T=lA(KyCYAr;TP?;w5N7= z=S(&`)h#`n^|-Ni>~^*}9dt_iE-|+BU3?Jt5#^ZF|=P-JH(aJ&L?rQ(97geO_PlTSe8dV#DRCY6y?_e&CG% z?Gq9hd8)9)c(yEoYsq}pd@3z|8FcjtS#w(@DqX7O%~bMH@iWC_0aGl)`Ljw8{L8N z(RrhqSTnUqx_GwJbjzo0`op7sm!?HsaaZr&(L*FvO{=JCyZ3TcWzZiRM?%qcqxT*> z-?FSLr%3s5e0jdqv)$g+K7`esefh#CPEZWbUzz%%Saj&Fkfhvy0kgU?xc~qF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/librecomponents/textures/item/memory_slot.png b/src/main/resources/assets/librecomponents/textures/item/memory_slot.png new file mode 100644 index 0000000000000000000000000000000000000000..a4053b4d079cd0ee82195a0f8c88189f397037ac GIT binary patch literal 1952 zcmah~c~BEq7+(f(Fdjg`mMSx@3kpSYa!A$$1ri|xQN#oTUM$Hb*^=z0*@Yx%Ek&(o zJ*vf`)T-5ifhtbxcmNd-MjfeV1*STcYA6(`RXj(j(6hC zd`5~O0Ehd<8A3m(PSXA1gGBIIgfHX?`2VKkcH%8`78ypj7%7ILjg(~|fFUjh;9-U! zeQ!3gW0p6OmCFC7o6SSQpc#1qNJM{9hn(q^16t*<;QS1nrt+;?TwZ{aOo%HJY+g`> z88hH%IB8&vQbZX08Ze*Gy}r*1ney36s7V6277dzc1~DlzO$2&?t&hu1)*B%<)o40l z$4wd;Va7=ss1BTB5X^cDm_(T<>palbI52Yg8mI&6!jzN_KvAzjiln4;E2Sq)0HZUK z6JdosDOMtI8;*WwS0tELKXFuf=t) zuz;K!r71mQ!>o9M0Tft@BV8)Qr1!)lEQA~iU466nNg>T8eV%(>C>vOOPpadxgUF} zFUE$IC+DgTZ<;P4>pGb{b^NpHrZ8rK=bQr%cI&gnw}rRYHkEZgJYrd2k`Zva{Pd($ zUih-EyWL3rv9idA+Z!_@QLkH5u*uKYJL@&6S?^;GvAOi|y3CqQJ@3@-`nt3vD9|@2 z0N>`ragL4(m3Hc9w#TELdr~u1=Y8LMSgt8qsMK$jyqg-T*b)+Ycb%$b^7y@7qHArx z_V(SYGCzJASk)7f{<1BOx|jZgck9lLj~su*wI=_zbme-J_>R^t|7j0YSyyIKz zVH{m!P%i>si;`g7Thn}oc!Hd>g(sfK^UYx z|EMgoF}%@Qy5e3zkH~<-$V$IM&DWyGd@%V^N7NyBMUZpf*=^VU9)02avg`Kx)^E&p z-W3t$KacDPzO^*7s_EwVuycWlDNc`<&4oX<7u3#ed7|r>Duv{YU!JKs$(zf5SQYZw KvV(~^#s2_7{lHNG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/librecomponents/textures/item/memory_small.png b/src/main/resources/assets/librecomponents/textures/item/memory_small.png new file mode 100644 index 0000000000000000000000000000000000000000..333693f13e70b1f34ff731d48e703a913b11426c GIT binary patch literal 2271 zcmcImX;2eq7+#81N&zn%9A!#aK{-rzHyn~JffCMGmtuelXsaRFBnu=Pl0_1V+QE)g z+YTx%RKO}|izhk?4JcPZ1hp1N#vcrhP<7O*2-HfU9ZSDWFo0nF)gL*&?|I(qdEb4L zopG_zj`mCJAqa95$3#fL=REdhHygaWJsp!m(3|a4LK2fitiffpnkSXhsU**!)&d-Y zfsVy zftqBb9D_PTqsI+G*z6Yv-`Q&f=9no=x)4qx;yB^7j^qUJ0(dAKV$TWI$rZRHB5K?i zoP@B7VYE1cWM^mdvi*3pPKjUwfdE1I2%pad46fd&VWbAGM!$@8Vet_`>Sa1g%TTn2 z!}^q_(piiUh5^nQcTO6p3GW*Hc=ReWSpnB*BD&@`L?(=C@W(g-O7GUcOSI#G;^@e|NhI3~a`)EC8Y z6g5XN^JzJyFusn>PBbSN@CgEsq4W%`Gn%g~V;)atT27W@24$XacEVY{RK`{(gta>1@yGsfsF`OD`MTP;9%X(qz0^H9oW5T>6|VIve{07=VjV+ z0zqDTvi5ZPwn|;wH}(Jbc$nc{{H$q?aJhbap*8e%$%@Xl{tG^S({G$07N%9bp~!>{GlRWM7ST z*)Y6fW%Z^*2g<*#IPUlBPP?rB=O0$IRS6X*|H>RoxuO%TYrgIg{KJuyFoVR9Q**GS z-t%VpVcC_I6)hTq=anmaIOG#rT6XOB%1bF8&QN;kY2RmG+-XV@rzcB|0%7->wWDlH4zd)`PU))r)w>wx*(%AbSSo;eiz&nC}pMfG=mZYQo*o!AW%Hl`zy zN59)0;GH9i+OfBLtZB=Q!q!`9S@~{D+#K)JxI8W$Obq<8z_xV+pVebqc0X-&bjxDn z!iEi9Im69$PL(bJ+(t*`(rd<37ps#Z&s?frUO1?8IJs8Uly|Q!t#j)yf^*wDN^);_ zK7K4ZaN*tJMjHdAd;&)?>%q_HTiTdpJp{eIkbT)eC1s02j}UQ0SVGWO-xoHex4h@v z9$Mt&q~HdP%#l0A6rcF$oL&F6zH6R+&gG&o?|mDN$&{7X>*7tkw(=2|h@9E3RR;}i zWex88nL(HsBHD}FKk0QF=@kTQQz&Tp2Mdq8^m)wnKl;<*9mC|(`#-za z+6~%u`X?wds@T3@E~z}#b+eOUp1%QkmPgHcb|RnsUm}i-ji?fB G%KH~|*&y-& literal 0 HcmV?d00001 diff --git a/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json b/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json new file mode 100644 index 0000000..f77bb27 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json @@ -0,0 +1,17 @@ +{ + "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" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/cpu.json b/src/main/resources/data/oc2r/tags/items/devices/cpu.json new file mode 100644 index 0000000..c1afc28 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/cpu.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "librecomponents:cpu_tier_1", + "librecomponents:cpu_tier_2", + "librecomponents:cpu_tier_3", + "librecomponents:cpu_tier_4" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/floppy.json b/src/main/resources/data/oc2r/tags/items/devices/floppy.json new file mode 100644 index 0000000..dea22ae --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/floppy.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "librecomponents:floppy", + "librecomponents:floppy_modern" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json b/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json new file mode 100644 index 0000000..425ec76 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "librecomponents:hard_drive_small", + "librecomponents:hard_drive_medium", + "librecomponents:hard_drive_large", + "librecomponents:hard_drive_extra_large" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/memory.json b/src/main/resources/data/oc2r/tags/items/devices/memory.json new file mode 100644 index 0000000..76af3cb --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/memory.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "librecomponents:memory_small", + "librecomponents:memory_medium", + "librecomponents:memory_large", + "librecomponents:memory_extra_large" + ] +} diff --git a/src/main/resources/mixins.ld.json b/src/main/resources/mixins.ld.json new file mode 100644 index 0000000..54a9bcf --- /dev/null +++ b/src/main/resources/mixins.ld.json @@ -0,0 +1,14 @@ +{ + "minVersion": "0.8.5", + "compatibilityLevel": "JAVA_17", + "required": true, + "package": "", + "refmap": "", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 5 + } +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..abf7103 --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Resources", + "pack_format": 15 + } +} diff --git a/temp.github/ISSUE_TEMPLATE/bug_report.md b/temp.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..76884ad --- /dev/null +++ b/temp.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,45 @@ +--- +name: Bug report +about: Report an issue of the mod crashing or behaving in an unexpected way +title: '' +labels: bug +assignees: '' + +--- + +--- +name: Bug report +about: Report an issue of the mod crashing or behaving in an unexpected way +title: '' +labels: bug +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Singleplayer or multiplayer? +2. Place block '....' +3. Interact with '....' +4. See error '...' + +**Log files** +Please post your log files (client and server) to gist and link them here. +If it's a crash report, please also upload the crash report to gist and link it here. + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Versions (please complete the following information):** + - Minecraft: [e.g. 1.18.2] + - Forge: [e.g. 40.0.40] + - oc2r: [e.g. 0.1.7] + +**Additional context** +Add any other context about the problem here. diff --git a/temp.github/ISSUE_TEMPLATE/feature_request.md b/temp.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..11fc491 --- /dev/null +++ b/temp.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/temp.github/workflows/build.yml b/temp.github/workflows/build.yml new file mode 100644 index 0000000..f987873 --- /dev/null +++ b/temp.github/workflows/build.yml @@ -0,0 +1,37 @@ +name: build + +on: + pull_request: + push: + branches: [ '**' ] + +jobs: + build: + strategy: + matrix: + java: [ 17 ] + os: [ ubuntu-latest, windows-latest ] + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: ${{ runner.os }}-gradle- + - name: Build with Gradle + run: ./gradlew build + env: + GPR_USER: ${{ secrets.GPR_USER }} + GPR_KEY: ${{ secrets.GPR_KEY }} diff --git a/temp.github/workflows/publish.yml b/temp.github/workflows/publish.yml new file mode 100644 index 0000000..0de6a71 --- /dev/null +++ b/temp.github/workflows/publish.yml @@ -0,0 +1,101 @@ +name: publish + +on: + release: + types: [published] + +jobs: + publish-github: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Extract Version from Tag + uses: rishabhgupta/split-by@v1 + id: split_tag + with: + string: ${{ github.event.release.tag_name }} + split-by: '/' + + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ubuntu-latest-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: ubuntu-latest-gradle- + - name: Build with Gradle + run: ./gradlew -Psemver='${{ steps.split_tag.outputs._1 }}' build + env: + GPR_USER: ${{ secrets.GPR_USER }} + GPR_KEY: ${{ secrets.GPR_KEY }} + + - name: Add Artifacts to Github Release + uses: alexellis/upload-assets@0.3.0 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + asset_paths: '["./build/libs/*.jar"]' + + - name: Publish to Github Packages + run: gradle -Psemver='${{ steps.split_tag.outputs._1 }}' publish + env: + GPR_USER: ${{ secrets.GPR_USER }} + GPR_KEY: ${{ secrets.GPR_KEY }} + GITHUB_MAVEN_URL: 'https://maven.pkg.github.com/${{ github.repository }}' + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + publish-curse: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Extract Version from Tag + uses: rishabhgupta/split-by@v1 + id: split_tag + with: + string: ${{ github.event.release.tag_name }} + split-by: '/' + + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ubuntu-latest-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: ubuntu-latest-gradle- + + # Set Curseforge release type based on pre-release flag. + - name: Set release type to 'release' + run: | + echo "CURSEFORGE_RELEASE_TYPE=release" >> $GITHUB_ENV + if: github.event.release.prerelease == false + - name: Set release type to 'alpha' + run: | + echo "CURSEFORGE_RELEASE_TYPE=alpha" >> $GITHUB_ENV + if: github.event.release.prerelease == true + + - name: Publish to Curseforge + run: ./gradlew -Psemver='${{ steps.split_tag.outputs._1 }}' curseforge + env: + GPR_USER: ${{ secrets.GPR_USER }} + GPR_KEY: ${{ secrets.GPR_KEY }} + CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} + CURSEFORGE_RELEASE_TYPE: ${{ env.CURSEFORGE_RELEASE_TYPE }} + CHANGELOG: ${{ github.event.release.body }}