From 7feac823a7b9fcd26734563b01623eade10ccc94 Mon Sep 17 00:00:00 2001 From: Gregory Maddra Date: Thu, 9 Jun 2022 21:42:04 -0500 Subject: [PATCH] Add bare minimum Modrinth configuration --- build.gradle | 19 +++++++++++++++++-- changes.md | 14 ++++++++++++++ gradle.properties | 4 +++- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 changes.md diff --git a/build.gradle b/build.gradle index 4a3bb03c..7bc21d73 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.1" + classpath group: 'com.modrinth.minotaur', name: 'Minotaur', version: '2.+' } } apply plugin: 'net.minecraftforge.gradle' @@ -22,6 +23,7 @@ apply plugin: 'kotlinx-serialization' apply plugin: "com.github.johnrengelman.shadow" apply from: 'https://raw.githubusercontent.com/thedarkcolour/KotlinForForge/site/thedarkcolour/kotlinforforge/gradle/kff-3.3.2.gradle' apply plugin: 'eclipse' +apply plugin: 'com.modrinth.minotaur' apply plugin: 'maven-publish' @@ -35,7 +37,7 @@ 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: 'parchment', version: "2022.05.22-1.18.2" + mappings channel: 'parchment', version: "2022.05.22-$mcVersion" accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') @@ -113,7 +115,7 @@ repositories { } dependencies { - minecraft 'net.minecraftforge:forge:1.18.2-40.1.25' + minecraft "net.minecraftforge:forge:$mcVersion-40.1.25" compileOnly fg.deobf("mcp.mobius.waila:wthit-api:forge-4.7.2") runtimeOnly fg.deobf("mcp.mobius.waila:wthit:forge-4.7.2") library('com.github.age-series:libage:main-SNAPSHOT') @@ -195,3 +197,16 @@ compileTestKotlin { } // 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 // publish.dependsOn('reobfJar') +modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = "iTyN4Kv7" + versionNumber = "$project.version" + versionName = "eln2-$project.version" + versionType = "alpha" + uploadFile = shadowJar + gameVersions = [ "$mcVersion" ] + changelog = file('changes.md').text + dependencies { + required.project("ordsPcFz") + } +} diff --git a/changes.md b/changes.md new file mode 100644 index 00000000..37efaf81 --- /dev/null +++ b/changes.md @@ -0,0 +1,14 @@ +First release that works. + +Adds: +* Resistor (with configurable GUI for resistance) +* Wire +* Voltage Source (with configurable GUI for voltage) - an ideal DC voltage source. +* Ground Pin +* Capacitor (with configurable GUI for capacitance in Farads) +* Inductor (with configurable GUI for inductance in Henries) +* Diode +* 12v Battery (acts like a voltage source) +* Solar Panel (acts like a voltage source) + +Only supports placement in the horizontal plane for now, some connectivity issues and bugs still to be worked out. diff --git a/gradle.properties b/gradle.properties index 878bf1f7..e7af9c94 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,6 @@ # 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 \ No newline at end of file +org.gradle.daemon=false + +mcVersion=1.18.2