9
0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-27 02:49:15 +00:00

fix metrics

This commit is contained in:
XiaoMoMi
2025-03-30 02:29:05 +08:00
parent 98a282e9f0
commit 2d8ff2c742
5 changed files with 15 additions and 18 deletions

View File

@@ -12,7 +12,6 @@ import net.momirealms.craftengine.bukkit.item.behavior.BukkitItemBehaviors;
import net.momirealms.craftengine.bukkit.item.recipe.BukkitRecipeManager;
import net.momirealms.craftengine.bukkit.loot.BukkitVanillaLootManager;
import net.momirealms.craftengine.bukkit.pack.BukkitPackManager;
import net.momirealms.craftengine.bukkit.plugin.bstats.CraftEngineMetrics;
import net.momirealms.craftengine.bukkit.plugin.command.BukkitCommandManager;
import net.momirealms.craftengine.bukkit.plugin.command.BukkitSenderFactory;
import net.momirealms.craftengine.bukkit.plugin.gui.BukkitGuiManager;
@@ -29,6 +28,7 @@ import net.momirealms.craftengine.core.item.ItemManager;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.plugin.classpath.ReflectionClassPathAppender;
import net.momirealms.craftengine.core.plugin.command.sender.SenderFactory;
import net.momirealms.craftengine.core.plugin.config.ConfigManager;
import net.momirealms.craftengine.core.plugin.dependency.Dependencies;
import net.momirealms.craftengine.core.plugin.dependency.Dependency;
import net.momirealms.craftengine.core.plugin.gui.category.ItemBrowserManagerImpl;
@@ -37,6 +37,7 @@ import net.momirealms.craftengine.core.plugin.scheduler.SchedulerAdapter;
import net.momirealms.craftengine.core.plugin.scheduler.SchedulerTask;
import net.momirealms.craftengine.core.util.ReflectionUtils;
import net.momirealms.craftengine.core.util.VersionHelper;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
@@ -141,7 +142,6 @@ public class BukkitCraftEngine extends CraftEngine {
}
BukkitBlockBehaviors.init();
BukkitItemBehaviors.init();
CraftEngineMetrics.init(this);
super.packManager = new BukkitPackManager(this);
super.senderFactory = new BukkitSenderFactory(this);
super.itemManager = new BukkitItemManager(this);
@@ -202,6 +202,13 @@ public class BukkitCraftEngine extends CraftEngine {
EventUtils.fireAndForget(event);
}
@Override
public void delayedEnable() {
if (ConfigManager.metrics()) {
new Metrics(this.bootstrap(), 24333);
}
}
@Override
protected void registerParsers() {
// register template parser

View File

@@ -1,14 +0,0 @@
package net.momirealms.craftengine.bukkit.plugin.bstats;
import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
import net.momirealms.craftengine.core.plugin.config.ConfigManager;
import org.bstats.bukkit.Metrics;
public class CraftEngineMetrics {
private static final int pluginId = 24333;
public static void init(BukkitCraftEngine plugin) {
if (!ConfigManager.metrics()) return;
new Metrics(plugin.bootstrap(), pluginId);
}
}

View File

@@ -138,6 +138,7 @@ public abstract class CraftEngine implements Plugin {
this.furnitureManager.delayedInit();
this.imageManager.delayedInit();
this.vanillaLootManager.delayedInit();
this.delayedEnable();
});
}
@@ -165,6 +166,8 @@ public abstract class CraftEngine implements Plugin {
protected abstract void registerParsers();
public void delayedEnable() {}
protected abstract List<Dependency> platformDependencies();
protected List<Dependency> commonDependencies() {

View File

@@ -3,6 +3,7 @@ package net.momirealms.craftengine.core.plugin.locale;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.translation.Translator;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import org.jetbrains.annotations.NotNull;
import java.util.Locale;
@@ -42,7 +43,7 @@ public interface MiniMessageTranslationRegistry extends Translator {
if (errorCount == 1) {
throw firstError;
} else if (errorCount > 1) {
throw new IllegalArgumentException(String.format("Invalid key (and %d more)", errorCount - 1), firstError);
throw new IllegalArgumentException(String.format("Invalid or duplicated lang key (and %d more).", errorCount - 1), firstError);
}
}
}

View File

@@ -40,7 +40,7 @@ geantyref_version=1.3.16
zstd_version=1.5.6-9
commons_io_version=2.17.0
sparrow_nbt_version=0.3
sparrow_util_version=0.34
sparrow_util_version=0.35
fastutil_version=8.5.15
netty_version=4.1.119.Final
joml_version=1.10.8