FancyInnovations/FancyPlugins
1
0
Fork 0
mirror of https://github.com/FancyInnovations/FancyPlugins.git synced 2025-12-06 07:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

all plugins: Update FancyAnalytics to 0.1.7

Browse Source
This commit is contained in:
Oliver
2025-07-10 19:40:01 +02:00
parent 56d0201a13
commit 2ee40812bb
11 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/fancydialogs/build.gradle.kts
View File

@@ -51,7 +51,8 @@ dependencies {
implementation(project(":libraries:packets:packets-api")) implementation(project(":libraries:packets:packets-api"))
implementation(project(":libraries:common")) implementation(project(":libraries:common"))
implementation(project(":libraries:jdb")) implementation(project(":libraries:jdb"))
implementation("de.oliver.FancyAnalytics:api:0.1.6") implementation("de.oliver.FancyAnalytics:java-sdk:0.0.3")
implementation("de.oliver.FancyAnalytics:mc-api:0.1.7")
implementation("de.oliver.FancyAnalytics:logger:0.0.6") implementation("de.oliver.FancyAnalytics:logger:0.0.6")
compileOnly(project(":plugins:fancynpcs:fn-api")) compileOnly(project(":plugins:fancynpcs:fn-api"))

5
plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/analytics/Analytics.java
View File

@@ -2,14 +2,15 @@ package com.fancyinnovations.fancydialogs.analytics;
import com.fancyinnovations.fancydialogs.FancyDialogsPlugin; import com.fancyinnovations.fancydialogs.FancyDialogsPlugin;
import de.oliver.fancyanalytics.api.FancyAnalyticsAPI; import de.oliver.fancyanalytics.api.FancyAnalyticsAPI;
import de.oliver.fancyanalytics.api.events.Event;
import de.oliver.fancyanalytics.api.metrics.MetricSupplier; import de.oliver.fancyanalytics.api.metrics.MetricSupplier;
import de.oliver.fancyanalytics.sdk.events.Event;
import de.oliver.fancylib.VersionConfig; import de.oliver.fancylib.VersionConfig;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.HashMap;
public class Analytics { public class Analytics {
@@ -82,7 +83,7 @@ public class Analytics {
if (!lastVersion.equals(currentVersion)) { if (!lastVersion.equals(currentVersion)) {
FancyDialogsPlugin.get().getFancyLogger().info("Plugin has been updated from version " + lastVersion + " to " + currentVersion + "."); FancyDialogsPlugin.get().getFancyLogger().info("Plugin has been updated from version " + lastVersion + " to " + currentVersion + ".");
api.sendEvent( api.sendEvent(
new Event("PluginVersionUpdated") new Event("PluginVersionUpdated", new HashMap<>())
.withProperty("from", lastVersion) .withProperty("from", lastVersion)
.withProperty("to", currentVersion) .withProperty("to", currentVersion)
.withProperty("commit_hash", versionConfig.getCommitHash()) .withProperty("commit_hash", versionConfig.getCommitHash())

3
plugins/fancyholograms-v2/build.gradle.kts
View File

@@ -69,7 +69,8 @@ dependencies {
implementation(project(":libraries:packets:packets-api")) implementation(project(":libraries:packets:packets-api"))
implementation(project(":libraries:common")) implementation(project(":libraries:common"))
implementation(project(":libraries:jdb")) implementation(project(":libraries:jdb"))
implementation("de.oliver.FancyAnalytics:api:0.1.6") implementation("de.oliver.FancyAnalytics:java-sdk:0.0.3")
implementation("de.oliver.FancyAnalytics:mc-api:0.1.7")
implementation("de.oliver.FancyAnalytics:logger:0.0.6") implementation("de.oliver.FancyAnalytics:logger:0.0.6")
compileOnly(project(":plugins:fancynpcs:fn-api")) compileOnly(project(":plugins:fancynpcs:fn-api"))

7
plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/storage/converter/HologramConverter.java
View File

@@ -1,10 +1,11 @@
package de.oliver.fancyholograms.storage.converter; package de.oliver.fancyholograms.storage.converter;
import de.oliver.fancyanalytics.api.events.Event; import de.oliver.fancyanalytics.sdk.events.Event;
import de.oliver.fancyholograms.FancyHolograms; import de.oliver.fancyholograms.FancyHolograms;
import de.oliver.fancyholograms.api.data.HologramData; import de.oliver.fancyholograms.api.data.HologramData;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.List; import java.util.List;
public abstract class HologramConverter { public abstract class HologramConverter {
@@ -15,6 +16,7 @@ public abstract class HologramConverter {
/** /**
* Returns a list of converted holograms * Returns a list of converted holograms
*
* @param spec Configuration of the hologram conversion * @param spec Configuration of the hologram conversion
* @return A list of converted holograms. * @return A list of converted holograms.
*/ */
@@ -23,13 +25,14 @@ public abstract class HologramConverter {
/** /**
* Returns a list of converted holograms * Returns a list of converted holograms
*
* @param spec Configuration of the hologram conversion * @param spec Configuration of the hologram conversion
* @return A list of converted holograms. * @return A list of converted holograms.
*/ */
public final @NotNull List<HologramData> convert(@NotNull HologramConversionSession spec) { public final @NotNull List<HologramData> convert(@NotNull HologramConversionSession spec) {
List<HologramData> converted = convertHolograms(spec); List<HologramData> converted = convertHolograms(spec);
Event event = new Event("HologramsConverted") Event event = new Event("HologramsConverted", new HashMap<>())
.withProperty("converter", getId()) .withProperty("converter", getId())
.withProperty("target", spec.getTarget().getRegex().pattern()) .withProperty("target", spec.getTarget().getRegex().pattern())
.withProperty("amount", String.valueOf(converted.size())); .withProperty("amount", String.valueOf(converted.size()));

3
plugins/fancyholograms/build.gradle.kts
View File

@@ -71,7 +71,8 @@ dependencies {
implementation(project(":libraries:jdb")) implementation(project(":libraries:jdb"))
implementation(project(":libraries:packets")) implementation(project(":libraries:packets"))
implementation(project(":libraries:packets:packets-api")) implementation(project(":libraries:packets:packets-api"))
implementation("de.oliver.FancyAnalytics:api:0.1.6") implementation("de.oliver.FancyAnalytics:java-sdk:0.0.3")
implementation("de.oliver.FancyAnalytics:mc-api:0.1.7")
implementation("de.oliver.FancyAnalytics:logger:0.0.6") implementation("de.oliver.FancyAnalytics:logger:0.0.6")
compileOnly(project(":plugins:fancynpcs:fn-api")) compileOnly(project(":plugins:fancynpcs:fn-api"))

5
plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConverter.java
View File

@@ -1,10 +1,11 @@
package de.oliver.fancyholograms.converter; package de.oliver.fancyholograms.converter;
import de.oliver.fancyanalytics.api.events.Event; import de.oliver.fancyanalytics.sdk.events.Event;
import de.oliver.fancyholograms.api.data.HologramData; import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.List; import java.util.List;
public abstract class HologramConverter { public abstract class HologramConverter {
@@ -31,7 +32,7 @@ public abstract class HologramConverter {
public final @NotNull List<HologramData> convert(@NotNull HologramConversionSession spec) { public final @NotNull List<HologramData> convert(@NotNull HologramConversionSession spec) {
List<HologramData> converted = convertHolograms(spec); List<HologramData> converted = convertHolograms(spec);
Event event = new Event("HologramsConverted") Event event = new Event("HologramsConverted", new HashMap<>())
.withProperty("converter", getId()) .withProperty("converter", getId())
.withProperty("target", spec.getTarget().getRegex().pattern()) .withProperty("target", spec.getTarget().getRegex().pattern())
.withProperty("amount", String.valueOf(converted.size())); .withProperty("amount", String.valueOf(converted.size()));

3
plugins/fancynpcs/build.gradle.kts
View File

@@ -72,7 +72,8 @@ dependencies {
implementation(project(":libraries:jdb")) implementation(project(":libraries:jdb"))
implementation(project(":libraries:plugin-tests")) implementation(project(":libraries:plugin-tests"))
compileOnly("org.lushplugins:ChatColorHandler:5.1.6") compileOnly("org.lushplugins:ChatColorHandler:5.1.6")
implementation("de.oliver.FancyAnalytics:api:0.1.6") implementation("de.oliver.FancyAnalytics:java-sdk:0.0.3")
implementation("de.oliver.FancyAnalytics:mc-api:0.1.7")
implementation("de.oliver.FancyAnalytics:logger:0.0.6") implementation("de.oliver.FancyAnalytics:logger:0.0.6")
implementation("org.incendo:cloud-core:2.1.0-SNAPSHOT") implementation("org.incendo:cloud-core:2.1.0-SNAPSHOT")
implementation("org.incendo:cloud-paper:2.0.0-SNAPSHOT") implementation("org.incendo:cloud-paper:2.0.0-SNAPSHOT")

11
plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
View File

@@ -2,13 +2,13 @@ package de.oliver.fancynpcs;
import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.common.util.concurrent.ThreadFactoryBuilder;
import de.oliver.fancyanalytics.api.FancyAnalyticsAPI; import de.oliver.fancyanalytics.api.FancyAnalyticsAPI;
import de.oliver.fancyanalytics.api.events.Event;
import de.oliver.fancyanalytics.api.metrics.MetricSupplier; import de.oliver.fancyanalytics.api.metrics.MetricSupplier;
import de.oliver.fancyanalytics.logger.ExtendedFancyLogger; import de.oliver.fancyanalytics.logger.ExtendedFancyLogger;
import de.oliver.fancyanalytics.logger.LogLevel; import de.oliver.fancyanalytics.logger.LogLevel;
import de.oliver.fancyanalytics.logger.appender.Appender; import de.oliver.fancyanalytics.logger.appender.Appender;
import de.oliver.fancyanalytics.logger.appender.ConsoleAppender; import de.oliver.fancyanalytics.logger.appender.ConsoleAppender;
import de.oliver.fancyanalytics.logger.appender.JsonAppender; import de.oliver.fancyanalytics.logger.appender.JsonAppender;
import de.oliver.fancyanalytics.sdk.events.Event;
import de.oliver.fancylib.FancyLib; import de.oliver.fancylib.FancyLib;
import de.oliver.fancylib.Metrics; import de.oliver.fancylib.Metrics;
import de.oliver.fancylib.VersionConfig; import de.oliver.fancylib.VersionConfig;
@@ -65,10 +65,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -174,7 +171,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin {
PluginManager pluginManager = Bukkit.getPluginManager(); PluginManager pluginManager = Bukkit.getPluginManager();
if (npcAdapter == null) { if (npcAdapter == null) {
fancyAnalytics.sendEvent(new Event("pluginLoadingWithUnsupportedVersion") fancyAnalytics.sendEvent(new Event("pluginLoadingWithUnsupportedVersion", new HashMap<>())
.withProperty("version", mcVersion) .withProperty("version", mcVersion)
.withProperty("pluginVersion", getPluginMeta().getVersion()) .withProperty("pluginVersion", getPluginMeta().getVersion())
); );
@@ -488,7 +485,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin {
if (!lastVersion.equals(currentVersion)) { if (!lastVersion.equals(currentVersion)) {
fancyLogger.info("Plugin has been updated from version " + lastVersion + " to " + currentVersion + "."); fancyLogger.info("Plugin has been updated from version " + lastVersion + " to " + currentVersion + ".");
fancyAnalytics.sendEvent( fancyAnalytics.sendEvent(
new Event("PluginVersionUpdated") new Event("PluginVersionUpdated", new HashMap<>())
.withProperty("from", lastVersion) .withProperty("from", lastVersion)
.withProperty("to", currentVersion) .withProperty("to", currentVersion)
.withProperty("commit_hash", versionConfig.getCommitHash()) .withProperty("commit_hash", versionConfig.getCommitHash())

5
plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/utils/OldSkinCacheMigrator.java
View File

@@ -1,12 +1,13 @@
package de.oliver.fancynpcs.utils; package de.oliver.fancynpcs.utils;
import de.oliver.fancyanalytics.api.events.Event; import de.oliver.fancyanalytics.sdk.events.Event;
import de.oliver.fancynpcs.FancyNpcs; import de.oliver.fancynpcs.FancyNpcs;
import de.oliver.fancynpcs.api.skins.SkinData; import de.oliver.fancynpcs.api.skins.SkinData;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File; import java.io.File;
import java.util.HashMap;
public class OldSkinCacheMigrator { public class OldSkinCacheMigrator {
@@ -36,7 +37,7 @@ public class OldSkinCacheMigrator {
OLD_SKIN_CACHE.delete(); OLD_SKIN_CACHE.delete();
FancyNpcs.getInstance().getLogger().info("Migrated " + amount + " skins from old cache."); FancyNpcs.getInstance().getLogger().info("Migrated " + amount + " skins from old cache.");
FancyNpcs.getInstance().getFancyAnalytics().sendEvent(new Event("SkinCacheMigrated").withProperty("amount", String.valueOf(amount))); FancyNpcs.getInstance().getFancyAnalytics().sendEvent(new Event("SkinCacheMigrated", new HashMap<>()).withProperty("amount", String.valueOf(amount)));
} }
} }

2
plugins/fancyvisuals/build.gradle.kts
View File

@@ -36,7 +36,7 @@ dependencies {
implementation(project(":libraries:jdb")) implementation(project(":libraries:jdb"))
implementation(project(":libraries:packets")) implementation(project(":libraries:packets"))
implementation(project(":libraries:packets:packets-api")) implementation(project(":libraries:packets:packets-api"))
compileOnly("de.oliver.FancyAnalytics:api:0.1.6") // loaded in FancyVisualLoader compileOnly("de.oliver.FancyAnalytics:mc-api:0.1.7") // loaded in FancyVisualLoader
compileOnly("de.oliver.FancyAnalytics:logger:0.0.6") // loaded in FancyVisualLoader compileOnly("de.oliver.FancyAnalytics:logger:0.0.6") // loaded in FancyVisualLoader
implementation("org.lushplugins:ChatColorHandler:5.1.6") implementation("org.lushplugins:ChatColorHandler:5.1.6")

2
plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/loaders/FancyVisualsLoader.java
View File

@@ -16,7 +16,7 @@ public class FancyVisualsLoader implements PluginLoader {
MavenLibraryResolver resolver = new MavenLibraryResolver(); MavenLibraryResolver resolver = new MavenLibraryResolver();
resolver.addRepository(new RemoteRepository.Builder("fancyinnovations", "default", "https://repo.fancyinnovations.com/releases").build()); resolver.addRepository(new RemoteRepository.Builder("fancyinnovations", "default", "https://repo.fancyinnovations.com/releases").build());
// resolver.addRepository(new RemoteRepository.Builder("mavencentral", "default", "https://repo1.maven.org/maven2/").build()); // resolver.addRepository(new RemoteRepository.Builder("mavencentral", "default", "https://repo1.maven.org/maven2/").build());
resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:api:0.1.6"), "compile")); resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:mc-api:0.1.7"), "compile"));
resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:logger:0.0.6"), "compile")); resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:logger:0.0.6"), "compile"));
classpathBuilder.addLibrary(resolver); classpathBuilder.addLibrary(resolver);