Skip to content

Commit

Permalink
clean gradle, remove testmod, update stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
TropheusJ committed Jul 8, 2023
1 parent 14656a9 commit 7b0dd53
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 264 deletions.
76 changes: 23 additions & 53 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id "org.quiltmc.loom" version "1.0.+"
id "io.github.juuxel.loom-quiltflower" version "1.8.+"
id "maven-publish"
}
archivesBaseName = project.archives_base_name
Expand All @@ -23,7 +22,7 @@ dependencies {
minecraft("com.mojang:minecraft:$minecraft_version")
mappings loom.layered {
it.mappings("org.quiltmc:quilt-mappings:$minecraft_version+build.$qm_build:intermediary-v2")
it.officialMojangMappings { setNameSyntheticMembers(false) }
it.officialMojangMappings { nameSyntheticMembers = false }
}
modImplementation("org.quiltmc:quilt-loader:$quilt_loader")
modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:$quilted_fabric_api")
Expand All @@ -36,69 +35,36 @@ dependencies {
modLocalRuntime("dev.emi:emi-fabric:$emi_version")
}

task buildOrPublish {
tasks.register("buildOrPublish") {
group = "build"
String mavenUser = System.getenv().MAVEN_USER
String mavenUser = System.getenv("MAVEN_USER")
if (mavenUser != null && !mavenUser.isEmpty()) {
dependsOn(tasks.getByName("publish"))
dependsOn(tasks.named("publish"))
println("prepared for publish")
} else {
dependsOn(tasks.getByName("build"))
dependsOn(tasks.named("build"))
println("prepared for build")
}
}

processResources {
Map<String, String> properties = new HashMap<>()
properties.put("version", version)
properties.put("loader_version", quilt_loader)
properties.put("qfapi_version", quilted_fabric_api)
properties.put("minecraft_version", minecraft_version)
Map<String, Object> properties = [
"version": version,
"loader_version": quilt_loader,
"qfapi_version": quilted_fabric_api,
"minecraft_version": minecraft_version
]

properties.forEach((k, v) -> inputs.property(k, v))
properties.forEach(inputs::property)

filesMatching("quilt.mod.json") {
expand properties
}
}

sourceSets {
testmod {
compileClasspath += main.compileClasspath
compileClasspath += main.output
runtimeClasspath += main.runtimeClasspath
runtimeClasspath += main.output
}
}

loom {
runs {
testmodClient {
client()
name "Testmod Client"
source sourceSets.testmod
runDir "run/test"
}
testmodServer {
server()
name "Testmod Server"
source sourceSets.testmod
runDir "run/test_server"
}
gametest {
server()
name "Test"
source sourceSets.testmod
vmArg "-Dfabric-api.gametest"
vmArg "-Dfabric-api.gametest.report-file=${project.buildDir}/junit.xml"
runDir "run/gametest_server"
}
}
}

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 17
it.options.release.set(17)
}

java {
Expand All @@ -117,19 +83,23 @@ jar {

publishing {
publications {
mavenJava(MavenPublication) {
from components.java
register("mavenJava", MavenPublication) {
artifactId = archivesBaseName + "_${project.name}"

This comment has been minimized.

Copy link
@asoji

asoji Jul 17, 2023

Member

what the fuck

//noinspection GroovyAssignabilityCheck
from(components.java)
}
}

repositories {
maven {
url = "https://mvn.devos.one/${System.getenv().PUBLISH_SUFFIX}/"
url = "https://mvn.devos.one/${System.getenv("PUBLISH_SUFFIX")}/"
credentials {
username = System.getenv().MAVEN_USER
password = System.getenv().MAVEN_PASS
username = System.getenv("MAVEN_USER")
password = System.getenv("MAVEN_PASS")
}
authentication {
create("basic", BasicAuthentication)
}
authentication { basic(BasicAuthentication) }
}
}
}
9 changes: 5 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ org.gradle.parallel = true
maven_group = one.devos.nautical
archives_base_name = succ
# <build> is replaced at compile time with either GitHub Actions build number, or 99999 if not available.
version = 0.1.<build>
version = 0.2.<build>

minecraft_version = 1.20.1
qm_build = 7
quilt_loader = 0.19.2-beta.5
quilted_fabric_api = 7.0.4+0.84.0-1.20.1
# https://lambdaurora.dev/tools/import_quilt.html
qm_build = 13
quilt_loader = 0.19.2
quilted_fabric_api = 7.0.5+0.84.0-1.20.1

# dev env mods
# https://modrinth.com/mod/suggestion-tweaker
Expand Down
1 change: 0 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
pluginManagement {
repositories {
maven { url = "https://maven.fabricmc.net/" }
maven { url = "https://server.bbkr.space/artifactory/libs-release/" }
maven { url = "https://maven.quiltmc.org/repository/release" }
mavenCentral()
gradlePluginPortal()
Expand Down
21 changes: 0 additions & 21 deletions src/testmod/java/one/devos/nautical/succ_test/SuccTest.java

This file was deleted.

This file was deleted.

Binary file removed src/testmod/resources/assets/succ_test/icon.png
Binary file not shown.

This file was deleted.

27 changes: 0 additions & 27 deletions src/testmod/resources/quilt.mod.json

This file was deleted.

0 comments on commit 7b0dd53

Please sign in to comment.