From bb29726ae3375abba1daa37350ffbd143cfe72e8 Mon Sep 17 00:00:00 2001 From: phit Date: Sun, 12 Nov 2017 22:42:54 +0100 Subject: [PATCH] add raw tick time with vanillagradle --- build.gradle | 23 ++++--------------- .../prometheusexporter/PluginInfo.java | 12 ---------- .../PrometheusExporter.java | 11 +++++---- 3 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 src/main/java/org/stonebound/prometheusexporter/PluginInfo.java diff --git a/build.gradle b/build.gradle index 3c42a5cf..886d4a25 100644 --- a/build.gradle +++ b/build.gradle @@ -18,26 +18,20 @@ buildscript { } plugins { - id 'java' - id 'idea' id 'signing' - id 'ninja.miserable.blossom' version '1.0.1' id 'com.github.johnrengelman.shadow' version '1.2.4' id 'org.spongepowered.plugin' version '0.8.1' + id 'net.minecrell.vanillagradle.server' version '2.2-6' } -apply plugin: 'net.minecraftforge.gradle.forge' - minecraft { mappings = 'snapshot_20171007' - makeObfSourceJar = false - runDir = "run" - version = '14.23.0.2503' + version = '1.12.2' } group = 'org.stonebound.prometheusexporter' -version = '1.3.0' -description = "Sponge Minecraft Prometheus Exporter" +version = '1.3.1' +description = "Prometheus Exporter for Sponge" compileJava { sourceCompatibility = '1.8' @@ -74,14 +68,6 @@ shadowJar { archiveName = "spongeprometheusexporter-${version}-plugin.jar" } -blossom { - def location = 'src/main/java/org/stonebound/prometheusexporter/PluginInfo.java' - - replaceToken '@name@', project.name, location - replaceToken '@version@', project.version, location - replaceToken '@description@', project.description, location -} - reobf { shadowJar{} } @@ -90,7 +76,6 @@ tasks.build.dependsOn reobfShadowJar signing { if (project.hasProperty('signing.keyId') && project.hasProperty('signing.password') && project.hasProperty('signing.secretKeyRingFile')) { - sign configurations.archives sign configurations.shadow } } \ No newline at end of file diff --git a/src/main/java/org/stonebound/prometheusexporter/PluginInfo.java b/src/main/java/org/stonebound/prometheusexporter/PluginInfo.java deleted file mode 100644 index 8c487cb9..00000000 --- a/src/main/java/org/stonebound/prometheusexporter/PluginInfo.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.stonebound.prometheusexporter; - -public class PluginInfo { - private PluginInfo() {} - - public static final String ID = "spongeprometheusexporter"; - public static final String NAME = "@name@"; - public static final String VERSION = "@version@"; - public static final String DESCRIPTION = "@description@"; - public static final String URL = "https://github.com/Stonebound/minecraft-prometheus-exporter"; - public static final String AUTHORS = "sladkoff, phit"; -} \ No newline at end of file diff --git a/src/main/java/org/stonebound/prometheusexporter/PrometheusExporter.java b/src/main/java/org/stonebound/prometheusexporter/PrometheusExporter.java index 1d035af0..ec01257d 100644 --- a/src/main/java/org/stonebound/prometheusexporter/PrometheusExporter.java +++ b/src/main/java/org/stonebound/prometheusexporter/PrometheusExporter.java @@ -15,11 +15,12 @@ import java.io.File; -@Plugin(id = PluginInfo.ID, - name = PluginInfo.NAME, - version = PluginInfo.VERSION, - description = PluginInfo.DESCRIPTION, - url = PluginInfo.URL +@Plugin(id = "spongeprometheusexporter", + name = "SpongePrometheusExporter", + version = "1.3.0", + description = "Prometheus Exporter for Sponge", + url = "https://ore.spongepowered.org/phit/PrometheusExporter", + authors = "phit" ) public class PrometheusExporter {