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

small fix

Browse Source
This commit is contained in:
xGinko 2023-09-29 17:49:11 +02:00
parent 91871fd7de
commit be432ed1bd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/xginko/villageroptimizer/WrappedVillager.java
View File

@ -180,7 +180,7 @@ public final class WrappedVillager {
return dataContainer.has(Keys.LAST_LEVELUP.key(), PersistentDataType.LONG) ? (villager.getWorld().getFullTime() - (dataContainer.get(Keys.LAST_LEVELUP.key(), PersistentDataType.LONG) + cooldown_millis)) : cooldown_millis; return dataContainer.has(Keys.LAST_LEVELUP.key(), PersistentDataType.LONG) ? (villager.getWorld().getFullTime() - (dataContainer.get(Keys.LAST_LEVELUP.key(), PersistentDataType.LONG) + cooldown_millis)) : cooldown_millis;
} }
public void renameForOptimization(final @Nullable Component newName, final boolean replace_existing_name) { public void rename(final @Nullable Component newName, final boolean replace_existing_name) {
if (replace_existing_name) { if (replace_existing_name) {
villager.customName(newName); villager.customName(newName);
if (newName == null) dataContainer.remove(Keys.LAST_OPTIMIZE_NAME.key()); if (newName == null) dataContainer.remove(Keys.LAST_OPTIMIZE_NAME.key());

7
src/main/java/me/xginko/villageroptimizer/modules/RenameOptimizedVillagers.java
View File

@ -3,6 +3,7 @@ package me.xginko.villageroptimizer.modules;
import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.VillagerOptimizer;
import me.xginko.villageroptimizer.WrappedVillager; import me.xginko.villageroptimizer.WrappedVillager;
import me.xginko.villageroptimizer.config.Config; import me.xginko.villageroptimizer.config.Config;
import me.xginko.villageroptimizer.enums.OptimizationType;
import me.xginko.villageroptimizer.events.VillagerOptimizeEvent; import me.xginko.villageroptimizer.events.VillagerOptimizeEvent;
import me.xginko.villageroptimizer.events.VillagerUnoptimizeEvent; import me.xginko.villageroptimizer.events.VillagerUnoptimizeEvent;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
@ -50,15 +51,17 @@ public class RenameOptimizedVillagers implements VillagerOptimizerModule, Listen
private void onOptimize(VillagerOptimizeEvent event) { private void onOptimize(VillagerOptimizeEvent event) {
WrappedVillager wVillager = event.getWrappedVillager(); WrappedVillager wVillager = event.getWrappedVillager();
wVillager.villager().getScheduler().runDelayed(plugin, rename -> { wVillager.villager().getScheduler().runDelayed(plugin, rename -> {
wVillager.renameForOptimization(optimized_name, overwrite_previous_name); wVillager.rename(optimized_name, overwrite_previous_name);
}, null, 10L); }, null, 10L);
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
private void onUnOptimize(VillagerUnoptimizeEvent event) { private void onUnOptimize(VillagerUnoptimizeEvent event) {
WrappedVillager wVillager = event.getWrappedVillager(); WrappedVillager wVillager = event.getWrappedVillager();
if (wVillager.getOptimizationType().equals(OptimizationType.NAMETAG)) return;
wVillager.villager().getScheduler().runDelayed(plugin, rename -> { wVillager.villager().getScheduler().runDelayed(plugin, rename -> {
wVillager.renameForOptimization(null, overwrite_previous_name); wVillager.rename(null, overwrite_previous_name);
}, null, 10L); }, null, 10L);
} }
} }