diff --git a/.gitignore b/.gitignore index b676af8d..ab4c4933 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,9 @@ build # other eclipse run +.vscode +libs +.DS_Store # Files from Forge MDK forge*changelog.txt diff --git a/build.gradle b/build.gradle index d73be1f4..9a0c4d5a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,237 +1,204 @@ -buildscript { - repositories { - maven { url = 'https://repo.spongepowered.org/repository/maven-public' } - } - dependencies { - classpath "org.spongepowered:mixingradle:${mixingradle_version}" - } -} -plugins { - id 'idea' - id 'maven-publish' - id 'net.minecraftforge.gradle' version '6.+' - id 'org.spongepowered.mixin' version '0.7.+' -} - -//Load local environement variables -def loadEnv() { - def envFile = rootProject.file(".env") - if (envFile.exists()) { - envFile.eachLine { line -> - def matcher = line =~ /^\s*([\w\.]+)\s*=\s*(.*)\s*$/ - if (matcher.matches()) { - def key = matcher[0][1] - def value = matcher[0][2] - System.setProperty(key, value) - } - } - } -} -loadEnv() - -version = mod_version -group = mod_group_id - -base { - archivesName = mod_id -} - -// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. -java.toolchain.languageVersion = JavaLanguageVersion.of(17) - -println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" -minecraft { - - mappings channel: mapping_channel, version: mapping_version - - copyIdeResources = true - - accessTransformer = file('src/main/resources/META-INF/accesstransformers.cfg') - - runs { - // applies to all the run configs below - configureEach { - workingDirectory project.file('run') - arg '-mixin.config=creatingspace.mixins.json' - - property 'forge.logging.markers', 'REGISTRIES' - - //property 'forge.logging.console.level', 'debug' - - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - mods { - "${mod_id}" { - source sourceSets.main - } - } - } - - client { - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - property 'forge.enabledGameTestNamespaces', mod_id - } - - server { - property 'forge.enabledGameTestNamespaces', mod_id - args '--nogui' - } - - - gameTestServer { - property 'forge.enabledGameTestNamespaces', mod_id - } - - data { - // example of overriding the workingDirectory set in configureEach above - workingDirectory project.file('run-data') - - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - } - } -} - -// Include resources generated by data generators. -sourceSets.main.resources { srcDir 'src/generated/resources' } - -repositories { - maven { url = "https://maven.createmod.net" } // Create, Ponder, Flywheel - maven { url = "https://maven.tterrag.com" } // Registrate - - //JEI - - maven { - - name = "Jared's maven" - url = "https://maven.blamejared.com/" - } - maven { - // location of a maven mirror for JEI files, as a fallback - name = "ModMaven" - url = "https://modmaven.dev" - } - - maven { - name = "Modrinth" - url = "https://api.modrinth.com/maven" - } - - //curios - maven { - url = "https://maven.theillusivec4.top/" - } - - maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // ForgeConfigAPIPort - maven { - url = "https://maven.pkg.github.com/RealAntEngineer/Formic_API" // maven for Formic_API (temporary) - credentials { - username = "RealAntEngineer" - password = System.getProperty("READ_TOKEN")// this is a read only token - } - } - -} - -dependencies { - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - - implementation(fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }) - implementation(fg.deobf("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")) - compileOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}")) - runtimeOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}")) - implementation(fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")) - compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1")) - implementation("io.github.llamalad7:mixinextras-forge:0.4.1") - - //JEI - // compile against the JEI API but do not include it at runtime - compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")) - compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")) - // at runtime, use the full JEI jar for Forge - runtimeOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")) - - //curios - - runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}") - compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}:api") - - implementation(fg.deobf("com.rae.formicapi:formic-api-${minecraft_version}:${formicapi_version}")) - - annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor" - - //worldgen tool - //worldgen-devtools:4rikEHY9 - //runtimeOnly fg.deobf("maven.modrinth:worldgen-devtools:1.0.0-bata.2+1.20.5") -> dependent on minecraft too high use it for 1.21.1 - //runtimeOnly fg.deobf("maven.modrinth:connector:1.0.0-beta.46+1.20.1") - //runtimeOnly fg.deobf("maven.modrinth:forgified-fabric-api:0.92.2+1.11.12+1.20.1") - - -} -mixin { - add sourceSets.main, 'creatingspace.refmap.json' - config 'creatingspace.mixins.json' - - //debug.verbose = true - //debug.export = true -} -// This block of code expands all declared replace properties in the specified resource targets. -// A missing property will result in an error. Properties are expanded using ${} Groovy notation. -// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. -// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html -tasks.named('processResources', ProcessResources).configure { - var replaceProperties = [ - minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, - forge_version: forge_version, forge_version_range: forge_version_range, - loader_version_range: loader_version_range, - mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, - mod_authors: mod_authors, mod_description: mod_description, - ] - inputs.properties replaceProperties - - filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { - expand replaceProperties + [project: project] - } -} - -// Example for how to get properties into the manifest for reading at runtime. -tasks.named('jar', Jar).configure { - manifest { - attributes([ - 'Specification-Title' : mod_id, - 'Specification-Vendor' : mod_authors, - 'Specification-Version' : '1.20.1 1.8.0', // We are version 1 of ourselves - 'Implementation-Title' : project.name, - 'Implementation-Version' : project.jar.archiveVersion, - 'Implementation-Vendor' : mod_authors, - 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - 'MixinConfig':'creatingspace.mixins.json' - ]) - } - - // This is the preferred method to reobfuscate your jar file - finalizedBy 'reobfJar' -} - -// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing: -// tasks.named('publish').configure { -// dependsOn 'reobfJar' -// } - -// Example configuration to allow publishing using the maven-publish plugin -publishing { - publications { - register('mavenJava', MavenPublication) { - artifact jar - } - } - repositories { - maven { - url "file://${project.projectDir}/mcmodsrepo" - } - } -} - -tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +plugins { + id 'eclipse' + id 'idea' + id 'maven-publish' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' + id 'org.spongepowered.mixin' version '0.7.+' +} + +//Load local environement variables +def loadEnv() { + def envFile = rootProject.file(".env") + if (envFile.exists()) { + envFile.eachLine { line -> + def matcher = line =~ /^\s*([\w\.]+)\s*=\s*(.*)\s*$/ + if (matcher.matches()) { + def key = matcher[0][1] + def value = matcher[0][2] + System.setProperty(key, value) + } + } + } +} +loadEnv() + +version = mod_version +group = mod_group_id + +base { + archivesName = mod_id +} + +// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" +minecraft { + + mappings channel: mapping_channel, version: mapping_version + + copyIdeResources = true + + runs { + // applies to all the run configs below + configureEach { + workingDirectory project.file('run') + arg '-mixin.config=creatingspace.mixins.json' + + property 'forge.logging.markers', 'REGISTRIES' + + property 'forge.logging.console.level', 'debug' + + property 'mixin.env.remapRefMap', 'true' + property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" + mods { + "${mod_id}" { + source sourceSets.main + } + } + } + + client { + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', mod_id + } + + server { + property 'forge.enabledGameTestNamespaces', mod_id + args '--nogui' + } + + + gameTestServer { + property 'forge.enabledGameTestNamespaces', mod_id + } + + + accessTransformer = file('src/main/resources/META-INF/accesstransformers.cfg') + + data { + // example of overriding the workingDirectory set in configureEach above + workingDirectory project.file('run-data') + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + } + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +repositories { + // If you have mod jar dependencies in ./libs, you can declare them as a repository like so. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver + flatDir { + dir 'libs' + } + maven { url = "https://maven.createmod.net" } // Create, Ponder, Flywheel + maven { url = "https://maven.tterrag.com" } // Registrate + //maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // ForgeConfigAPIPort + maven { + name = "Jared's maven" + url = "https://maven.blamejared.com/" + } + maven { + name = "Illusive Soulworks maven" + url = "https://maven.theillusivec4.top/" + } + +} + +dependencies { + minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + + implementation(fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }) + implementation(fg.deobf("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")) + compileOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}")) + runtimeOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}")) + implementation(fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")) + compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1")) + implementation("io.github.llamalad7:mixinextras-forge:0.4.1") + + //JEI + // compile against the JEI API but do not include it at runtime + compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")) + compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")) + // at runtime, use the full JEI jar for Forge + runtimeOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")) + implementation fg.deobf("blank:formic-api-${minecraft_version}:${formicapi_version}") // Needs to be placed in libs folder (temporary solution) + + //curios + + runtimeOnly(fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}")) + compileOnly(fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}:api")) + + annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor" +} +mixin { + add sourceSets.main, 'creatingspace.refmap.json' + config 'creatingspace.mixins.json' + + //debug.verbose = true + //debug.export = true +} +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. +// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html +tasks.named('processResources', ProcessResources).configure { + var replaceProperties = [ + minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, + forge_version: forge_version, forge_version_range: forge_version_range, + loader_version_range: loader_version_range, + mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, + mod_authors: mod_authors, mod_description: mod_description, + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { + expand replaceProperties + [project: project] + } +} + +// Example for how to get properties into the manifest for reading at runtime. +tasks.named('jar', Jar).configure { + manifest { + attributes([ + 'Specification-Title' : mod_id, + 'Specification-Vendor' : mod_authors, + 'Specification-Version' : '1.20.1 1.8.0', // We are version 1 of ourselves + 'Implementation-Title' : project.name, + 'Implementation-Version' : project.jar.archiveVersion, + 'Implementation-Vendor' : mod_authors, + 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + 'MixinConfig':'creatingspace.mixins.json' + ]) + } + + // This is the preferred method to reobfuscate your jar file + finalizedBy 'reobfJar' +} + +// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing: +// tasks.named('publish').configure { +// dependsOn 'reobfJar' +// } + +// Example configuration to allow publishing using the maven-publish plugin +publishing { + publications { + register('mavenJava', MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file://${project.projectDir}/mcmodsrepo" + } + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 7ab7cd79..eea0dd15 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,4 +34,4 @@ formicapi_version = 1.1 mod_group_id=com.rae.creatingspace mod_authors=Real Ant Engineer -mod_description=Example mod description.\nNewline characters can be used and will be replaced properly. \ No newline at end of file +mod_description=Creating Space is a mod that allows you to create rockets using contraptions and going to other planets. \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..c1962a79 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d3..2617362f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 7221fdb8..758df8b3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,19 +1,13 @@ -pluginManagement { - repositories { - gradlePluginPortal() - maven { - name = 'MinecraftForge' - url = 'https://maven.minecraftforge.net/' - } - maven { - name = "ParchmentMC" - url = "https://maven.parchmentmc.org" - } - gradlePluginPortal() - - } -} - -plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' } \ No newline at end of file diff --git a/src/main/java/com/rae/creatingspace/mixin/CSMixinPlugin.java b/src/main/java/com/rae/creatingspace/mixin/CSMixinPlugin.java index f5c7e1ad..b2296209 100644 --- a/src/main/java/com/rae/creatingspace/mixin/CSMixinPlugin.java +++ b/src/main/java/com/rae/creatingspace/mixin/CSMixinPlugin.java @@ -1,6 +1,5 @@ package com.rae.creatingspace.mixin; -import com.simibubi.create.compat.Mods; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; @@ -8,23 +7,26 @@ import java.util.List; import java.util.Set; -public class CSMixinPlugin implements IMixinConfigPlugin { +public class CSMixinPlugin implements IMixinConfigPlugin { @Override - public void onLoad(String mixinPackage) {} + public void onLoad(String mixinPackage) { + } @Override public String getRefMapperConfig() { return null; } - //use this to cancel load of mixn classes based on if the target mod is loaded or not + // use this to cancel load of mixn classes based on if the target mod is loaded + // or not @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { return true; } @Override - public void acceptTargets(Set myTargets, Set otherTargets) {} + public void acceptTargets(Set myTargets, Set otherTargets) { + } @Override public List getMixins() { @@ -32,9 +34,11 @@ public List getMixins() { } @Override - public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {} + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } @Override - public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {} + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } } \ No newline at end of file diff --git a/src/main/resources/assets/creatingspace/lang/default/interface.json b/src/main/resources/assets/creatingspace/lang/default/interface.json index 0b4c2183..a87b74cb 100644 --- a/src/main/resources/assets/creatingspace/lang/default/interface.json +++ b/src/main/resources/assets/creatingspace/lang/default/interface.json @@ -15,21 +15,18 @@ "creatingspace.ponder.rocket_building.text_6": "the flight recorder can help in those moments", "creatingspace.ponder.rocket_debugging.header": "Rockets debugging", - "creatingspace.ponder.rocket_debugging.text_1": "The flight recorder give info about it's last flight or no past flight if it's just placed,", + "creatingspace.ponder.rocket_debugging.text_1": "The flight recorder give info about its last flight or no past flight if it's just placed,", "creatingspace.ponder.rocket_debugging.text_2": "no past flight", - "creatingspace.ponder.rocket_debugging.text_3": "If there is not enough propellant mass, you will get this :", + "creatingspace.ponder.rocket_debugging.text_3": "If there isn't enough propellant mass, you will get this :", "creatingspace.ponder.rocket_debugging.text_4": "not enough propellants", "creatingspace.ponder.rocket_debugging.text_5": "add more of the missing propellant to solve the issue :", - "creatingspace.ponder.rocket_debugging.text_6": "If there is enough propellant mass but the proportion are wrong, you will get this :", + "creatingspace.ponder.rocket_debugging.text_6": "If there is enough propellant mass but the proportions are wrong, you will get this :", "creatingspace.ponder.rocket_debugging.text_7": "wrong propellant ratio", "creatingspace.ponder.rocket_debugging.text_8": "equilibrate the propellants to solve the issue", "creatingspace.ponder.rocket_debugging.text_9": "if the rocket is too heavy you will get :", "creatingspace.ponder.rocket_debugging.text_10": "not enough thrust", "creatingspace.ponder.rocket_debugging.text_11": "add more engines to solve the issue", - - - "creatingspace.ponder.synthesizer.header": "Crafting Methane", "creatingspace.ponder.synthesizer.text_1": "You need to put hydrogen in it...", "creatingspace.ponder.synthesizer.text_2": "...And put coal dust, then wait for methane to be produced", @@ -50,14 +47,14 @@ "gui.engineer_table_screen.thrust_selection": "Select Thrust", "gui.engineer_table_screen.size_selection": "Select the size", - "creatingspace.overlay.flight_recorder.title": "last flight :", - "creatingspace.overlay.flight_recorder.no_failure": "no failure", - "creatingspace.overlay.flight_recorder.no_flight": "no past flight", - "creatingspace.overlay.flight_recorder.propellant_status.not_enough_propellant": "not enough propellant", - "creatingspace.overlay.flight_recorder.propellant_status.one_or_more_propellant_is_missing": "wrong ratio of propellant", - "creatingspace.overlay.flight_recorder.not_enough_thrust": "not enough thrust", - "creatingspace.overlay.flight_recorder.thrust1": "thrust", - "creatingspace.overlay.flight_recorder.thrust2": "weight", + "creatingspace.overlay.flight_recorder.title": "Last flight :", + "creatingspace.overlay.flight_recorder.no_failure": "No failure", + "creatingspace.overlay.flight_recorder.no_flight": "No past flight", + "creatingspace.overlay.flight_recorder.propellant_status.not_enough_propellant": "Not enough propellant", + "creatingspace.overlay.flight_recorder.propellant_status.one_or_more_propellant_is_missing": "Wrong ratio of propellants", + "creatingspace.overlay.flight_recorder.not_enough_thrust": "Not enough thrust", + "creatingspace.overlay.flight_recorder.thrust1": "Thrust", + "creatingspace.overlay.flight_recorder.thrust2": "Weight", "creatingspace:earth_orbit": "Earth Orbit", "creatingspace:moon_orbit": "Moon Orbit", @@ -75,7 +72,6 @@ "creatingspace.biome.moon_cave": "Moon Cave", "creatingspace.biome.venus_hellground": "Venus Hellground", - "adastra:earth_orbit": "Earth Orbit", "adastra:moon_orbit": "Moon Orbit", "adastra:the_moon": "The Moon", @@ -98,11 +94,12 @@ "creatingspace.science.isp": "ISP", "creatingspace.science.unit.second": "s", "creatingspace.science.unit.flow.millibucket_by_ticks": "mb/t", - "creatingspace.recipe.chemical": "chemical", - "creatingspace.recipe.electrolysis": "electrolysis", + "creatingspace.recipe.chemical": "Chemical Reaction", + "creatingspace.recipe.electrolysis": "Electrolysis", + "creatingspace.recipe.air_liquefying": "Air Liquefying", "propellant_type.creatingspace.methalox": "Metha/LOX", "propellant_type.creatingspace.lh2lox": "LH2/LOX", - "propellant_type.creatingspace.metalic_hydrogen": "Metalic Hydrogen", + "propellant_type.creatingspace.metalic_hydrogen": "Metallic Hydrogen", "exhaust_pack_type.creatingspace.bell_nozzle": "Bell Nozzle", "exhaust_pack_type.creatingspace.aerospike": "Aerospike", "power_pack_type.creatingspace.open_cycle": "Open Cycle", @@ -126,11 +123,11 @@ "item.creatingspace.design_blueprint.message": "unlocked :", "creatingspace.power_pack_type": "Power Pack", "creatingspace.exhaust_pack_type": "Exhaust Pack", - "creatingspace.gui.engineer_table.engine_size_hint": "heavier but decrease material requirement", - "creatingspace.gui.engineer_table.engine_thrust_hint": "more thrust but increase material requirement", - "creatingspace.gui.engineer_table.expansion_ratio": "expansion ratio :", - "creatingspace.gui.engineer_table.propellant_type_hint": "using a better propellant will mean using better materials", - "creatingspace.gui.engineer_table.max_isp": "max isp : %d s", + "creatingspace.gui.engineer_table.engine_size_hint": "Heavier but decreases material requirements", + "creatingspace.gui.engineer_table.engine_thrust_hint": "More thrust but increases material requirements", + "creatingspace.gui.engineer_table.expansion_ratio": "Expansion ratio : ", + "creatingspace.gui.engineer_table.propellant_type_hint": "Using a better propellant will allow using better materials", + "creatingspace.gui.engineer_table.max_isp": "Max ISP: %d s", "creatingspace.gui.engineer_table.material_level": "Material Lvl : %d", "creatingspace.gui.engineer_table.engine_mass": "Mass : %f t", "creatingspace.gui.engineer_table.engine_temperature": "T : %d °C", @@ -138,5 +135,4 @@ "creatingspace.gui.engineer_table.isp": "ISP : %d s", "creatingspace.gui.engineer_table.engine_size_input": "%i mb", "creatingspace.gui.engineer_table.engine_thrust_input": "%iN" - } diff --git a/src/main/resources/assets/creatingspace/lang/default/tooltips.json b/src/main/resources/assets/creatingspace/lang/default/tooltips.json index 5642f6c0..27cdeec0 100644 --- a/src/main/resources/assets/creatingspace/lang/default/tooltips.json +++ b/src/main/resources/assets/creatingspace/lang/default/tooltips.json @@ -1,26 +1,26 @@ { - "block.creatingspace.rocket_controls.tooltip.summary" : "A required block that is used by the pilot to fly the rocket.", - "block.creatingspace.rocket_generator.tooltip.summary": "A machine that burns methane and oxygen to produce SU, start with a signal of redstone if loaded with a starter charge", - "block.creatingspace.catalyst_carrier.tooltip.summary": "Allow reaction between liquid in a basin.", + "block.creatingspace.rocket_controls.tooltip.summary": "A block required for the pilot to fly the rocket.", + "block.creatingspace.rocket_generator.tooltip.summary": "A machine that burns Methane and Oxygen to produce SU, starts with a redstone signal if loaded with a starter charge.", + "block.creatingspace.catalyst_carrier.tooltip.summary": "Allows reactions between liquids in a basin.", - "block.creatingspace.chemical_synthesizer.tooltip.summary": "__[DEPRECATED]__ Needed for producing methane", - "block.creatingspace.mechanical_electrolyzer.tooltip.summary": "Split liquids in a basin", - "block.creatingspace.flight_recorder.tooltip.summary": "Displays information when the rocket fails, you'll need engineer googles to view the information", - "block.creatingspace.flow_meter.tooltip.summary": "Displays the amount of fluid passing through a pipe", - "block.creatingspace.oxygen_sealer.tooltip.summary": "A machine that fill a room with oxygen", - "block.creatingspace.air_liquefier.tooltip.summary": "Extract oxygen from the air and co2 from campfires, only works on earth", - "block.creatingspace.rocket_engineer_table.tooltip.summary" : "This table is used to create engine blueprints.", - "block.creatingspace.rocket_engineer_table.tooltip.behaviour1": "Enter your desired properties for your engine, It will give you a blueprint.", + "block.creatingspace.chemical_synthesizer.tooltip.summary": "__[DEPRECATED]__ Needed for producing methane.", + "block.creatingspace.mechanical_electrolyzer.tooltip.summary": "Splits liquids in a basin.", + "block.creatingspace.flight_recorder.tooltip.summary": "Displays information when the rocket fails, you'll need engineer googles to view the information.", + "block.creatingspace.flow_meter.tooltip.summary": "Displays the amount of fluid passing through a pipe.", + "block.creatingspace.oxygen_sealer.tooltip.summary": "A machine that fills a room with Oxygen.", + "block.creatingspace.air_liquefier.tooltip.summary": "Extracts Oxygen from the air and CO2 from campfires, only works on earth.", + "block.creatingspace.rocket_engineer_table.tooltip.summary": "This table is used to create engine blueprints.", + "block.creatingspace.rocket_engineer_table.tooltip.behaviour1": "Enter your desired properties for your engine and it will give you a blueprint.", "block.creatingspace.clamps.tooltip.summary": "A mean for preventing a contraption from moving, movable by pistons", - "block.creatingspace.cryogenic_tank.tooltip.summary": "A cold liquid exclusive tank, keep it's content after breaking. Can be use in a filter", + "block.creatingspace.cryogenic_tank.tooltip.summary": "A cold liquid exclusive tank, that keeps its content after breaking. Can be use in a filter slot.", - "item.creatingspace.starter_charge.tooltip.summary": "An explosive charge needed to start a rocket generator", + "item.creatingspace.starter_charge.tooltip.summary": "An explosive charge needed to start a rocket generator.", - "item.creatingspace.design_blueprint.tooltip.summary" : "This table is used to craft engine blueprint.", + "item.creatingspace.design_blueprint.tooltip.summary": "This table is used to craft engine blueprints.", "item.creatingspace.design_blueprint.tooltip.condition1": "R-Click", "item.creatingspace.design_blueprint.tooltip.behaviour1": "Learn new design", - "item.creatingspace.engine_blueprint.tooltip.summary" : "Use to craft rocket engines and it's component." + "item.creatingspace.engine_blueprint.tooltip.summary": "Used to craft rocket engines and their components." } diff --git a/src/main/resources/assets/creatingspace/lang/en_us.json b/src/main/resources/assets/creatingspace/lang/en_us.json index a799b188..65b650e7 100644 --- a/src/main/resources/assets/creatingspace/lang/en_us.json +++ b/src/main/resources/assets/creatingspace/lang/en_us.json @@ -3,31 +3,31 @@ "block.creatingspace.big_rocket_engine": "Big Rocket Engine", "block.creatingspace.rocket_controls": "Rocket Controls", - "block.creatingspace.rocket_controls.tooltip.summary" : "A required block that is used by the pilot to fly the rocket.", + "block.creatingspace.rocket_controls.tooltip.summary": "A required block that is used by the pilot to fly the rocket.", "block.creatingspace.rocket_generator": "Rocket Generator", "block.creatingspace.rocket_generator.tooltip.summary": "A machine that burns methane and oxygen to produce SU, start with a signal of redstone if loaded with a starter charge", "block.creatingspace.catalyst_carrier": "Catalyst Carrier", "block.creatingspace.catalyst_carrier.tooltip.summary": "Allow reaction between liquid in a basin ", "block.creatingspace.chemical_synthesizer": "Chemical Synthesizer", - "block.creatingspace.chemical_synthesizer.tooltip.summary": "__[DEPRECATED]__ Needed for producing methane", "block.creatingspace.mechanical_electrolyzer": "Mechanical Electrolyzer", - "block.creatingspace.mechanical_electrolyzer.tooltip.summary": "Split liquids in a basin", "block.creatingspace.flight_recorder": "Flight Recorder", - "block.creatingspace.flight_recorder.tooltip.summary": "Displays information when the rocket fails, you'll need engineer googles to view the information", "block.creatingspace.flow_meter": "Flowmeter", - "block.creatingspace.flow_meter.tooltip.summary": "Show the amount of fluid passing through a pipe", "block.creatingspace.oxygen_sealer": "Oxygen Sealer", - "block.creatingspace.oxygen_sealer.tooltip.summary": "A machine that fill a room with oxygen", "block.creatingspace.air_liquefier": "Air Liquefier", - "block.creatingspace.air_liquefier.tooltip.summary": "Extract oxygen from the air and co2 from campfires, only works on earth", "block.creatingspace.rocket_engineer_table": "Rocket Engineering Table", - "block.creatingspace.rocket_engineer_table.tooltip.summary" : "This table is used to create engine blueprints.", - "block.creatingspace.rocket_engineer_table.tooltip.behaviour1": "Enter your desired properties for your engine, It will give you a blueprint.", "block.creatingspace.rocket_engine": "Rocket Engine", - "entity.creatingspace.rocket_contraption": "Flying Rocket", + "block.creatingspace.chemical_synthesizer.tooltip.summary": "__[DEPRECATED]__ Needed for producing methane.", + "block.creatingspace.mechanical_electrolyzer.tooltip.summary": "Splits liquids in a basin.", + "block.creatingspace.flight_recorder.tooltip.summary": "Displays information when the rocket fails, you'll need engineer googles to view the information.", + "block.creatingspace.flow_meter.tooltip.summary": "Displays the amount of fluid passing through a pipe.", + "block.creatingspace.oxygen_sealer.tooltip.summary": "A machine that fills a room with Oxygen.", + "block.creatingspace.air_liquefier.tooltip.summary": "Extracts Oxygen from the air and CO2 from campfires, only works on earth.", + "block.creatingspace.rocket_engineer_table.tooltip.summary": "This table is used to create engine blueprints.", + "block.creatingspace.rocket_engineer_table.tooltip.behaviour1": "Enter your desired properties for your engine and it will give you a blueprint.", + "entity.creatingspace.rocket_contraption": "Flying Rocket", "block.creatingspace.clamps": "Clamps", "block.creatingspace.clamps.tooltip.summary": "A mean for preventing a contraption from moving, movable by pistons", @@ -53,19 +53,18 @@ "block.creatingspace.raw_aluminum_block": "Raw Aluminum Block", "item.creatingspace.basic_spacesuit_helmet": "Basic Spacesuit Helmet", - "item.creatingspace.copper_oxygen_backtank" : "Copper Oxygen Backtank", + "item.creatingspace.copper_oxygen_backtank": "Copper Oxygen Backtank", "item.creatingspace.basic_spacesuit_leggings": "Basic Spacesuit Legging", "item.creatingspace.basic_spacesuit_boots": "Basic Spacesuit Boots", "item.creatingspace.advanced_spacesuit_helmet": "Advanced Spacesuit Helmet", - "item.creatingspace.netherite_oxygen_backtank" : "Netherite Oxygen Backtank", + "item.creatingspace.netherite_oxygen_backtank": "Netherite Oxygen Backtank", "item.creatingspace.advanced_spacesuit_leggings": "Advanced Spacesuit Legging", "item.creatingspace.advanced_spacesuit_boots": "Advanced Spacesuit Boots", "item.creatingspace.basic_spacesuit_fabric": "Basic Spacesuit Fabric", "item.creatingspace.advanced_spacesuit_fabric": "Advanced Spacesuit Fabric", - "item.creatingspace.injector": "Injector", "item.creatingspace.reinforced_injector": "Reinforced Injector", @@ -79,11 +78,11 @@ "item.creatingspace.sturdy_propeller": "Sturdy Propeller", "item.creatingspace.combustion_chamber": "Combustion Chamber", "item.creatingspace.bell_nozzle": "Bell Nozzle", - "item.creatingspace.copper_coil":"Copper Coil", - "item.creatingspace.basic_catalyst":"Basic Catalyst", + "item.creatingspace.copper_coil": "Copper Coil", + "item.creatingspace.basic_catalyst": "Basic Catalyst", "item.creatingspace.aerospike_plug": "Aerospike Plug", - "item.creatingspace.exhaust_pack":"Exhaust Pack", - "item.creatingspace.power_pack":"Power Pack", + "item.creatingspace.exhaust_pack": "Exhaust Pack", + "item.creatingspace.power_pack": "Power Pack", "item.creatingspace.andesite_ingot": "Andesite Ingot", "item.creatingspace.andesite_nugget": "Andesite Nugget", @@ -230,13 +229,12 @@ "item.creatingspace.hastelloy_engine_wall": "Hastelloy Engine Wall", "item.creatingspace.hastelloy_engine_pipe": "Hastelloy Engine Pipe", - "item.creatingspace.nickel_ingot": "Nickel Ingot", "item.creatingspace.nickel_nugget": "Nickel Nugget", "item.creatingspace.nickel_sheet": "Nickel Sheet", "item.creatingspace.crushed_nickel_ore": "Crushed Nickel Ore", "item.creatingspace.raw_nickel": "Raw Nickel", - "item.creatingspace.nickel_dust":"Nickel Dust", + "item.creatingspace.nickel_dust": "Nickel Dust", "item.creatingspace.coal_dust": "Coal Dust", @@ -256,22 +254,20 @@ "item.creatingspace.liquid_oxygen_bucket": "Bucket of Liquid Oxygen", "item.creatingspace.liquid_hydrogen_bucket": "Bucket of Liquid Hydrogen", - "fluid.creatingspace.liquid_methane" : "Liquid Methane", - "fluid.creatingspace.liquid_oxygen" : "Liquid Oxygen", - "fluid.creatingspace.liquid_hydrogen" : "Liquid Hydrogen", + "fluid.creatingspace.liquid_methane": "Liquid Methane", + "fluid.creatingspace.liquid_oxygen": "Liquid Oxygen", + "fluid.creatingspace.liquid_hydrogen": "Liquid Hydrogen", "fluid.creatingspace.liquid_co2": "Liquid CO2", - "item.creatingspace.space_food": "Space Food", "item.creatingspace.space_food.tooltip.summary": "...ew", "item.creatingspace.design_blueprint": "Design Blueprint", - "item.creatingspace.design_blueprint.tooltip.summary" : "This table is used to craft engine blueprints.", + "item.creatingspace.design_blueprint.tooltip.summary": "This table is used to craft engine blueprints.", "item.creatingspace.design_blueprint.tooltip.condition1": "R-Click", "item.creatingspace.design_blueprint.tooltip.behaviour1": "Learn new design", "item.creatingspace.engine_blueprint": "Engine Blueprint", - "item.creatingspace.engine_blueprint.tooltip.summary" : "Use to craft rocket engines and it's component.", - + "item.creatingspace.engine_blueprint.tooltip.summary": "Use to craft rocket engines and it's component.", "itemGroup.creatingspace.machine_tab": "Machine Tab", "itemGroup.creatingspace.component_tab": "Component Tab", @@ -289,21 +285,18 @@ "creatingspace.ponder.rocket_building.text_6": "the flight recorder can help in those moments", "creatingspace.ponder.rocket_debugging.header": "Rockets debugging", - "creatingspace.ponder.rocket_debugging.text_1": "The flight recorder give info about it's last flight or no past flight if it's just placed,", + "creatingspace.ponder.rocket_debugging.text_1": "The flight recorder give info about its last flight or no past flight if it's just placed,", "creatingspace.ponder.rocket_debugging.text_2": "no past flight", - "creatingspace.ponder.rocket_debugging.text_3": "If there is not enough propellant mass, you will get this :", + "creatingspace.ponder.rocket_debugging.text_3": "If there isn't enough propellant mass, you will get this :", "creatingspace.ponder.rocket_debugging.text_4": "not enough propellants", "creatingspace.ponder.rocket_debugging.text_5": "add more of the missing propellant to solve the issue :", - "creatingspace.ponder.rocket_debugging.text_6": "If there is enough propellant mass but the proportion are wrong, you will get this :", + "creatingspace.ponder.rocket_debugging.text_6": "If there is enough propellant mass but the proportions are wrong, you will get this :", "creatingspace.ponder.rocket_debugging.text_7": "wrong propellant ratio", "creatingspace.ponder.rocket_debugging.text_8": "equilibrate the propellants to solve the issue", "creatingspace.ponder.rocket_debugging.text_9": "if the rocket is too heavy you will get :", "creatingspace.ponder.rocket_debugging.text_10": "not enough thrust", "creatingspace.ponder.rocket_debugging.text_11": "add more engines to solve the issue", - - - "creatingspace.ponder.synthesizer.header": "Crafting Methane", "creatingspace.ponder.synthesizer.text_1": "You need to put hydrogen in it...", "creatingspace.ponder.synthesizer.text_2": "...And put coal dust, then wait for methane to be produced", @@ -324,14 +317,14 @@ "gui.engineer_table_screen.thrust_selection": "Select Thrust", "gui.engineer_table_screen.size_selection": "Select the size", - "creatingspace.overlay.flight_recorder.title": "last flight :", - "creatingspace.overlay.flight_recorder.no_failure": "no failure", - "creatingspace.overlay.flight_recorder.no_flight": "no past flight", - "creatingspace.overlay.flight_recorder.propellant_status.not_enough_propellant": "not enough propellant", - "creatingspace.overlay.flight_recorder.propellant_status.one_or_more_propellant_is_missing": "wrong ratio of propellant", - "creatingspace.overlay.flight_recorder.not_enough_thrust": "not enough thrust", - "creatingspace.overlay.flight_recorder.thrust1": "thrust", - "creatingspace.overlay.flight_recorder.thrust2": "weight", + "creatingspace.overlay.flight_recorder.title": "Last flight :", + "creatingspace.overlay.flight_recorder.no_failure": "No failure", + "creatingspace.overlay.flight_recorder.no_flight": "No past flight", + "creatingspace.overlay.flight_recorder.propellant_status.not_enough_propellant": "Not enough propellant", + "creatingspace.overlay.flight_recorder.propellant_status.one_or_more_propellant_is_missing": "Wrong ratio of propellants", + "creatingspace.overlay.flight_recorder.not_enough_thrust": "Not enough thrust", + "creatingspace.overlay.flight_recorder.thrust1": "Thrust", + "creatingspace.overlay.flight_recorder.thrust2": "Weight", "creatingspace:earth_orbit": "Earth Orbit", "creatingspace:moon_orbit": "Moon Orbit", @@ -349,7 +342,6 @@ "creatingspace.biome.moon_cave": "Moon Cave", "creatingspace.biome.venus_hellground": "Venus Hellground", - "adastra:earth_orbit": "Earth Orbit", "adastra:moon_orbit": "Moon Orbit", "adastra:the_moon": "The Moon", @@ -372,11 +364,12 @@ "creatingspace.science.isp": "ISP", "creatingspace.science.unit.second": "s", "creatingspace.science.unit.flow.millibucket_by_ticks": "mb/t", - "creatingspace.recipe.chemical": "chemical", - "creatingspace.recipe.electrolysis": "electrolysis", + "creatingspace.recipe.chemical": "Chemical Reaction", + "creatingspace.recipe.electrolysis": "Electrolysis", + "creatingspace.recipe.air_liquefying": "Air Liquefying", "propellant_type.creatingspace.methalox": "Metha/LOX", "propellant_type.creatingspace.lh2lox": "LH2/LOX", - "propellant_type.creatingspace.metalic_hydrogen": "Metalic Hydrogen", + "propellant_type.creatingspace.metalic_hydrogen": "Metallic Hydrogen", "exhaust_pack_type.creatingspace.bell_nozzle": "Bell Nozzle", "exhaust_pack_type.creatingspace.aerospike": "Aerospike", "power_pack_type.creatingspace.open_cycle": "Open Cycle", @@ -412,5 +405,4 @@ "creatingspace.gui.engineer_table.isp": "ISP : %d s", "creatingspace.gui.engineer_table.engine_size_input": "%i mb", "creatingspace.gui.engineer_table.engine_thrust_input": "%iN" - } diff --git a/src/main/resources/data/creatingspace/curios/entities/entities.json b/src/main/resources/data/creatingspace/curios/entities/entities.json new file mode 100644 index 00000000..63f68f96 --- /dev/null +++ b/src/main/resources/data/creatingspace/curios/entities/entities.json @@ -0,0 +1,4 @@ +{ + "entities": ["minecraft:player"], + "slots": ["back"] +} diff --git a/src/main/resources/data/creatingspace/curios/slots/back.json b/src/main/resources/data/creatingspace/curios/slots/back.json new file mode 100644 index 00000000..10e4ff64 --- /dev/null +++ b/src/main/resources/data/creatingspace/curios/slots/back.json @@ -0,0 +1,4 @@ +{ + "size": 1, + "add_cosmetic": true +} diff --git a/src/main/resources/data/curios/entities/entities.json b/src/main/resources/data/curios/entities/entities.json new file mode 100644 index 00000000..63f68f96 --- /dev/null +++ b/src/main/resources/data/curios/entities/entities.json @@ -0,0 +1,4 @@ +{ + "entities": ["minecraft:player"], + "slots": ["back"] +} diff --git a/src/main/resources/data/curios/slots/back.json b/src/main/resources/data/curios/slots/back.json new file mode 100644 index 00000000..46c48804 --- /dev/null +++ b/src/main/resources/data/curios/slots/back.json @@ -0,0 +1,4 @@ +{ + "size": 1, + "add_cosmetic": false +} diff --git a/src/main/resources/data/curios/tags/items/back.json b/src/main/resources/data/curios/tags/items/back.json index a9692fa3..5f07d711 100644 --- a/src/main/resources/data/curios/tags/items/back.json +++ b/src/main/resources/data/curios/tags/items/back.json @@ -2,6 +2,14 @@ "replace": false, "values": [ "creatingspace:copper_oxygen_backtank", - "creatingspace:netherite_oxygen_backtank" + "creatingspace:netherite_oxygen_backtank", + { + "id": "creatingspace:copper_oxygen_backtank", + "required": false + }, + { + "id": "creatingspace:netherite_oxygen_backtank", + "required": false + } ] }