From 90e99513d7db8ca64161c92a25f8271efa7c5942 Mon Sep 17 00:00:00 2001 From: calmilamsy Date: Fri, 8 Aug 2025 16:03:28 +0100 Subject: [PATCH 1/3] Revert project changes in #127 :/ --- build.gradle.kts | 47 ++++++++++----- .../net/fabricmc/loom/util/GroovyXmlUtil.java | 59 +++++++++++++++++++ .../stationapi/gradle/SubprojectHelpers.java | 48 +++++++++++++++ station-achievements-v0/build.gradle.kts | 2 +- station-armor-api-v0/build.gradle.kts | 2 +- station-audio-loader-v0/build.gradle.kts | 2 +- station-biome-events-v0/build.gradle.kts | 2 +- station-blockentities-v0/build.gradle.kts | 2 +- station-blockitems-v0/build.gradle.kts | 2 +- station-blocks-v0/build.gradle.kts | 2 +- station-container-api-v0/build.gradle.kts | 2 +- station-datafixer-v0/build.gradle.kts | 2 +- station-dimensions-v0/build.gradle.kts | 2 +- station-effects-api-v0/build.gradle.kts | 2 +- station-entities-v0/build.gradle.kts | 2 +- station-flattening-v0/build.gradle.kts | 2 +- station-gui-api-v0/build.gradle.kts | 2 +- station-items-v0/build.gradle.kts | 2 +- station-keybindings-v0/build.gradle.kts | 2 +- station-lifecycle-events-v0/build.gradle.kts | 2 +- station-localization-api-v0/build.gradle.kts | 2 +- station-maths-v0/build.gradle.kts | 2 +- station-nbt-v0/build.gradle.kts | 2 +- station-networking-v0/build.gradle.kts | 2 +- station-player-api-v0/build.gradle.kts | 2 +- station-recipes-v0/build.gradle.kts | 2 +- station-registry-api-v0/build.gradle.kts | 2 +- station-registry-sync-v0/build.gradle.kts | 2 +- station-renderer-api-v0/build.gradle.kts | 2 +- station-renderer-arsenic/build.gradle.kts | 2 +- station-resource-loader-v0/build.gradle.kts | 5 +- station-templates-v0/build.gradle.kts | 2 +- station-tools-api-v1/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- station-vanilla-checker-v0/build.gradle.kts | 2 +- station-vanilla-fix-v0/build.gradle.kts | 2 +- station-world-events-v0/build.gradle.kts | 2 +- station-worldgen-api-v0/build.gradle.kts | 2 +- 38 files changed, 175 insertions(+), 52 deletions(-) create mode 100644 buildSrc/src/main/java/net/fabricmc/loom/util/GroovyXmlUtil.java diff --git a/build.gradle.kts b/build.gradle.kts index 36c1e2db7..46872201a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,12 @@ // tl;dr, tells us off for using properties for versions. Too bad, we don't like trawling this file for version numbers. @file:Suppress("GradlePackageVersionRange") -import babric.SubprojectHelpers.addDependencyXML +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addDependencyXML plugins { id("maven-publish") id("fabric-loom") version "1.9-SNAPSHOT" - id("babric-loom-extension") version "1.9.4" + id("babric-loom-extension") version "1.9.2" } // https://stackoverflow.com/a/40101046 - Even with kotlin, gradle can't get it's shit together. @@ -40,7 +40,13 @@ allprojects { } configurations { + val transitiveImplementation = create("transitiveImplementation") + implementation.get().extendsFrom(transitiveImplementation) + + // Required cause loom 0.14 for some reason doesn't remove asm-all 4.1. Ew. all { + exclude(group = "org.ow2.asm", module = "asm-debug-all") + exclude(group = "org.ow2.asm", module = "asm-all") exclude(group = "babric") } } @@ -60,16 +66,16 @@ allprojects { modImplementation("net.fabricmc:fabric-loader:${project.properties["loader_version"]}") - transitiveImplementation(modImplementation("org.apache.commons:commons-lang3:3.12.0") as Dependency) - transitiveImplementation(modImplementation("commons-io:commons-io:2.11.0") as Dependency) - transitiveImplementation(modImplementation("net.jodah:typetools:${project.properties["typetools_version"]}") as Dependency) - transitiveImplementation(modImplementation("com.github.mineLdiver:UnsafeEvents:${project.properties["unsafeevents_version"]}") as Dependency) - transitiveImplementation(modImplementation("it.unimi.dsi:fastutil:${project.properties["fastutil_version"]}") as Dependency) - transitiveImplementation(modImplementation("com.github.ben-manes.caffeine:caffeine:${project.properties["caffeine_version"]}") as Dependency) - transitiveImplementation(modImplementation("com.mojang:datafixerupper:${project.properties["dfu_version"]}") as Dependency) - transitiveImplementation(modImplementation("maven.modrinth:spasm:${project.properties["spasm_version"]}") as Dependency) - transitiveImplementation(modImplementation("me.carleslc:Simple-Yaml:1.8.4") as Dependency) - transitiveImplementation(modImplementation("net.glasslauncher.mods:GlassConfigAPI:${project.properties["gcapi_version"]}") as Dependency) + "transitiveImplementation"("org.apache.commons:commons-lang3:3.12.0") + "transitiveImplementation"("commons-io:commons-io:2.11.0") + "transitiveImplementation"("net.jodah:typetools:${project.properties["typetools_version"]}") + "transitiveImplementation"("com.github.mineLdiver:UnsafeEvents:${project.properties["unsafeevents_version"]}") + "transitiveImplementation"("it.unimi.dsi:fastutil:${project.properties["fastutil_version"]}") + "transitiveImplementation"("com.github.ben-manes.caffeine:caffeine:${project.properties["caffeine_version"]}") + "transitiveImplementation"("com.mojang:datafixerupper:${project.properties["dfu_version"]}") + "transitiveImplementation"("maven.modrinth:spasm:${project.properties["spasm_version"]}") + "transitiveImplementation"("me.carleslc:Simple-Yaml:1.8.4") + "transitiveImplementation"("net.glasslauncher.mods:GlassConfigAPI:${project.properties["gcapi_version"]}") // convenience stuff // adds some useful annotations for data classes. does not add any dependencies @@ -159,9 +165,20 @@ allprojects { artifact(tasks.getByName("remapJar")).builtBy(tasks.getByName("remapJar")) artifact(tasks.getByName("remapSourcesJar")).builtBy(tasks.getByName("remapJar")) } - // Remove this once I fix a **weird** edge case bug in babric. - pom.withXml { - this.asNode().appendNode("dependencies") + + pom { + withXml { + // Wipes dependency block, cause it's just hopelessly wrong, and also includes floader for some reason + val depsNode = asNode().appendNode("dependencies") + // Jank solution to an annoying issue + configurations.getByName("transitiveImplementation").dependencies.forEach { + val depNode = depsNode.appendNode("dependency") + depNode.appendNode("groupId", it.group) + depNode.appendNode("artifactId", it.name) + depNode.appendNode("version", it.version) + depNode.appendNode("scope", "compile") + } + } } } } diff --git a/buildSrc/src/main/java/net/fabricmc/loom/util/GroovyXmlUtil.java b/buildSrc/src/main/java/net/fabricmc/loom/util/GroovyXmlUtil.java new file mode 100644 index 000000000..7547153ef --- /dev/null +++ b/buildSrc/src/main/java/net/fabricmc/loom/util/GroovyXmlUtil.java @@ -0,0 +1,59 @@ +/* + * This file is part of fabric-loom, licensed under the MIT License (MIT). + * + * Copyright (c) 2016-2021 FabricMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package net.fabricmc.loom.util; + +import groovy.util.Node; +import groovy.xml.QName; + +public final class GroovyXmlUtil { + private GroovyXmlUtil() { } + + public static Node getOrCreateNode(Node parent, String name) { + for (Object object : parent.children()) { + if (object instanceof Node node && isSameName(node.name(), name)) { + return node; + } + } + + return parent.appendNode(name); + } + + private static boolean isSameName(Object nodeName, String givenName) { + if (nodeName instanceof String) { + return nodeName.equals(givenName); + } + + if (nodeName instanceof QName qName) { + return qName.matches(givenName); + } + + // New groovy 3 (gradle 7) class + if (nodeName instanceof groovy.namespace.QName qName) { + return qName.matches(givenName); + } + + throw new UnsupportedOperationException("Cannot determine if " + nodeName.getClass() + " is the same as a String"); + } +} diff --git a/buildSrc/src/main/java/net/modificationstation/stationapi/gradle/SubprojectHelpers.java b/buildSrc/src/main/java/net/modificationstation/stationapi/gradle/SubprojectHelpers.java index 2ce50f66b..6fb46676e 100644 --- a/buildSrc/src/main/java/net/modificationstation/stationapi/gradle/SubprojectHelpers.java +++ b/buildSrc/src/main/java/net/modificationstation/stationapi/gradle/SubprojectHelpers.java @@ -1,10 +1,58 @@ package net.modificationstation.stationapi.gradle; +import groovy.util.Node; +import groovy.util.NodeList; +import groovy.xml.XmlUtil; +import net.fabricmc.loom.util.GroovyXmlUtil; import org.gradle.api.Project; +import org.gradle.api.XmlProvider; +import org.gradle.api.artifacts.Dependency; +import org.gradle.api.publish.PublishingExtension; +import org.gradle.api.publish.maven.MavenPublication; +import org.gradle.internal.impldep.org.codehaus.plexus.util.xml.XmlReader; + +import java.util.*; +import java.util.stream.*; public class SubprojectHelpers { + + public static void addModuleDependencies(Project project, String... projectNames) { + List modules = Arrays.stream(projectNames).map((it) -> project.getDependencies().project(Map.of("path", ":" + it, "configuration", "dev"))).collect(Collectors.toList()); +// Arrays.stream(projectNames).forEach((it) -> project.getDependencies().project(Map.of("path", ":" + it, "configuration", "dev"))); + + modules.forEach(dependency -> project.getDependencies().add("implementation", dependency)); + + MavenPublication publishing = (MavenPublication) project.getExtensions().getByType(PublishingExtension.class).getPublications().getByName("mavenJava"); + publishing.pom((e) -> e.withXml((f) -> { + addDependencies(f.asNode(), "implementation", modules); + })); + } + + public static void addDependencyXML(Node xml, String scope, Project dependency) { + Node depsNode = GroovyXmlUtil.getOrCreateNode(xml, "dependencies"); + + Node appNode = depsNode.appendNode("dependency"); + appNode.appendNode("groupId", dependency.getGroup()); + appNode.appendNode("artifactId", dependency.getName()); + appNode.appendNode("version", dependency.getVersion()); + appNode.appendNode("scope", scope); + } + + public static void addDependencies(Node xml, String scope, List dependencies) { + Node depsNode = GroovyXmlUtil.getOrCreateNode(xml, "dependencies"); + + for (Dependency dep : dependencies) { + Node appNode = depsNode.appendNode("dependency"); + appNode.appendNode("groupId", dep.getGroup()); + appNode.appendNode("artifactId", dep.getName()); + appNode.appendNode("version", dep.getVersion()); + appNode.appendNode("scope", scope); + } + } + public static String getSubprojectVersion(Project project, String ver) { return project.getProperties().get("mod_version") + "-" + ver; } + } diff --git a/station-achievements-v0/build.gradle.kts b/station-achievements-v0/build.gradle.kts index 98bc4c3ef..0dbf7079e 100644 --- a/station-achievements-v0/build.gradle.kts +++ b/station-achievements-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-achievements-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-armor-api-v0/build.gradle.kts b/station-armor-api-v0/build.gradle.kts index b71513b18..fcc1e752f 100644 --- a/station-armor-api-v0/build.gradle.kts +++ b/station-armor-api-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-armor-api-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-audio-loader-v0/build.gradle.kts b/station-audio-loader-v0/build.gradle.kts index 42319bbb0..10ab4c5f4 100644 --- a/station-audio-loader-v0/build.gradle.kts +++ b/station-audio-loader-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-audio-loader-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-biome-events-v0/build.gradle.kts b/station-biome-events-v0/build.gradle.kts index 72797eb0e..73c5f0b00 100644 --- a/station-biome-events-v0/build.gradle.kts +++ b/station-biome-events-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-biome-events-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-blockentities-v0/build.gradle.kts b/station-blockentities-v0/build.gradle.kts index 963e29332..0b566080f 100644 --- a/station-blockentities-v0/build.gradle.kts +++ b/station-blockentities-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-blockentities-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-blockitems-v0/build.gradle.kts b/station-blockitems-v0/build.gradle.kts index 08c11ce4a..9d84075bc 100644 --- a/station-blockitems-v0/build.gradle.kts +++ b/station-blockitems-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-blockitems-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-blocks-v0/build.gradle.kts b/station-blocks-v0/build.gradle.kts index 6a3497b94..a70b32d6a 100644 --- a/station-blocks-v0/build.gradle.kts +++ b/station-blocks-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-blocks-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-container-api-v0/build.gradle.kts b/station-container-api-v0/build.gradle.kts index fbb254dee..59307883f 100644 --- a/station-container-api-v0/build.gradle.kts +++ b/station-container-api-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-container-api-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-datafixer-v0/build.gradle.kts b/station-datafixer-v0/build.gradle.kts index ca050fb3f..1b005f13e 100644 --- a/station-datafixer-v0/build.gradle.kts +++ b/station-datafixer-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-datafixer-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-dimensions-v0/build.gradle.kts b/station-dimensions-v0/build.gradle.kts index cd70d6e2a..8f3172c7d 100644 --- a/station-dimensions-v0/build.gradle.kts +++ b/station-dimensions-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-dimensions-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-effects-api-v0/build.gradle.kts b/station-effects-api-v0/build.gradle.kts index 4c503f9cc..390a8c2fe 100644 --- a/station-effects-api-v0/build.gradle.kts +++ b/station-effects-api-v0/build.gradle.kts @@ -1,4 +1,4 @@ -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion base.archivesName.set("station-effects-api-v0") diff --git a/station-entities-v0/build.gradle.kts b/station-entities-v0/build.gradle.kts index c1f8885a3..b4c98a53e 100644 --- a/station-entities-v0/build.gradle.kts +++ b/station-entities-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-entities-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-flattening-v0/build.gradle.kts b/station-flattening-v0/build.gradle.kts index babb92c10..07cbbd120 100644 --- a/station-flattening-v0/build.gradle.kts +++ b/station-flattening-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-flattening-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-gui-api-v0/build.gradle.kts b/station-gui-api-v0/build.gradle.kts index 8e9bc6a6a..7dcd64771 100644 --- a/station-gui-api-v0/build.gradle.kts +++ b/station-gui-api-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-gui-api-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-items-v0/build.gradle.kts b/station-items-v0/build.gradle.kts index dace5ad45..ab75e2f84 100644 --- a/station-items-v0/build.gradle.kts +++ b/station-items-v0/build.gradle.kts @@ -1,4 +1,4 @@ -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion base.archivesName.set("station-items-v0") diff --git a/station-keybindings-v0/build.gradle.kts b/station-keybindings-v0/build.gradle.kts index a2db48ab6..645d10e15 100644 --- a/station-keybindings-v0/build.gradle.kts +++ b/station-keybindings-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-keybindings-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-lifecycle-events-v0/build.gradle.kts b/station-lifecycle-events-v0/build.gradle.kts index a64f3bbee..b9953d742 100644 --- a/station-lifecycle-events-v0/build.gradle.kts +++ b/station-lifecycle-events-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-lifecycle-events-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-localization-api-v0/build.gradle.kts b/station-localization-api-v0/build.gradle.kts index 209a592b8..73f93a4ae 100644 --- a/station-localization-api-v0/build.gradle.kts +++ b/station-localization-api-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-localization-api-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-maths-v0/build.gradle.kts b/station-maths-v0/build.gradle.kts index f1e77ef2c..9d91d9422 100644 --- a/station-maths-v0/build.gradle.kts +++ b/station-maths-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-maths-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-nbt-v0/build.gradle.kts b/station-nbt-v0/build.gradle.kts index 61579c574..84e792ed0 100644 --- a/station-nbt-v0/build.gradle.kts +++ b/station-nbt-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-nbt-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-networking-v0/build.gradle.kts b/station-networking-v0/build.gradle.kts index 9c913b28c..0d08afbcc 100644 --- a/station-networking-v0/build.gradle.kts +++ b/station-networking-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-networking-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-player-api-v0/build.gradle.kts b/station-player-api-v0/build.gradle.kts index a23f0ff7b..a265eea1c 100644 --- a/station-player-api-v0/build.gradle.kts +++ b/station-player-api-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-player-api-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-recipes-v0/build.gradle.kts b/station-recipes-v0/build.gradle.kts index ab1d338ef..a6bb996e7 100644 --- a/station-recipes-v0/build.gradle.kts +++ b/station-recipes-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-recipes-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-registry-api-v0/build.gradle.kts b/station-registry-api-v0/build.gradle.kts index d6e458406..8d9f0d7ce 100644 --- a/station-registry-api-v0/build.gradle.kts +++ b/station-registry-api-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-registry-api-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-registry-sync-v0/build.gradle.kts b/station-registry-sync-v0/build.gradle.kts index 6d4cd3422..7bf43eddf 100644 --- a/station-registry-sync-v0/build.gradle.kts +++ b/station-registry-sync-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-registry-sync-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-renderer-api-v0/build.gradle.kts b/station-renderer-api-v0/build.gradle.kts index e8008a1ef..632b75bd9 100644 --- a/station-renderer-api-v0/build.gradle.kts +++ b/station-renderer-api-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-renderer-api-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-renderer-arsenic/build.gradle.kts b/station-renderer-arsenic/build.gradle.kts index 1a757ff18..70ece2fa3 100644 --- a/station-renderer-arsenic/build.gradle.kts +++ b/station-renderer-arsenic/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-renderer-arsenic") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-resource-loader-v0/build.gradle.kts b/station-resource-loader-v0/build.gradle.kts index f279b6621..d41afc0bb 100644 --- a/station-resource-loader-v0/build.gradle.kts +++ b/station-resource-loader-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-resource-loader-v0") version = getSubprojectVersion(project, "1.0.0") @@ -7,6 +7,5 @@ addModuleDependencies(project, "station-api-base", "station-maths-v0", "station-lifecycle-events-v0", - "station-world-events-v0", - "station-api-configuration" + "station-world-events-v0" ) \ No newline at end of file diff --git a/station-templates-v0/build.gradle.kts b/station-templates-v0/build.gradle.kts index 63a831c3d..e8906f829 100644 --- a/station-templates-v0/build.gradle.kts +++ b/station-templates-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-templates-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-tools-api-v1/build.gradle.kts b/station-tools-api-v1/build.gradle.kts index 32adb0c33..373f91147 100644 --- a/station-tools-api-v1/build.gradle.kts +++ b/station-tools-api-v1/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-tool-api-v1") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-transitive-access-wideners-v0/build.gradle.kts b/station-transitive-access-wideners-v0/build.gradle.kts index a44757b52..931b9b580 100644 --- a/station-transitive-access-wideners-v0/build.gradle.kts +++ b/station-transitive-access-wideners-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-transitive-access-wideners-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-vanilla-checker-v0/build.gradle.kts b/station-vanilla-checker-v0/build.gradle.kts index b8d0e38d2..b45dedc79 100644 --- a/station-vanilla-checker-v0/build.gradle.kts +++ b/station-vanilla-checker-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-vanilla-checker-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-vanilla-fix-v0/build.gradle.kts b/station-vanilla-fix-v0/build.gradle.kts index d244c2ae2..524049ee2 100644 --- a/station-vanilla-fix-v0/build.gradle.kts +++ b/station-vanilla-fix-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-vanilla-fix-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-world-events-v0/build.gradle.kts b/station-world-events-v0/build.gradle.kts index b16f1d77e..254b0113b 100644 --- a/station-world-events-v0/build.gradle.kts +++ b/station-world-events-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-world-events-v0") version = getSubprojectVersion(project, "1.0.0") diff --git a/station-worldgen-api-v0/build.gradle.kts b/station-worldgen-api-v0/build.gradle.kts index a5efb7f02..341adeead 100644 --- a/station-worldgen-api-v0/build.gradle.kts +++ b/station-worldgen-api-v0/build.gradle.kts @@ -1,5 +1,5 @@ import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion -import babric.SubprojectHelpers.addModuleDependencies +import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies base.archivesName.set("station-worldgen-api-v0") version = getSubprojectVersion(project, "1.0.0") From 93aaa54920e0525bb85b2c315b125e00275e060d Mon Sep 17 00:00:00 2001 From: calmilamsy Date: Fri, 8 Aug 2025 16:14:47 +0100 Subject: [PATCH 2/3] Fix, 5.1 --- gradle.properties | 2 +- station-resource-loader-v0/build.gradle.kts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ab5f7fafa..d04edb6dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ fabric.loom.multiProjectOptimisation=true spasm_version = 0.2.2 # Mod Properties - mod_version = 2.0.0-alpha.5 + mod_version = 2.0.0-alpha.5.1 maven_group = net.modificationstation archives_base_name = StationAPI diff --git a/station-resource-loader-v0/build.gradle.kts b/station-resource-loader-v0/build.gradle.kts index d41afc0bb..70b9398eb 100644 --- a/station-resource-loader-v0/build.gradle.kts +++ b/station-resource-loader-v0/build.gradle.kts @@ -7,5 +7,6 @@ addModuleDependencies(project, "station-api-base", "station-maths-v0", "station-lifecycle-events-v0", - "station-world-events-v0" + "station-world-events-v0", + "station-api-configuration" ) \ No newline at end of file From 17562b507a4d816fbed3c4c7d45b56eff9ba0451 Mon Sep 17 00:00:00 2001 From: mine_diver Date: Sat, 9 Aug 2025 17:53:04 +0500 Subject: [PATCH 3/3] Revert to 2.0.0-alpha.5 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d04edb6dc..ab5f7fafa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ fabric.loom.multiProjectOptimisation=true spasm_version = 0.2.2 # Mod Properties - mod_version = 2.0.0-alpha.5.1 + mod_version = 2.0.0-alpha.5 maven_group = net.modificationstation archives_base_name = StationAPI