diff --git a/build.gradle b/build.gradle index 99dea7d..6cbbe62 100644 --- a/build.gradle +++ b/build.gradle @@ -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 @@ -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") @@ -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 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 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 { @@ -117,19 +83,23 @@ jar { publishing { publications { - mavenJava(MavenPublication) { - from components.java + register("mavenJava", MavenPublication) { + artifactId = archivesBaseName + "_${project.name}" + //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) } } } } diff --git a/gradle.properties b/gradle.properties index ec4dd36..076ef47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,12 +5,13 @@ org.gradle.parallel = true maven_group = one.devos.nautical archives_base_name = succ # is replaced at compile time with either GitHub Actions build number, or 99999 if not available. -version = 0.1. +version = 0.2. 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 diff --git a/settings.gradle b/settings.gradle index 656e0ed..ec41dc5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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() diff --git a/src/testmod/java/one/devos/nautical/succ_test/SuccTest.java b/src/testmod/java/one/devos/nautical/succ_test/SuccTest.java deleted file mode 100644 index 63dfe79..0000000 --- a/src/testmod/java/one/devos/nautical/succ_test/SuccTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package one.devos.nautical.succ_test; - -import net.minecraft.resources.ResourceLocation; - -import org.quiltmc.loader.api.ModContainer; -import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class SuccTest implements ModInitializer { - public static final String ID = "succ_test"; - public static final Logger LOGGER = LoggerFactory.getLogger(ID); - - @Override - public void onInitialize(ModContainer mod) { - } - - public static ResourceLocation id(String path) { - return new ResourceLocation(ID, path); - } -} diff --git a/src/testmod/java/one/devos/nautical/succ_test/gametest/SuccGameTest.java b/src/testmod/java/one/devos/nautical/succ_test/gametest/SuccGameTest.java deleted file mode 100644 index 4710c3d..0000000 --- a/src/testmod/java/one/devos/nautical/succ_test/gametest/SuccGameTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package one.devos.nautical.succ_test.gametest; - -import one.devos.nautical.succ_test.SuccTest; -import net.fabricmc.fabric.api.gametest.v1.FabricGameTest; -import net.minecraft.gametest.framework.GameTest; -import net.minecraft.gametest.framework.GameTestHelper; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.level.block.Blocks; - -public class SuccGameTest implements FabricGameTest { - @GameTest(template = SuccTest.ID + ":minecart_test") - public void minecartTest(GameTestHelper helper) { - helper.setBlock(2, 2, 0, Blocks.REDSTONE_BLOCK); - helper.succeedWhenEntityPresent(EntityType.MINECART, 2, 2, 3); - } -} diff --git a/src/testmod/resources/assets/succ_test/icon.png b/src/testmod/resources/assets/succ_test/icon.png deleted file mode 100644 index 047b91f..0000000 Binary files a/src/testmod/resources/assets/succ_test/icon.png and /dev/null differ diff --git a/src/testmod/resources/data/succ_test/gametest/structures/minecart_test.snbt b/src/testmod/resources/data/succ_test/gametest/structures/minecart_test.snbt deleted file mode 100644 index 9ef19ce..0000000 --- a/src/testmod/resources/data/succ_test/gametest/structures/minecart_test.snbt +++ /dev/null @@ -1,142 +0,0 @@ -{ - DataVersion: 3105, - size: [5, 5, 5], - data: [ - {pos: [0, 0, 0], state: "minecraft:polished_andesite"}, - {pos: [0, 0, 1], state: "minecraft:polished_andesite"}, - {pos: [0, 0, 2], state: "minecraft:polished_andesite"}, - {pos: [0, 0, 3], state: "minecraft:polished_andesite"}, - {pos: [0, 0, 4], state: "minecraft:polished_andesite"}, - {pos: [1, 0, 0], state: "minecraft:polished_andesite"}, - {pos: [1, 0, 1], state: "minecraft:polished_andesite"}, - {pos: [1, 0, 2], state: "minecraft:polished_andesite"}, - {pos: [1, 0, 3], state: "minecraft:polished_andesite"}, - {pos: [1, 0, 4], state: "minecraft:polished_andesite"}, - {pos: [2, 0, 0], state: "minecraft:polished_andesite"}, - {pos: [2, 0, 1], state: "minecraft:polished_andesite"}, - {pos: [2, 0, 2], state: "minecraft:polished_andesite"}, - {pos: [2, 0, 3], state: "minecraft:polished_andesite"}, - {pos: [2, 0, 4], state: "minecraft:polished_andesite"}, - {pos: [3, 0, 0], state: "minecraft:polished_andesite"}, - {pos: [3, 0, 1], state: "minecraft:polished_andesite"}, - {pos: [3, 0, 2], state: "minecraft:polished_andesite"}, - {pos: [3, 0, 3], state: "minecraft:polished_andesite"}, - {pos: [3, 0, 4], state: "minecraft:polished_andesite"}, - {pos: [4, 0, 0], state: "minecraft:polished_andesite"}, - {pos: [4, 0, 1], state: "minecraft:polished_andesite"}, - {pos: [4, 0, 2], state: "minecraft:polished_andesite"}, - {pos: [4, 0, 3], state: "minecraft:polished_andesite"}, - {pos: [4, 0, 4], state: "minecraft:polished_andesite"}, - {pos: [0, 1, 0], state: "minecraft:air"}, - {pos: [0, 1, 1], state: "minecraft:air"}, - {pos: [0, 1, 2], state: "minecraft:air"}, - {pos: [0, 1, 3], state: "minecraft:air"}, - {pos: [0, 1, 4], state: "minecraft:air"}, - {pos: [1, 1, 0], state: "minecraft:air"}, - {pos: [1, 1, 1], state: "minecraft:rail{shape:south_east,waterlogged:false}"}, - {pos: [1, 1, 2], state: "minecraft:rail{shape:north_south,waterlogged:false}"}, - {pos: [1, 1, 3], state: "minecraft:rail{shape:north_east,waterlogged:false}"}, - {pos: [1, 1, 4], state: "minecraft:air"}, - {pos: [2, 1, 0], state: "minecraft:air"}, - {pos: [2, 1, 1], state: "minecraft:powered_rail{powered:false,shape:east_west,waterlogged:false}"}, - {pos: [2, 1, 2], state: "minecraft:air"}, - {pos: [2, 1, 3], state: "minecraft:powered_rail{powered:false,shape:east_west,waterlogged:false}"}, - {pos: [2, 1, 4], state: "minecraft:air"}, - {pos: [3, 1, 0], state: "minecraft:air"}, - {pos: [3, 1, 1], state: "minecraft:polished_andesite"}, - {pos: [3, 1, 2], state: "minecraft:air"}, - {pos: [3, 1, 3], state: "minecraft:polished_andesite"}, - {pos: [3, 1, 4], state: "minecraft:air"}, - {pos: [4, 1, 0], state: "minecraft:air"}, - {pos: [4, 1, 1], state: "minecraft:air"}, - {pos: [4, 1, 2], state: "minecraft:air"}, - {pos: [4, 1, 3], state: "minecraft:air"}, - {pos: [4, 1, 4], state: "minecraft:air"}, - {pos: [0, 2, 0], state: "minecraft:air"}, - {pos: [0, 2, 1], state: "minecraft:air"}, - {pos: [0, 2, 2], state: "minecraft:air"}, - {pos: [0, 2, 3], state: "minecraft:air"}, - {pos: [0, 2, 4], state: "minecraft:air"}, - {pos: [1, 2, 0], state: "minecraft:air"}, - {pos: [1, 2, 1], state: "minecraft:air"}, - {pos: [1, 2, 2], state: "minecraft:air"}, - {pos: [1, 2, 3], state: "minecraft:air"}, - {pos: [1, 2, 4], state: "minecraft:air"}, - {pos: [2, 2, 0], state: "minecraft:air"}, - {pos: [2, 2, 1], state: "minecraft:air"}, - {pos: [2, 2, 2], state: "minecraft:air"}, - {pos: [2, 2, 3], state: "minecraft:air"}, - {pos: [2, 2, 4], state: "minecraft:air"}, - {pos: [3, 2, 0], state: "minecraft:air"}, - {pos: [3, 2, 1], state: "minecraft:air"}, - {pos: [3, 2, 2], state: "minecraft:air"}, - {pos: [3, 2, 3], state: "minecraft:air"}, - {pos: [3, 2, 4], state: "minecraft:air"}, - {pos: [4, 2, 0], state: "minecraft:air"}, - {pos: [4, 2, 1], state: "minecraft:air"}, - {pos: [4, 2, 2], state: "minecraft:air"}, - {pos: [4, 2, 3], state: "minecraft:air"}, - {pos: [4, 2, 4], state: "minecraft:air"}, - {pos: [0, 3, 0], state: "minecraft:air"}, - {pos: [0, 3, 1], state: "minecraft:air"}, - {pos: [0, 3, 2], state: "minecraft:air"}, - {pos: [0, 3, 3], state: "minecraft:air"}, - {pos: [0, 3, 4], state: "minecraft:air"}, - {pos: [1, 3, 0], state: "minecraft:air"}, - {pos: [1, 3, 1], state: "minecraft:air"}, - {pos: [1, 3, 2], state: "minecraft:air"}, - {pos: [1, 3, 3], state: "minecraft:air"}, - {pos: [1, 3, 4], state: "minecraft:air"}, - {pos: [2, 3, 0], state: "minecraft:air"}, - {pos: [2, 3, 1], state: "minecraft:air"}, - {pos: [2, 3, 2], state: "minecraft:air"}, - {pos: [2, 3, 3], state: "minecraft:air"}, - {pos: [2, 3, 4], state: "minecraft:air"}, - {pos: [3, 3, 0], state: "minecraft:air"}, - {pos: [3, 3, 1], state: "minecraft:air"}, - {pos: [3, 3, 2], state: "minecraft:air"}, - {pos: [3, 3, 3], state: "minecraft:air"}, - {pos: [3, 3, 4], state: "minecraft:air"}, - {pos: [4, 3, 0], state: "minecraft:air"}, - {pos: [4, 3, 1], state: "minecraft:air"}, - {pos: [4, 3, 2], state: "minecraft:air"}, - {pos: [4, 3, 3], state: "minecraft:air"}, - {pos: [4, 3, 4], state: "minecraft:air"}, - {pos: [0, 4, 0], state: "minecraft:air"}, - {pos: [0, 4, 1], state: "minecraft:air"}, - {pos: [0, 4, 2], state: "minecraft:air"}, - {pos: [0, 4, 3], state: "minecraft:air"}, - {pos: [0, 4, 4], state: "minecraft:air"}, - {pos: [1, 4, 0], state: "minecraft:air"}, - {pos: [1, 4, 1], state: "minecraft:air"}, - {pos: [1, 4, 2], state: "minecraft:air"}, - {pos: [1, 4, 3], state: "minecraft:air"}, - {pos: [1, 4, 4], state: "minecraft:air"}, - {pos: [2, 4, 0], state: "minecraft:air"}, - {pos: [2, 4, 1], state: "minecraft:air"}, - {pos: [2, 4, 2], state: "minecraft:air"}, - {pos: [2, 4, 3], state: "minecraft:air"}, - {pos: [2, 4, 4], state: "minecraft:air"}, - {pos: [3, 4, 0], state: "minecraft:air"}, - {pos: [3, 4, 1], state: "minecraft:air"}, - {pos: [3, 4, 2], state: "minecraft:air"}, - {pos: [3, 4, 3], state: "minecraft:air"}, - {pos: [3, 4, 4], state: "minecraft:air"}, - {pos: [4, 4, 0], state: "minecraft:air"}, - {pos: [4, 4, 1], state: "minecraft:air"}, - {pos: [4, 4, 2], state: "minecraft:air"}, - {pos: [4, 4, 3], state: "minecraft:air"}, - {pos: [4, 4, 4], state: "minecraft:air"} - ], - entities: [ - {blockPos: [2, 1, 1], pos: [2.5d, 1.0625d, 1.5d], nbt: {Air: 300s, FallDistance: 0.0f, Fire: -1s, Invulnerable: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [-8.5d, 58.0625d, -13.5d], Rotation: [0.0f, 0.0f], UUID: [I; 1355458928, -2135995027, -1655719554, 442553866], id: "minecraft:minecart"}} - ], - palette: [ - "minecraft:polished_andesite", - "minecraft:air", - "minecraft:rail{shape:south_east,waterlogged:false}", - "minecraft:rail{shape:north_south,waterlogged:false}", - "minecraft:rail{shape:north_east,waterlogged:false}", - "minecraft:powered_rail{powered:false,shape:east_west,waterlogged:false}" - ] -} diff --git a/src/testmod/resources/quilt.mod.json b/src/testmod/resources/quilt.mod.json deleted file mode 100644 index b569667..0000000 --- a/src/testmod/resources/quilt.mod.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "schema_version": 1, - "quilt_loader": { - "group": "one.devos.nautical", - "id": "succ_test", - "version": "1.0.0", - "metadata": { - "name": "Succ™ Test", - "description": "Test mod for Succ™.", - "contributors": { - "devOS: Sanity Edition, Team Nautical": "Owner" - }, - "contact": { - "issues": "https://github.com/devOS-Sanity-Edition/succ/issues", - "sources": "https://github.com/devOS-Sanity-Edition/succ" - }, - "icon": "assets/succ_test/icon.png" - }, - "intermediate_mappings": "net.fabricmc:intermediary", - "entrypoints": { - "init": "one.devos.nautical.succ_test.SuccTest", - "fabric-gametest": [ - "one.devos.nautical.succ_test.gametest.SuccGameTest" - ] - } - } -}