Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add bare minimum Modrinth configuration #210

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'


Expand All @@ -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')

Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left a comment further down about how this is not really globalized.

versionName = "eln2-$project.version"
versionType = "alpha"
uploadFile = shadowJar
gameVersions = [ "$mcVersion" ]
changelog = file('changes.md').text
dependencies {
required.project("ordsPcFz")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we leave a comment here that it depends on KFF? Then I don't need to look up the ID.

}
}
14 changes: 14 additions & 0 deletions changes.md
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 3 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
org.gradle.daemon=false

mcVersion=1.18.2
jrddunbr marked this conversation as resolved.
Show resolved Hide resolved