From fec403e96e3f599855b54623d853996af4f9ee4c Mon Sep 17 00:00:00 2001 From: Aquerr Date: Fri, 23 Feb 2024 10:16:18 +0100 Subject: [PATCH] Add bStats metrics --- build.gradle.kts | 15 ++++++++++++++- gradle.properties | 2 +- .../aquerr/worldrebuilder/WorldRebuilder.java | 9 ++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e0d2c2f..a20e93d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,6 +29,7 @@ plugins { `maven-publish` id("org.spongepowered.gradle.plugin") version "2.1.1" id("org.spongepowered.gradle.ore") version "2.1.1" // for Ore publishing + id("com.github.johnrengelman.shadow") version "7.1.2" } apply(plugin = "net.minecraftforge.gradle") @@ -44,11 +45,13 @@ java { dependencies { "minecraft"("net.minecraftforge:forge:${forgeVersion}") api("org.spongepowered:spongeapi:${spongeApiVersion}") + shadow("org.bstats:bstats-sponge:3.0.2") } tasks { jar { - finalizedBy("reobfJar") + finalizedBy("shadowJar") + if(System.getenv("JENKINS_HOME") != null) { project.version = project.version.toString() + "_" + System.getenv("BUILD_NUMBER") println("File name => " + archiveBaseName.get()) @@ -56,6 +59,16 @@ tasks { project.version = project.version.toString() + "-SNAPSHOT" } } + + shadowJar { + finalizedBy("reobfJar") + + archiveClassifier.set("") + + relocate("org.bstats", "io.github.aquerr.worldrebuilder.lib.bstats") + + configurations = listOf(project.configurations.shadow.get()) + } } configure { diff --git a/gradle.properties b/gradle.properties index 72bf400..143a377 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx4G worldRebuilder.id=worldrebuilder worldRebuilder.name=World Rebuilder -worldRebuilder.version=4.0.0 +worldRebuilder.version=4.0.1 minecraft.version=1.19.2 forge.version=1.19.2-43.3.0 diff --git a/src/main/java/io/github/aquerr/worldrebuilder/WorldRebuilder.java b/src/main/java/io/github/aquerr/worldrebuilder/WorldRebuilder.java index 723592e..d56dd73 100644 --- a/src/main/java/io/github/aquerr/worldrebuilder/WorldRebuilder.java +++ b/src/main/java/io/github/aquerr/worldrebuilder/WorldRebuilder.java @@ -37,6 +37,7 @@ import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; import org.apache.logging.log4j.Logger; +import org.bstats.sponge.Metrics; import org.spongepowered.api.Sponge; import org.spongepowered.api.command.Command; import org.spongepowered.api.command.CommandExecutor; @@ -83,18 +84,24 @@ public class WorldRebuilder private final PluginContainer pluginContainer; private final Logger logger; + + //Metrics + private final Metrics metrics; + private boolean isDisabled; @Inject public WorldRebuilder(final PluginContainer pluginContainer, final RegionManager regionManager, - final @ConfigDir(sharedRoot = false) Path configDir) + final @ConfigDir(sharedRoot = false) Path configDir, + final Metrics.Factory factory) { INSTANCE = this; this.configDir = configDir; this.pluginContainer = pluginContainer; this.logger = pluginContainer.logger(); this.regionManager = regionManager; + this.metrics = factory.make(6828); } public static WorldRebuilder getPlugin()