diff --git a/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java b/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java index eff0742..0be8190 100644 --- a/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java +++ b/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java @@ -87,9 +87,6 @@ public final class VillagerOptimizer extends JavaPlugin { public static VillagerOptimizer getInstance() { return instance; } - public static NamespacedKey getKey(String key) { - return new NamespacedKey(instance, key); - } public static Config getConfiguration() { return config; } diff --git a/src/main/java/me/xginko/villageroptimizer/config/Config.java b/src/main/java/me/xginko/villageroptimizer/config/Config.java index c62ae2d..8341e20 100644 --- a/src/main/java/me/xginko/villageroptimizer/config/Config.java +++ b/src/main/java/me/xginko/villageroptimizer/config/Config.java @@ -33,7 +33,7 @@ public class Config { "If set to true, will display messages based on client language"); this.cache_keep_time_seconds = getInt("general.cache-keep-time-seconds", 30, "The amount of time in seconds a villager will be kept in the plugin's cache."); - this.support_other_plugins = getBoolean("general.support-avl-villagers", true, """ + this.support_other_plugins = getBoolean("general.support-avl-villagers", false, """ Enable if you have previously used AntiVillagerLag (https://www.spigotmc.org/resources/antivillagerlag.102949/).\s Tries to read pre-existing info like optimization state so players don't need to reoptimize their villagers."""); } diff --git a/src/main/java/me/xginko/villageroptimizer/enums/Keys.java b/src/main/java/me/xginko/villageroptimizer/enums/Keys.java index e7e2436..2ebd4f3 100644 --- a/src/main/java/me/xginko/villageroptimizer/enums/Keys.java +++ b/src/main/java/me/xginko/villageroptimizer/enums/Keys.java @@ -8,25 +8,38 @@ import org.bukkit.plugin.Plugin; import java.util.Locale; public class Keys { + public enum Origin { VillagerOptimizer, AntiVillagerLag; } public enum Own { - OPTIMIZATION_TYPE(VillagerOptimizer.getKey("optimization-type")), - LAST_OPTIMIZE(VillagerOptimizer.getKey("last-optimize")), - LAST_LEVELUP(VillagerOptimizer.getKey("last-levelup")), - LAST_RESTOCK(VillagerOptimizer.getKey("last-restock")), - LAST_OPTIMIZE_NAME(VillagerOptimizer.getKey("last-optimize-name")); + OPTIMIZATION_TYPE("optimization-type"), + LAST_OPTIMIZE("last-optimize"), + LAST_LEVELUP("last-levelup"), + LAST_RESTOCK("last-restock"), + LAST_OPTIMIZE_NAME("last-optimize-name"); private final NamespacedKey key; - Own(NamespacedKey key) { - this.key = key; + + Own(String key) { + this.key = getKey(key); } + public NamespacedKey key() { return key; } + + /** + * Returns a NamespacedKey created by VillagerOptimizer. + * + * @return a {@link NamespacedKey} that can be used to test for and read data stored by VillagerOptimizer + * from a {@link PersistentDataContainer} + */ + public static NamespacedKey getKey(String key) { + return new NamespacedKey(VillagerOptimizer.getInstance(), key); + } } public enum AntiVillagerLag {