H8-Network/VillagerOptimizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fitting refactor

Browse Source
This commit is contained in:
xGinko 2023-09-12 10:58:44 +02:00
parent 5ceb1b7484
commit dd85eaf013
14 changed files with 71 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/me/xginko/villageroptimizer/cache/VillagerManager.java → src/main/java/me/xginko/villageroptimizer/CachedVillagers.java
View File

@ -1,8 +1,7 @@
package me.xginko.villageroptimizer.cache; package me.xginko.villageroptimizer;
import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Caffeine;
import me.xginko.villageroptimizer.models.WrappedVillager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Villager; import org.bukkit.entity.Villager;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -12,11 +11,11 @@ import java.time.Duration;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
public class VillagerManager { public final class CachedVillagers {
private final Cache<UUID, WrappedVillager> villagerCache; private final @NotNull Cache<UUID, WrappedVillager> villagerCache;
public VillagerManager(long expireAfterWriteSeconds) { CachedVillagers(long expireAfterWriteSeconds) {
this.villagerCache = Caffeine.newBuilder().expireAfterWrite(Duration.ofSeconds(expireAfterWriteSeconds)).build(); this.villagerCache = Caffeine.newBuilder().expireAfterWrite(Duration.ofSeconds(expireAfterWriteSeconds)).build();
} }

9
src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
View File

@ -1,6 +1,5 @@
package me.xginko.villageroptimizer; package me.xginko.villageroptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager;
import me.xginko.villageroptimizer.commands.VillagerOptimizerCommand; import me.xginko.villageroptimizer.commands.VillagerOptimizerCommand;
import me.xginko.villageroptimizer.config.Config; import me.xginko.villageroptimizer.config.Config;
import me.xginko.villageroptimizer.config.LanguageCache; import me.xginko.villageroptimizer.config.LanguageCache;
@ -32,7 +31,7 @@ public final class VillagerOptimizer extends JavaPlugin {
private static VillagerOptimizer instance; private static VillagerOptimizer instance;
private static HashMap<String, LanguageCache> languageCacheMap; private static HashMap<String, LanguageCache> languageCacheMap;
private static VillagerManager villagerManager; private static CachedVillagers cachedVillagers;
private static Config config; private static Config config;
private static Logger logger; private static Logger logger;
@ -75,8 +74,8 @@ public final class VillagerOptimizer extends JavaPlugin {
public static VillagerOptimizer getInstance() { public static VillagerOptimizer getInstance() {
return instance; return instance;
} }
public static VillagerManager getVillagerManager() { public static CachedVillagers getCachedVillagers() {
return villagerManager; return cachedVillagers;
} }
public static Config getConfiguration() { public static Config getConfiguration() {
return config; return config;
@ -97,7 +96,7 @@ public final class VillagerOptimizer extends JavaPlugin {
private void reloadConfiguration() { private void reloadConfiguration() {
try { try {
config = new Config(); config = new Config();
villagerManager = new VillagerManager(config.cache_keep_time_seconds); cachedVillagers = new CachedVillagers(config.cache_keep_time_seconds);
VillagerOptimizerModule.reloadModules(); VillagerOptimizerModule.reloadModules();
config.saveConfig(); config.saveConfig();
} catch (Exception e) { } catch (Exception e) {

5
src/main/java/me/xginko/villageroptimizer/models/WrappedVillager.java → src/main/java/me/xginko/villageroptimizer/WrappedVillager.java
View File

@ -1,6 +1,5 @@
package me.xginko.villageroptimizer.models; package me.xginko.villageroptimizer;
import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.enums.Keys; import me.xginko.villageroptimizer.enums.Keys;
import me.xginko.villageroptimizer.enums.OptimizationType; import me.xginko.villageroptimizer.enums.OptimizationType;
import org.bukkit.entity.Villager; import org.bukkit.entity.Villager;
@ -13,7 +12,7 @@ public final class WrappedVillager {
private final @NotNull Villager villager; private final @NotNull Villager villager;
private final @NotNull PersistentDataContainer dataContainer; private final @NotNull PersistentDataContainer dataContainer;
public WrappedVillager(@NotNull Villager villager) { WrappedVillager(@NotNull Villager villager) {
this.villager = villager; this.villager = villager;
this.dataContainer = this.villager.getPersistentDataContainer(); this.dataContainer = this.villager.getPersistentDataContainer();
} }

8
src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java
View File

@ -1,11 +1,11 @@
package me.xginko.villageroptimizer.commands.optimizevillagers; package me.xginko.villageroptimizer.commands.optimizevillagers;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import me.xginko.villageroptimizer.commands.VillagerOptimizerCommand; import me.xginko.villageroptimizer.commands.VillagerOptimizerCommand;
import me.xginko.villageroptimizer.enums.OptimizationType; import me.xginko.villageroptimizer.enums.OptimizationType;
import me.xginko.villageroptimizer.enums.Permissions; import me.xginko.villageroptimizer.enums.Permissions;
import me.xginko.villageroptimizer.models.WrappedVillager; import me.xginko.villageroptimizer.WrappedVillager;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.TextReplacementConfig;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
@ -56,7 +56,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete
try { try {
int specifiedRadius = Integer.parseInt(args[0]) / 2; int specifiedRadius = Integer.parseInt(args[0]) / 2;
VillagerManager villagerManager = VillagerOptimizer.getVillagerManager(); CachedVillagers cachedVillagers = VillagerOptimizer.getCachedVillagers();
int successCount = 0; int successCount = 0;
int failCount = 0; int failCount = 0;
@ -66,7 +66,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete
Villager.Profession profession = villager.getProfession(); Villager.Profession profession = villager.getProfession();
if (profession.equals(Villager.Profession.NITWIT) || profession.equals(Villager.Profession.NONE)) continue; if (profession.equals(Villager.Profession.NITWIT) || profession.equals(Villager.Profession.NONE)) continue;
WrappedVillager wVillager = villagerManager.getOrAdd(villager); WrappedVillager wVillager = cachedVillagers.getOrAdd(villager);
if (!wVillager.isOptimized()) { if (!wVillager.isOptimized()) {
wVillager.setOptimization(OptimizationType.COMMAND); wVillager.setOptimization(OptimizationType.COMMAND);

8
src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
View File

@ -1,11 +1,11 @@
package me.xginko.villageroptimizer.commands.unoptimizevillagers; package me.xginko.villageroptimizer.commands.unoptimizevillagers;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import me.xginko.villageroptimizer.commands.VillagerOptimizerCommand; import me.xginko.villageroptimizer.commands.VillagerOptimizerCommand;
import me.xginko.villageroptimizer.enums.OptimizationType; import me.xginko.villageroptimizer.enums.OptimizationType;
import me.xginko.villageroptimizer.enums.Permissions; import me.xginko.villageroptimizer.enums.Permissions;
import me.xginko.villageroptimizer.models.WrappedVillager; import me.xginko.villageroptimizer.WrappedVillager;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.TextReplacementConfig;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
@ -47,7 +47,7 @@ public class UnOptVillagersRadius implements VillagerOptimizerCommand {
try { try {
int specifiedRadius = Integer.parseInt(args[0]) / 2; int specifiedRadius = Integer.parseInt(args[0]) / 2;
VillagerManager villagerManager = VillagerOptimizer.getVillagerManager(); CachedVillagers cachedVillagers = VillagerOptimizer.getCachedVillagers();
int successCount = 0; int successCount = 0;
for (Entity entity : player.getNearbyEntities(specifiedRadius, specifiedRadius, specifiedRadius)) { for (Entity entity : player.getNearbyEntities(specifiedRadius, specifiedRadius, specifiedRadius)) {
@ -56,7 +56,7 @@ public class UnOptVillagersRadius implements VillagerOptimizerCommand {
Villager.Profession profession = villager.getProfession(); Villager.Profession profession = villager.getProfession();
if (profession.equals(Villager.Profession.NITWIT) || profession.equals(Villager.Profession.NONE)) continue; if (profession.equals(Villager.Profession.NITWIT) || profession.equals(Villager.Profession.NONE)) continue;
WrappedVillager wVillager = villagerManager.getOrAdd(villager); WrappedVillager wVillager = cachedVillagers.getOrAdd(villager);
if (wVillager.isOptimized()) { if (wVillager.isOptimized()) {
wVillager.setOptimization(OptimizationType.OFF); wVillager.setOptimization(OptimizationType.OFF);

14
src/main/java/me/xginko/villageroptimizer/modules/BlockOptimization.java
View File

@ -3,9 +3,9 @@ package me.xginko.villageroptimizer.modules;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.config.Config; import me.xginko.villageroptimizer.config.Config;
import me.xginko.villageroptimizer.enums.OptimizationType; import me.xginko.villageroptimizer.enums.OptimizationType;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import me.xginko.villageroptimizer.enums.Permissions; import me.xginko.villageroptimizer.enums.Permissions;
import me.xginko.villageroptimizer.models.WrappedVillager; import me.xginko.villageroptimizer.WrappedVillager;
import me.xginko.villageroptimizer.utils.CommonUtils; import me.xginko.villageroptimizer.utils.CommonUtils;
import me.xginko.villageroptimizer.utils.LogUtils; import me.xginko.villageroptimizer.utils.LogUtils;
import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.TextReplacementConfig;
@ -34,7 +34,7 @@ public class BlockOptimization implements VillagerOptimizerModule, Listener {
* TODO: Think of better logic than just checking under the villagers feet for block * TODO: Think of better logic than just checking under the villagers feet for block
* */ * */
private final VillagerManager villagerManager; private final CachedVillagers cachedVillagers;
private final HashSet<Material> blocks_that_disable = new HashSet<>(4); private final HashSet<Material> blocks_that_disable = new HashSet<>(4);
private final boolean shouldLog, shouldNotifyPlayer; private final boolean shouldLog, shouldNotifyPlayer;
private final int maxVillagers; private final int maxVillagers;
@ -42,7 +42,7 @@ public class BlockOptimization implements VillagerOptimizerModule, Listener {
protected BlockOptimization() { protected BlockOptimization() {
shouldEnable(); shouldEnable();
this.villagerManager = VillagerOptimizer.getVillagerManager(); this.cachedVillagers = VillagerOptimizer.getCachedVillagers();
Config config = VillagerOptimizer.getConfiguration(); Config config = VillagerOptimizer.getConfiguration();
config.addComment("optimization-methods.block-optimization.enable", """ config.addComment("optimization-methods.block-optimization.enable", """
When enabled, villagers standing on the configured specific blocks will become optimized once a\s When enabled, villagers standing on the configured specific blocks will become optimized once a\s
@ -97,7 +97,7 @@ public class BlockOptimization implements VillagerOptimizerModule, Listener {
if (counter >= maxVillagers) return; if (counter >= maxVillagers) return;
if (!entity.getType().equals(EntityType.VILLAGER)) continue; if (!entity.getType().equals(EntityType.VILLAGER)) continue;
WrappedVillager wVillager = villagerManager.getOrAdd((Villager) entity); WrappedVillager wVillager = cachedVillagers.getOrAdd((Villager) entity);
final OptimizationType type = wVillager.getOptimizationType(); final OptimizationType type = wVillager.getOptimizationType();
if (!type.equals(OptimizationType.OFF) && !type.equals(OptimizationType.COMMAND)) continue; if (!type.equals(OptimizationType.OFF) && !type.equals(OptimizationType.COMMAND)) continue;
@ -137,7 +137,7 @@ public class BlockOptimization implements VillagerOptimizerModule, Listener {
for (Entity entity : broken.getRelative(BlockFace.UP).getLocation().getNearbyEntities(0.5,1,0.5)) { for (Entity entity : broken.getRelative(BlockFace.UP).getLocation().getNearbyEntities(0.5,1,0.5)) {
if (!entity.getType().equals(EntityType.VILLAGER)) continue; if (!entity.getType().equals(EntityType.VILLAGER)) continue;
WrappedVillager wVillager = villagerManager.getOrAdd((Villager) entity); WrappedVillager wVillager = cachedVillagers.getOrAdd((Villager) entity);
if (wVillager.getOptimizationType().equals(OptimizationType.BLOCK)) { if (wVillager.getOptimizationType().equals(OptimizationType.BLOCK)) {
if (counter >= maxVillagers) return; if (counter >= maxVillagers) return;
@ -165,7 +165,7 @@ public class BlockOptimization implements VillagerOptimizerModule, Listener {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (!player.hasPermission(Permissions.Optimize.BLOCK.get())) return; if (!player.hasPermission(Permissions.Optimize.BLOCK.get())) return;
WrappedVillager wVillager = villagerManager.getOrAdd((Villager) interacted); WrappedVillager wVillager = cachedVillagers.getOrAdd((Villager) interacted);
final Location entityLegs = interacted.getLocation(); final Location entityLegs = interacted.getLocation();
if ( if (

14
src/main/java/me/xginko/villageroptimizer/modules/LevelVillagers.java
View File

@ -1,9 +1,9 @@
package me.xginko.villageroptimizer.modules; package me.xginko.villageroptimizer.modules;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import me.xginko.villageroptimizer.config.Config; import me.xginko.villageroptimizer.config.Config;
import me.xginko.villageroptimizer.models.WrappedVillager; import me.xginko.villageroptimizer.WrappedVillager;
import me.xginko.villageroptimizer.utils.CommonUtils; import me.xginko.villageroptimizer.utils.CommonUtils;
import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.TextReplacementConfig;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -20,14 +20,14 @@ import org.bukkit.potion.PotionEffectType;
public class LevelVillagers implements VillagerOptimizerModule, Listener { public class LevelVillagers implements VillagerOptimizerModule, Listener {
private final VillagerOptimizer plugin; private final VillagerOptimizer plugin;
private final VillagerManager villagerManager; private final CachedVillagers cachedVillagers;
private final boolean shouldNotify; private final boolean shouldNotify;
private final long cooldown; private final long cooldown;
public LevelVillagers() { public LevelVillagers() {
shouldEnable(); shouldEnable();
this.plugin = VillagerOptimizer.getInstance(); this.plugin = VillagerOptimizer.getInstance();
this.villagerManager = VillagerOptimizer.getVillagerManager(); this.cachedVillagers = VillagerOptimizer.getCachedVillagers();
Config config = VillagerOptimizer.getConfiguration(); Config config = VillagerOptimizer.getConfiguration();
config.addComment("gameplay.villager-leveling.enable", """ config.addComment("gameplay.villager-leveling.enable", """
This is needed to allow optimized villagers to level up.\s This is needed to allow optimized villagers to level up.\s
@ -61,13 +61,15 @@ public class LevelVillagers implements VillagerOptimizerModule, Listener {
event.getInventory().getType().equals(InventoryType.MERCHANT) event.getInventory().getType().equals(InventoryType.MERCHANT)
&& event.getInventory().getHolder() instanceof Villager villager && event.getInventory().getHolder() instanceof Villager villager
) { ) {
WrappedVillager wVillager = villagerManager.getOrAdd(villager); WrappedVillager wVillager = cachedVillagers.getOrAdd(villager);
if (!wVillager.isOptimized()) return; if (!wVillager.isOptimized()) return;
if (wVillager.canLevelUp(cooldown)) { if (wVillager.canLevelUp(cooldown)) {
if (wVillager.calculateLevel() > villager.getVillagerLevel()) { if (wVillager.calculateLevel() > villager.getVillagerLevel()) {
villager.getScheduler().run(plugin, enableAI -> {
villager.setAware(true);
villager.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, (int) (20 + (cooldown / 50L)), 120, false, false)); villager.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, (int) (20 + (cooldown / 50L)), 120, false, false));
villager.getScheduler().run(plugin, enableAI -> villager.setAware(true), null); }, null);
villager.getScheduler().runDelayed(plugin, disableAI -> { villager.getScheduler().runDelayed(plugin, disableAI -> {
villager.setAware(false); villager.setAware(false);
wVillager.saveLastLevelUp(); wVillager.saveLastLevelUp();

10
src/main/java/me/xginko/villageroptimizer/modules/NametagOptimization.java
View File

@ -2,11 +2,11 @@ package me.xginko.villageroptimizer.modules;
import io.papermc.paper.event.player.PlayerNameEntityEvent; import io.papermc.paper.event.player.PlayerNameEntityEvent;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import me.xginko.villageroptimizer.config.Config; import me.xginko.villageroptimizer.config.Config;
import me.xginko.villageroptimizer.enums.OptimizationType; import me.xginko.villageroptimizer.enums.OptimizationType;
import me.xginko.villageroptimizer.enums.Permissions; import me.xginko.villageroptimizer.enums.Permissions;
import me.xginko.villageroptimizer.models.WrappedVillager; import me.xginko.villageroptimizer.WrappedVillager;
import me.xginko.villageroptimizer.utils.CommonUtils; import me.xginko.villageroptimizer.utils.CommonUtils;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.TextReplacementConfig;
@ -26,14 +26,14 @@ import java.util.List;
public class NametagOptimization implements VillagerOptimizerModule, Listener { public class NametagOptimization implements VillagerOptimizerModule, Listener {
private final VillagerManager villagerManager; private final CachedVillagers cachedVillagers;
private final HashSet<String> nametags = new HashSet<>(4); private final HashSet<String> nametags = new HashSet<>(4);
private final boolean shouldLog, shouldNotifyPlayer, consumeNametag; private final boolean shouldLog, shouldNotifyPlayer, consumeNametag;
private final long cooldown; private final long cooldown;
protected NametagOptimization() { protected NametagOptimization() {
shouldEnable(); shouldEnable();
this.villagerManager = VillagerOptimizer.getVillagerManager(); this.cachedVillagers = VillagerOptimizer.getCachedVillagers();
Config config = VillagerOptimizer.getConfiguration(); Config config = VillagerOptimizer.getConfiguration();
config.addComment("optimization-methods.nametag-optimization.enable", """ config.addComment("optimization-methods.nametag-optimization.enable", """
Enable optimization by naming villagers to one of the names configured below.\s Enable optimization by naming villagers to one of the names configured below.\s
@ -75,7 +75,7 @@ public class NametagOptimization implements VillagerOptimizerModule, Listener {
if (name == null) return; if (name == null) return;
final String nameTag = PlainTextComponentSerializer.plainText().serialize(name); final String nameTag = PlainTextComponentSerializer.plainText().serialize(name);
WrappedVillager wVillager = villagerManager.getOrAdd((Villager) event.getEntity()); WrappedVillager wVillager = cachedVillagers.getOrAdd((Villager) event.getEntity());
if (nametags.contains(nameTag.toLowerCase())) { if (nametags.contains(nameTag.toLowerCase())) {
if (wVillager.isOptimized()) return; if (wVillager.isOptimized()) return;

10
src/main/java/me/xginko/villageroptimizer/modules/PreventUnoptimizedTrading.java
View File

@ -1,7 +1,7 @@
package me.xginko.villageroptimizer.modules; package me.xginko.villageroptimizer.modules;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import me.xginko.villageroptimizer.config.Config; import me.xginko.villageroptimizer.config.Config;
import me.xginko.villageroptimizer.enums.Permissions; import me.xginko.villageroptimizer.enums.Permissions;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -16,12 +16,12 @@ import org.bukkit.event.inventory.TradeSelectEvent;
public class PreventUnoptimizedTrading implements VillagerOptimizerModule, Listener { public class PreventUnoptimizedTrading implements VillagerOptimizerModule, Listener {
private final VillagerManager villagerManager; private final CachedVillagers cachedVillagers;
private final boolean notifyPlayer; private final boolean notifyPlayer;
protected PreventUnoptimizedTrading() { protected PreventUnoptimizedTrading() {
shouldEnable(); shouldEnable();
this.villagerManager = VillagerOptimizer.getVillagerManager(); this.cachedVillagers = VillagerOptimizer.getCachedVillagers();
Config config = VillagerOptimizer.getConfiguration(); Config config = VillagerOptimizer.getConfiguration();
config.addComment("gameplay.prevent-trading-with-unoptimized.enable", """ config.addComment("gameplay.prevent-trading-with-unoptimized.enable", """
Will prevent players from selecting and using trades of unoptimized villagers.\s Will prevent players from selecting and using trades of unoptimized villagers.\s
@ -54,7 +54,7 @@ public class PreventUnoptimizedTrading implements VillagerOptimizerModule, Liste
if ( if (
event.getInventory().getType().equals(InventoryType.MERCHANT) event.getInventory().getType().equals(InventoryType.MERCHANT)
&& event.getInventory().getHolder() instanceof Villager villager && event.getInventory().getHolder() instanceof Villager villager
&& !villagerManager.getOrAdd(villager).isOptimized() && !cachedVillagers.getOrAdd(villager).isOptimized()
) { ) {
event.setCancelled(true); event.setCancelled(true);
if (notifyPlayer) if (notifyPlayer)
@ -69,7 +69,7 @@ public class PreventUnoptimizedTrading implements VillagerOptimizerModule, Liste
if ( if (
event.getInventory().getType().equals(InventoryType.MERCHANT) event.getInventory().getType().equals(InventoryType.MERCHANT)
&& event.getInventory().getHolder() instanceof Villager villager && event.getInventory().getHolder() instanceof Villager villager
&& !villagerManager.getOrAdd(villager).isOptimized() && !cachedVillagers.getOrAdd(villager).isOptimized()
) { ) {
event.setCancelled(true); event.setCancelled(true);
if (notifyPlayer) if (notifyPlayer)

12
src/main/java/me/xginko/villageroptimizer/modules/PreventVillagerDamage.java
View File

@ -2,7 +2,7 @@ package me.xginko.villageroptimizer.modules;
import io.papermc.paper.event.entity.EntityPushedByEntityAttackEvent; import io.papermc.paper.event.entity.EntityPushedByEntityAttackEvent;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import me.xginko.villageroptimizer.config.Config; import me.xginko.villageroptimizer.config.Config;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@ -17,12 +17,12 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
public class PreventVillagerDamage implements VillagerOptimizerModule, Listener { public class PreventVillagerDamage implements VillagerOptimizerModule, Listener {
private final VillagerManager villagerManager; private final CachedVillagers cachedVillagers;
private final boolean block, player, mob, other, push; private final boolean block, player, mob, other, push;
protected PreventVillagerDamage() { protected PreventVillagerDamage() {
shouldEnable(); shouldEnable();
this.villagerManager = VillagerOptimizer.getVillagerManager(); this.cachedVillagers = VillagerOptimizer.getCachedVillagers();
Config config = VillagerOptimizer.getConfiguration(); Config config = VillagerOptimizer.getConfiguration();
config.addComment("gameplay.prevent-damage.enable", config.addComment("gameplay.prevent-damage.enable",
"Configure what kind of damage you want to cancel for optimized villagers here."); "Configure what kind of damage you want to cancel for optimized villagers here.");
@ -58,7 +58,7 @@ public class PreventVillagerDamage implements VillagerOptimizerModule, Listener
private void onDamageReceive(EntityDamageByEntityEvent event) { private void onDamageReceive(EntityDamageByEntityEvent event) {
if ( if (
event.getEntityType().equals(EntityType.VILLAGER) event.getEntityType().equals(EntityType.VILLAGER)
&& villagerManager.getOrAdd((Villager) event.getEntity()).isOptimized() && cachedVillagers.getOrAdd((Villager) event.getEntity()).isOptimized()
) { ) {
Entity damager = event.getDamager(); Entity damager = event.getDamager();
if (damager.getType().equals(EntityType.PLAYER)) { if (damager.getType().equals(EntityType.PLAYER)) {
@ -82,7 +82,7 @@ public class PreventVillagerDamage implements VillagerOptimizerModule, Listener
if ( if (
block block
&& event.getEntityType().equals(EntityType.VILLAGER) && event.getEntityType().equals(EntityType.VILLAGER)
&& villagerManager.getOrAdd((Villager) event.getEntity()).isOptimized() && cachedVillagers.getOrAdd((Villager) event.getEntity()).isOptimized()
) { ) {
event.setCancelled(true); event.setCancelled(true);
} }
@ -93,7 +93,7 @@ public class PreventVillagerDamage implements VillagerOptimizerModule, Listener
if ( if (
push push
&& event.getEntityType().equals(EntityType.VILLAGER) && event.getEntityType().equals(EntityType.VILLAGER)
&& villagerManager.getOrAdd((Villager) event.getEntity()).isOptimized() && cachedVillagers.getOrAdd((Villager) event.getEntity()).isOptimized()
) { ) {
event.setCancelled(true); event.setCancelled(true);
} }

12
src/main/java/me/xginko/villageroptimizer/modules/PreventVillagerTargetting.java
View File

@ -2,7 +2,7 @@ package me.xginko.villageroptimizer.modules;
import com.destroystokyo.paper.event.entity.EntityPathfindEvent; import com.destroystokyo.paper.event.entity.EntityPathfindEvent;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Mob; import org.bukkit.entity.Mob;
@ -16,10 +16,10 @@ import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
public class PreventVillagerTargetting implements VillagerOptimizerModule, Listener { public class PreventVillagerTargetting implements VillagerOptimizerModule, Listener {
private final VillagerManager villagerManager; private final CachedVillagers cachedVillagers;
protected PreventVillagerTargetting() { protected PreventVillagerTargetting() {
this.villagerManager = VillagerOptimizer.getVillagerManager(); this.cachedVillagers = VillagerOptimizer.getCachedVillagers();
} }
@Override @Override
@ -46,7 +46,7 @@ public class PreventVillagerTargetting implements VillagerOptimizerModule, Liste
if ( if (
target != null target != null
&& target.getType().equals(EntityType.VILLAGER) && target.getType().equals(EntityType.VILLAGER)
&& villagerManager.getOrAdd((Villager) target).isOptimized() && cachedVillagers.getOrAdd((Villager) target).isOptimized()
) { ) {
event.setCancelled(true); event.setCancelled(true);
} }
@ -58,7 +58,7 @@ public class PreventVillagerTargetting implements VillagerOptimizerModule, Liste
if ( if (
target != null target != null
&& target.getType().equals(EntityType.VILLAGER) && target.getType().equals(EntityType.VILLAGER)
&& villagerManager.getOrAdd((Villager) target).isOptimized() && cachedVillagers.getOrAdd((Villager) target).isOptimized()
) { ) {
event.setCancelled(true); event.setCancelled(true);
} }
@ -69,7 +69,7 @@ public class PreventVillagerTargetting implements VillagerOptimizerModule, Liste
if ( if (
event.getEntityType().equals(EntityType.VILLAGER) event.getEntityType().equals(EntityType.VILLAGER)
&& event.getDamager() instanceof Mob attacker && event.getDamager() instanceof Mob attacker
&& villagerManager.getOrAdd((Villager) event.getEntity()).isOptimized() && cachedVillagers.getOrAdd((Villager) event.getEntity()).isOptimized()
) { ) {
attacker.setTarget(null); attacker.setTarget(null);
} }

10
src/main/java/me/xginko/villageroptimizer/modules/RestockTrades.java
View File

@ -1,10 +1,10 @@
package me.xginko.villageroptimizer.modules; package me.xginko.villageroptimizer.modules;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import me.xginko.villageroptimizer.config.Config; import me.xginko.villageroptimizer.config.Config;
import me.xginko.villageroptimizer.enums.Permissions; import me.xginko.villageroptimizer.enums.Permissions;
import me.xginko.villageroptimizer.models.WrappedVillager; import me.xginko.villageroptimizer.WrappedVillager;
import me.xginko.villageroptimizer.utils.CommonUtils; import me.xginko.villageroptimizer.utils.CommonUtils;
import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.TextReplacementConfig;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@ -22,13 +22,13 @@ public class RestockTrades implements VillagerOptimizerModule, Listener {
* TODO: Disable notify message for cooldown bypassers * TODO: Disable notify message for cooldown bypassers
* */ * */
private final VillagerManager villagerManager; private final CachedVillagers cachedVillagers;
private final long restock_delay_millis; private final long restock_delay_millis;
private final boolean shouldLog, notifyPlayer; private final boolean shouldLog, notifyPlayer;
protected RestockTrades() { protected RestockTrades() {
shouldEnable(); shouldEnable();
this.villagerManager = VillagerOptimizer.getVillagerManager(); this.cachedVillagers = VillagerOptimizer.getCachedVillagers();
Config config = VillagerOptimizer.getConfiguration(); Config config = VillagerOptimizer.getConfiguration();
config.addComment("gameplay.trade-restocking.enable", """ config.addComment("gameplay.trade-restocking.enable", """
This is for automatic restocking of trades for optimized villagers. Optimized Villagers\s This is for automatic restocking of trades for optimized villagers. Optimized Villagers\s
@ -60,7 +60,7 @@ public class RestockTrades implements VillagerOptimizerModule, Listener {
private void onInteract(PlayerInteractEntityEvent event) { private void onInteract(PlayerInteractEntityEvent event) {
if (!event.getRightClicked().getType().equals(EntityType.VILLAGER)) return; if (!event.getRightClicked().getType().equals(EntityType.VILLAGER)) return;
WrappedVillager wVillager = villagerManager.getOrAdd((Villager) event.getRightClicked()); WrappedVillager wVillager = cachedVillagers.getOrAdd((Villager) event.getRightClicked());
if (!wVillager.isOptimized()) return; if (!wVillager.isOptimized()) return;
Player player = event.getPlayer(); Player player = event.getPlayer();

8
src/main/java/me/xginko/villageroptimizer/modules/VillagerChunkLimit.java
View File

@ -2,7 +2,7 @@ package me.xginko.villageroptimizer.modules;
import io.papermc.paper.threadedregions.scheduler.ScheduledTask; import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import me.xginko.villageroptimizer.config.Config; import me.xginko.villageroptimizer.config.Config;
import me.xginko.villageroptimizer.utils.LogUtils; import me.xginko.villageroptimizer.utils.LogUtils;
import org.bukkit.Chunk; import org.bukkit.Chunk;
@ -28,7 +28,7 @@ public class VillagerChunkLimit implements VillagerOptimizerModule, Listener {
* */ * */
private final VillagerOptimizer plugin; private final VillagerOptimizer plugin;
private final VillagerManager villagerManager; private final CachedVillagers cachedVillagers;
private ScheduledTask scheduledTask; private ScheduledTask scheduledTask;
private final List<Villager.Profession> removalPriority = new ArrayList<>(16); private final List<Villager.Profession> removalPriority = new ArrayList<>(16);
private final int global_max_villagers_per_chunk, max_unoptimized_per_chunk, max_optimized_per_chunk; private final int global_max_villagers_per_chunk, max_unoptimized_per_chunk, max_optimized_per_chunk;
@ -38,7 +38,7 @@ public class VillagerChunkLimit implements VillagerOptimizerModule, Listener {
protected VillagerChunkLimit() { protected VillagerChunkLimit() {
shouldEnable(); shouldEnable();
this.plugin = VillagerOptimizer.getInstance(); this.plugin = VillagerOptimizer.getInstance();
this.villagerManager = VillagerOptimizer.getVillagerManager(); this.cachedVillagers = VillagerOptimizer.getCachedVillagers();
Config config = VillagerOptimizer.getConfiguration(); Config config = VillagerOptimizer.getConfiguration();
config.addComment("villager-chunk-limit.enable", """ config.addComment("villager-chunk-limit.enable", """
Checks chunks for too many villagers and removes excess villagers based on priority.\s Checks chunks for too many villagers and removes excess villagers based on priority.\s
@ -138,6 +138,6 @@ public class VillagerChunkLimit implements VillagerOptimizerModule, Listener {
private int getProfessionPriority(Villager villager) { private int getProfessionPriority(Villager villager) {
final Villager.Profession profession = villager.getProfession(); final Villager.Profession profession = villager.getProfession();
return removalPriority.contains(profession) && !villagerManager.getOrAdd(villager).isOptimized() ? removalPriority.indexOf(profession) : Integer.MAX_VALUE; return removalPriority.contains(profession) && !cachedVillagers.getOrAdd(villager).isOptimized() ? removalPriority.indexOf(profession) : Integer.MAX_VALUE;
} }
} }

12
src/main/java/me/xginko/villageroptimizer/modules/WorkstationOptimization.java
View File

@ -1,11 +1,11 @@
package me.xginko.villageroptimizer.modules; package me.xginko.villageroptimizer.modules;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.cache.VillagerManager; import me.xginko.villageroptimizer.CachedVillagers;
import me.xginko.villageroptimizer.config.Config; import me.xginko.villageroptimizer.config.Config;
import me.xginko.villageroptimizer.enums.OptimizationType; import me.xginko.villageroptimizer.enums.OptimizationType;
import me.xginko.villageroptimizer.enums.Permissions; import me.xginko.villageroptimizer.enums.Permissions;
import me.xginko.villageroptimizer.models.WrappedVillager; import me.xginko.villageroptimizer.WrappedVillager;
import me.xginko.villageroptimizer.utils.CommonUtils; import me.xginko.villageroptimizer.utils.CommonUtils;
import me.xginko.villageroptimizer.utils.LogUtils; import me.xginko.villageroptimizer.utils.LogUtils;
import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.TextReplacementConfig;
@ -31,7 +31,7 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene
* TODO: Make placed workstation villager profession related. * TODO: Make placed workstation villager profession related.
* */ * */
private final VillagerManager villagerManager; private final CachedVillagers cachedVillagers;
private final HashSet<Material> workstations_that_disable = new HashSet<>(14); private final HashSet<Material> workstations_that_disable = new HashSet<>(14);
private final boolean shouldLog, shouldNotifyPlayer; private final boolean shouldLog, shouldNotifyPlayer;
private final long cooldown; private final long cooldown;
@ -39,7 +39,7 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene
protected WorkstationOptimization() { protected WorkstationOptimization() {
shouldEnable(); shouldEnable();
this.villagerManager = VillagerOptimizer.getVillagerManager(); this.cachedVillagers = VillagerOptimizer.getCachedVillagers();
Config config = VillagerOptimizer.getConfiguration(); Config config = VillagerOptimizer.getConfiguration();
config.addComment("optimization-methods.workstation-optimization.enable", """ config.addComment("optimization-methods.workstation-optimization.enable", """
When enabled, villagers near a configured radius to a workstation specific to your config\s When enabled, villagers near a configured radius to a workstation specific to your config\s
@ -100,7 +100,7 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene
final Villager.Profession profession = villager.getProfession(); final Villager.Profession profession = villager.getProfession();
if (profession.equals(Villager.Profession.NONE) || profession.equals(Villager.Profession.NITWIT)) continue; if (profession.equals(Villager.Profession.NONE) || profession.equals(Villager.Profession.NITWIT)) continue;
WrappedVillager wVillager = villagerManager.getOrAdd(villager); WrappedVillager wVillager = cachedVillagers.getOrAdd(villager);
final double distance = entity.getLocation().distance(workstationLoc); final double distance = entity.getLocation().distance(workstationLoc);
if (distance < closestDistance) { if (distance < closestDistance) {
@ -153,7 +153,7 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene
if (!entity.getType().equals(EntityType.VILLAGER)) continue; if (!entity.getType().equals(EntityType.VILLAGER)) continue;
Villager villager = (Villager) entity; Villager villager = (Villager) entity;
WrappedVillager wVillager = villagerManager.getOrAdd(villager); WrappedVillager wVillager = cachedVillagers.getOrAdd(villager);
final double distance = entity.getLocation().distance(workstationLoc); final double distance = entity.getLocation().distance(workstationLoc);
if (distance < closestDistance) { if (distance < closestDistance) {