Fix typo

update error message
FancyMcPlugins · Aug 19, 2024 · d344e1e · d344e1e
1 parent 55fd80a
commit d344e1e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 minecraftVersion=1.21.1
 fancyLibVersion=1.0.31
-fancyAnalyticsVersion=0.0.7
+fancyAnalyticsVersion=0.0.8
 plotsquaredVersion=7.2.0
 chatcolorhandlerVersion=v2.5.3
 cloudCoreVersion=2.0.0-rc.2

diff --git a/src/main/java/de/oliver/fancynpcs/FancyNpcs.java b/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
@@ -1,5 +1,6 @@
 package de.oliver.fancynpcs;
 
+import de.oliver.fancyanalytics.api.Event;
 import de.oliver.fancyanalytics.api.FancyAnalyticsAPI;
 import de.oliver.fancyanalytics.api.MetricSupplier;
 import de.oliver.fancylib.FancyLib;
@@ -56,6 +57,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin {
     private final VersionConfig versionConfig;
     private final FeatureFlagConfig featureFlagConfig;
     private final VersionFetcher versionFetcher;
+    private final FancyAnalyticsAPI fancyAnalytics;
     private CloudCommandManager commandManager;
     private TextConfig textConfig;
     private Translator translator;
@@ -73,6 +75,10 @@ public FancyNpcs() {
         this.config = new FancyNpcsConfigImpl();
         this.versionFetcher = new MasterVersionFetcher(getName());
         this.versionConfig = new VersionConfig(this, versionFetcher);
+
+        fancyAnalytics = new FancyAnalyticsAPI("34c5a33d-0ff0-48b1-8b1c-53620a690c6e", "ca2baf32-1fd2-4baa-a38a-f12ed8ab24a4", "Y7EP2jJjYWExZjdmMDkwNTQ5ZmRbIGUI");
+        FancyAnalyticsAPI.setDisableLogging(true);
+
         this.featureFlagConfig = new FeatureFlagConfig(this);
     }
 
@@ -104,9 +110,14 @@ public void onLoad() {
         PluginManager pluginManager = Bukkit.getPluginManager();
 
         if (npcAdapter == null) {
+            fancyAnalytics.sendEvent(new Event("pluginLoadingWithUnsupportedVersion")
+                    .withProperty("version", mcVersion)
+                    .withProperty("pluginVersion", getPluginMeta().getVersion())
+            );
+
             getLogger().warning("--------------------------------------------------");
             getLogger().warning("Unsupported minecraft server version.");
-            getLogger().warning("Please update the server to " + String.join(" / ", SUPPORTED_VERSIONS) + ".");
+            getLogger().warning("Please update the server to " + String.join(" / ", SUPPORTED_VERSIONS));
             getLogger().warning("Disabling the FancyNpcs plugin.");
             getLogger().warning("--------------------------------------------------");
             pluginManager.disablePlugin(this);
@@ -149,7 +160,7 @@ public void onEnable() {
                     getLogger().warning("""
                             
                             -------------------------------------------------------
-                            You are not using the latest version the FancyNpcs plugin.
+                            You are not using the latest version of the FancyNpcs plugin.
                             Please update to the newest version (%s).
                             %s
                             -------------------------------------------------------
@@ -174,8 +185,6 @@ Please update to the newest version (%s).
 
         int randomRes = new Random(System.currentTimeMillis()).nextInt(100);
         if (USE_FANCYANALYTICS_FEATURE_FLAG.isEnabled() || isDevelopmentBuild || randomRes < 15) {
-            FancyAnalyticsAPI.setDisableLogging(true);
-            FancyAnalyticsAPI fancyAnalytics = new FancyAnalyticsAPI("34c5a33d-0ff0-48b1-8b1c-53620a690c6e", "ca2baf32-1fd2-4baa-a38a-f12ed8ab24a4", "Y7EP2jJjYWExZjdmMDkwNTQ5ZmRbIGUI");
             fancyAnalytics.registerDefaultPluginMetrics(instance);
             fancyAnalytics.registerLogger(getLogger());
             fancyAnalytics.registerLogger(Bukkit.getLogger());

diff --git a/src/main/java/de/oliver/fancynpcs/NpcManagerImpl.java b/src/main/java/de/oliver/fancynpcs/NpcManagerImpl.java
@@ -41,7 +41,7 @@ public NpcManagerImpl(JavaPlugin plugin, Function<NpcData, Npc> npcAdapter) {
 
     public void registerNpc(Npc npc) {
         if (!FancyNpcs.PLAYER_NPCS_FEATURE_FLAG.isEnabled() && npcs.values().stream().anyMatch(npc1 -> npc1.getData().getName().equals(npc.getData().getName()))) {
-            throw new IllegalStateException("An NPC with the name " + npc.getData().getName() + " already exists!");
+            throw new IllegalStateException("An NPC with this name already exists");
         } else {
             npcs.put(npc.getData().getId(), npc);
         }