Merge pull request #213 from ModificationStation/develop

2.0.0-alpha.5

Author: mineLdiver

.gitignore

@@ -27,3 +27,4 @@ bin/
 # fabric
 
 run/
+!/run

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 net.modificationstation.stationapi.gradle.SubprojectHelpers.addDependencyXML
+import babric.SubprojectHelpers.addDependencyXML
 
 plugins {
     id("maven-publish")
     id("fabric-loom") version "1.9-SNAPSHOT"
-    id("babric-loom-extension") version "1.9.2"
+    id("babric-loom-extension") version "1.9.4"
 }
 
 // https://stackoverflow.com/a/40101046 - Even with kotlin, gradle can't get it's shit together.
@@ -40,13 +40,8 @@ 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")
         }
     }
 
@@ -65,15 +60,16 @@ allprojects {
 
         modImplementation("net.fabricmc:fabric-loader:${project.properties["loader_version"]}")
 
-        "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"]}")
-        //noinspection GradlePackageUpdate
-        "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(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)
 
         // convenience stuff
         // adds some useful annotations for data classes. does not add any dependencies
@@ -85,21 +81,15 @@ allprojects {
         // adds some useful annotations for miscellaneous uses. does not add any dependencies, though people without the lib will be missing some useful context hints.
         implementation("org.jetbrains:annotations:23.0.0")
 
-        modLocalRuntime("net.glasslauncher.mods:ModMenu:${project.properties["modmenu_version"]}") {
-            isTransitive = false
-        }
+        modLocalRuntime("net.glasslauncher.mods:ModMenu:${project.properties["modmenu_version"]}")
         modLocalRuntime("maven.modrinth:retrocommands:${project.properties["rc_version"]}") {
             isTransitive = false
         }
 
         annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.4.1")
-    }
 
-    loom {
-        @Suppress("UnstableApiUsage") // Too bad, this is needed.
-        mixin {
-            useLegacyMixinAp.set(true)
-        }
+        // Optional bugfix mod for testing qol. Remove the // to enable.
+        //modLocalRuntime "maven.modrinth:mojangfix:${project.properties["mojangfix_version"]}"
     }
 
     sourceSets {
@@ -169,20 +159,9 @@ allprojects {
                     artifact(tasks.getByName("remapJar")).builtBy(tasks.getByName("remapJar"))
                     artifact(tasks.getByName("remapSourcesJar")).builtBy(tasks.getByName("remapJar"))
                 }
-
-                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")
-                        }
-                    }
+                // Remove this once I fix a **weird** edge case bug in babric.
+                pom.withXml {
+                    this.asNode().appendNode("dependencies")
                 }
             }
         }
@@ -291,4 +270,9 @@ tasks.register<Jar>("testJar") {
     from(sourceSets["test"].output)
     archiveClassifier.convention("test")
     archiveClassifier.set("test")
+}
+
+// Gradle I swear to fuck stop trying to do bullshit to the maven - calm
+tasks.withType<GenerateModuleMetadata> {
+    enabled = false
 }

buildSrc/src/main/java/net/fabricmc/loom/util/GroovyXmlUtil.java

@@ -1,58 +1,10 @@
 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<Dependency> 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<Dependency> 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;
     }
-
 }

buildSrc/src/main/java/net/modificationstation/stationapi/gradle/SubprojectHelpers.java

@@ -22,10 +22,11 @@ fabric.loom.multiProjectOptimisation=true
     spasm_version = 0.2.2
 
 # Mod Properties
-    mod_version = 2.0.0-alpha.4.1
+    mod_version = 2.0.0-alpha.5
     maven_group = net.modificationstation
     archives_base_name = StationAPI
 
 # Test properties
+    gcapi_version = 3.1.0
     modmenu_version = 1.8.5-beta.11
     rc_version = 0.5.4

gradle.properties

@@ -0,0 +1,5 @@
+# This json is important cause some mods require a specific version of stapi, but during dev runs, stapi has no version.
+/**
+!config
+!config/fabric_loader_dependencies.json
+!.gitignore

run/.gitignore

@@ -0,0 +1,10 @@
+{
+  "version": 1,
+  "overrides": {
+    "alwaysmoreitems": {
+      "-depends": {
+        "stationapi": "IGNORED"
+      }
+    }
+  }
+}

run/config/fabric_loader_dependencies.json

@@ -46,3 +46,5 @@ include(":station-gui-api-v0")
 include(":station-transitive-access-wideners-v0")
 include(":station-maths-v0")
 include(":station-worldgen-api-v0")
+include(":station-api-configuration")
+include(":station-effects-api-v0")

settings.gradle.kts

@@ -23,6 +23,7 @@
     "java": ">=17",
     "fabricloader": "*",
     "minecraft": "1.0.0-beta.7.3",
+    "station-api-configuration": "*",
     "station-registry-api-v0": "*",
     "station-world-events-v0": "*",
     "station-biome-events-v0": "*",
@@ -48,6 +49,7 @@
     "station-dimensions-v0": "*",
     "station-tools-api-v1": "*",
     "station-flattening-v0": "*",
-    "station-renderer-arsenic": "*"
+    "station-renderer-arsenic": "*",
+    "station-effects-api-v0": "*"
   }
 }

src/main/resources/fabric.mod.json

@@ -7,6 +7,7 @@
 import net.modificationstation.stationapi.api.event.registry.BlockRegistryEvent;
 import net.modificationstation.stationapi.api.mod.entrypoint.EntrypointManager;
 import net.modificationstation.stationapi.api.template.block.TemplateBlock;
+import net.modificationstation.stationapi.api.template.block.TemplateDoorBlock;
 import net.modificationstation.stationapi.api.template.block.TemplateLeavesBlock;
 import net.modificationstation.stationapi.api.template.block.TemplateLogBlock;
 import net.modificationstation.stationapi.api.util.Identifier;
@@ -29,7 +30,11 @@ public enum Blocks {
     EMISSION_CHECKER("emission_checker", "emissionChecker", LampBlock::new),
     INDISPENSABLE_BLOCK("indispensable_block", "indispensableBlock", IndispensableBlock::new),
     MODDED_LEAVES("modded_leaves", "moddedLeaves", id -> new TemplateLeavesBlock(id, 52)),
-    MODDED_LOG("modded_log", "moddedLog", TemplateLogBlock::new);
+    MODDED_LOG("modded_log", "moddedLog", TemplateLogBlock::new),
+    EFFECT_BLOCK("effect_block", "effectBlock", EffectBlock::new),
+    EFFECT_BLOCK_INF("effect_block_inf", "effectBlockInf", EffectBlockInf::new),
+    EFFECT_BLOCK_CLEAR("effect_block_clear", "effectBlockClear", EffectBlockClear::new),
+    FANCY_WOOD_DOOR("fancy_wood_door_block", "fancyWoodDoor", id -> new TemplateDoorBlock(id, Material.WOOD));
 
     private final Runnable register;
     private Block block;