Several bug fixes

- Fix mod info not being bundled in Forge build. - Add phase ordering to Fabric version, to ensure we run after CC:R.
SquidDev-CC · May 13, 2022 · 346ea7f · 346ea7f
1 parent e560b8f
commit 346ea7f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 81 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-/.gradle
 /.idea
 
+.gradle/
 build/
 run/
diff --git a/fabric/.gradle/loom-cache/launch.cfg b/fabric/.gradle/loom-cache/launch.cfg
diff --git a/fabric/.gradle/loom-cache/log4j.xml b/fabric/.gradle/loom-cache/log4j.xml
diff --git a/fabric/.gradle/loom-cache/remapClasspath.txt b/fabric/.gradle/loom-cache/remapClasspath.txt
diff --git a/fabric/src/main/java/cc/tweaked/prometheus/FabricMod.java b/fabric/src/main/java/cc/tweaked/prometheus/FabricMod.java
@@ -4,8 +4,10 @@
 import dan200.computercraft.fabric.mixin.LevelResourceAccess;
 import dan200.computercraft.shared.util.CommentedConfigSpec;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.storage.LevelResource;
 
@@ -37,7 +39,13 @@ public class FabricMod implements ModInitializer {
     public void onInitialize() {
         ServerLifecycleEvents.SERVER_STARTING.register(this::onServerStarting);
 
-        ServerLifecycleEvents.SERVER_STARTED.register(server -> ServerMetrics.onServerStart(server, config));
+        // Need to run after CC:R has reset the tracker. Some additional ugliness due to
+        // https://github.com/QuiltMC/quilted-fabric-api/issues/12
+        var phase = new ResourceLocation(Constants.MOD_ID, "after_cc");
+        ServerLifecycleEvents.SERVER_STARTED.addPhaseOrdering(Event.DEFAULT_PHASE, phase);
+        ServerLifecycleEvents.SERVER_STARTED.addPhaseOrdering(new ResourceLocation("quilt", "default"), phase);
+        ServerLifecycleEvents.SERVER_STARTED.register(phase, server -> ServerMetrics.onServerStart(server, config));
+
         ServerLifecycleEvents.SERVER_STOPPED.register(server -> ServerMetrics.onServerStop());
         ServerTickEvents.END_SERVER_TICK.register(server -> ServerMetrics.onServerTick());
     }

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -70,7 +70,7 @@ shadowJar {
     relocate 'io.prometheus', 'cc.tweaked.prometheus.shadow.prometheus'
     configurations = [project.configurations.shadow]
     minimize()
-    exclude("META-INF/**")
+    exclude("META-INF/maven/**")
 }
 
 reobf {

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.0.0
+version=2.0.1
 group=cc.tweaked
 
 # Global dependencies