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

dont call event like a noob

Browse Source
This commit is contained in:
xGinko 2023-10-04 15:09:36 +02:00
parent 7e69efa877
commit cb8c694f6b
12 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
View File

@ -14,7 +14,6 @@ import org.bukkit.NamespacedKey;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.io.File; import java.io.File;
@ -96,9 +95,6 @@ public final class VillagerOptimizer extends JavaPlugin {
public static LanguageCache getLang(String lang) { public static LanguageCache getLang(String lang) {
return config.auto_lang ? languageCacheMap.getOrDefault(lang.replace("-", "_"), languageCacheMap.get(config.default_lang.toString().toLowerCase())) : languageCacheMap.get(config.default_lang.toString().toLowerCase()); return config.auto_lang ? languageCacheMap.getOrDefault(lang.replace("-", "_"), languageCacheMap.get(config.default_lang.toString().toLowerCase())) : languageCacheMap.get(config.default_lang.toString().toLowerCase());
} }
public static void callEvent(Event event) {
instance.getServer().getPluginManager().callEvent(event);
}
public void reloadPlugin() { public void reloadPlugin() {
reloadLang(false); reloadLang(false);

2
VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java
View File

@ -89,7 +89,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete
if (player_has_cooldown_bypass || wVillager.canOptimize(cooldown)) { if (player_has_cooldown_bypass || wVillager.canOptimize(cooldown)) {
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.COMMAND, player); VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.COMMAND, player);
VillagerOptimizer.callEvent(optimizeEvent); optimizeEvent.callEvent();
if (!optimizeEvent.isCancelled()) { if (!optimizeEvent.isCancelled()) {
wVillager.setOptimization(optimizeEvent.getOptimizationType()); wVillager.setOptimization(optimizeEvent.getOptimizationType());
wVillager.saveOptimizeTime(); wVillager.saveOptimizeTime();

2
VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
View File

@ -81,7 +81,7 @@ public class UnOptVillagersRadius implements VillagerOptimizerCommand, TabComple
if (wVillager.isOptimized()) { if (wVillager.isOptimized()) {
VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.COMMAND); VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.COMMAND);
VillagerOptimizer.callEvent(unOptimizeEvent); unOptimizeEvent.callEvent();
if (!unOptimizeEvent.isCancelled()) { if (!unOptimizeEvent.isCancelled()) {
wVillager.setOptimization(OptimizationType.NONE); wVillager.setOptimization(OptimizationType.NONE);
successCount++; successCount++;

4
VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
View File

@ -109,7 +109,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener {
if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.BLOCK_COOLDOWN.get())) { if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.BLOCK_COOLDOWN.get())) {
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.BLOCK, player, event.isAsynchronous()); VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.BLOCK, player, event.isAsynchronous());
VillagerOptimizer.callEvent(optimizeEvent); optimizeEvent.callEvent();
if (optimizeEvent.isCancelled()) return; if (optimizeEvent.isCancelled()) return;
closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType()); closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
@ -170,7 +170,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener {
if (closestOptimizedVillager == null) return; if (closestOptimizedVillager == null) return;
VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.BLOCK, event.isAsynchronous()); VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.BLOCK, event.isAsynchronous());
VillagerOptimizer.callEvent(unOptimizeEvent); unOptimizeEvent.callEvent();
if (unOptimizeEvent.isCancelled()) return; if (unOptimizeEvent.isCancelled()) return;
closestOptimizedVillager.setOptimization(OptimizationType.NONE); closestOptimizedVillager.setOptimization(OptimizationType.NONE);

4
VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
View File

@ -85,7 +85,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
if (nametags.contains(name.toLowerCase())) { if (nametags.contains(name.toLowerCase())) {
if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) { if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) {
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, player, event.isAsynchronous()); VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, player, event.isAsynchronous());
VillagerOptimizer.callEvent(optimizeEvent); optimizeEvent.callEvent();
if (optimizeEvent.isCancelled()) return; if (optimizeEvent.isCancelled()) return;
if (!consume_nametag) { if (!consume_nametag) {
@ -113,7 +113,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
} else { } else {
if (wVillager.isOptimized()) { if (wVillager.isOptimized()) {
VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.NAMETAG, event.isAsynchronous()); VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.NAMETAG, event.isAsynchronous());
VillagerOptimizer.callEvent(unOptimizeEvent); unOptimizeEvent.callEvent();
if (unOptimizeEvent.isCancelled()) return; if (unOptimizeEvent.isCancelled()) return;
wVillager.setOptimization(OptimizationType.NONE); wVillager.setOptimization(OptimizationType.NONE);

4
VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
View File

@ -93,7 +93,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener
if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.WORKSTATION_COOLDOWN.get())) { if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.WORKSTATION_COOLDOWN.get())) {
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.WORKSTATION, player, event.isAsynchronous()); VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.WORKSTATION, player, event.isAsynchronous());
VillagerOptimizer.callEvent(optimizeEvent); optimizeEvent.callEvent();
if (optimizeEvent.isCancelled()) return; if (optimizeEvent.isCancelled()) return;
closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType()); closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
@ -158,7 +158,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener
if (closestOptimizedVillager == null) return; if (closestOptimizedVillager == null) return;
VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.WORKSTATION, event.isAsynchronous()); VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.WORKSTATION, event.isAsynchronous());
VillagerOptimizer.callEvent(unOptimizeEvent); unOptimizeEvent.callEvent();
if (unOptimizeEvent.isCancelled()) return; if (unOptimizeEvent.isCancelled()) return;
closestOptimizedVillager.setOptimization(OptimizationType.NONE); closestOptimizedVillager.setOptimization(OptimizationType.NONE);

4
VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
View File

@ -14,7 +14,6 @@ import org.bukkit.NamespacedKey;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.io.File; import java.io.File;
@ -96,9 +95,6 @@ public final class VillagerOptimizer extends JavaPlugin {
public static LanguageCache getLang(String lang) { public static LanguageCache getLang(String lang) {
return config.auto_lang ? languageCacheMap.getOrDefault(lang.replace("-", "_"), languageCacheMap.get(config.default_lang.toString().toLowerCase())) : languageCacheMap.get(config.default_lang.toString().toLowerCase()); return config.auto_lang ? languageCacheMap.getOrDefault(lang.replace("-", "_"), languageCacheMap.get(config.default_lang.toString().toLowerCase())) : languageCacheMap.get(config.default_lang.toString().toLowerCase());
} }
public static void callEvent(Event event) {
instance.getServer().getPluginManager().callEvent(event);
}
public void reloadPlugin() { public void reloadPlugin() {
reloadLang(false); reloadLang(false);

2
VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java
View File

@ -89,7 +89,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete
if (player_has_cooldown_bypass || wVillager.canOptimize(cooldown)) { if (player_has_cooldown_bypass || wVillager.canOptimize(cooldown)) {
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.COMMAND, player); VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.COMMAND, player);
VillagerOptimizer.callEvent(optimizeEvent); optimizeEvent.callEvent();
if (!optimizeEvent.isCancelled()) { if (!optimizeEvent.isCancelled()) {
wVillager.setOptimization(optimizeEvent.getOptimizationType()); wVillager.setOptimization(optimizeEvent.getOptimizationType());
wVillager.saveOptimizeTime(); wVillager.saveOptimizeTime();

2
VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
View File

@ -81,7 +81,7 @@ public class UnOptVillagersRadius implements VillagerOptimizerCommand, TabComple
if (wVillager.isOptimized()) { if (wVillager.isOptimized()) {
VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.COMMAND); VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.COMMAND);
VillagerOptimizer.callEvent(unOptimizeEvent); unOptimizeEvent.callEvent();
if (!unOptimizeEvent.isCancelled()) { if (!unOptimizeEvent.isCancelled()) {
wVillager.setOptimization(OptimizationType.NONE); wVillager.setOptimization(OptimizationType.NONE);
successCount++; successCount++;

4
VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
View File

@ -115,7 +115,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener {
if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.BLOCK_COOLDOWN.get())) { if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.BLOCK_COOLDOWN.get())) {
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.BLOCK, player, event.isAsynchronous()); VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.BLOCK, player, event.isAsynchronous());
VillagerOptimizer.callEvent(optimizeEvent); optimizeEvent.callEvent();
if (optimizeEvent.isCancelled()) return; if (optimizeEvent.isCancelled()) return;
closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType()); closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
@ -177,7 +177,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener {
if (closestOptimizedVillager == null) return; if (closestOptimizedVillager == null) return;
VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.BLOCK, event.isAsynchronous()); VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.BLOCK, event.isAsynchronous());
VillagerOptimizer.callEvent(unOptimizeEvent); unOptimizeEvent.callEvent();
if (unOptimizeEvent.isCancelled()) return; if (unOptimizeEvent.isCancelled()) return;
closestOptimizedVillager.setOptimization(OptimizationType.NONE); closestOptimizedVillager.setOptimization(OptimizationType.NONE);

4
VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
View File

@ -91,7 +91,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
if (nametags.contains(name.toLowerCase())) { if (nametags.contains(name.toLowerCase())) {
if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) { if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) {
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, player, event.isAsynchronous()); VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, player, event.isAsynchronous());
VillagerOptimizer.callEvent(optimizeEvent); optimizeEvent.callEvent();
if (optimizeEvent.isCancelled()) return; if (optimizeEvent.isCancelled()) return;
if (!consume_nametag) { if (!consume_nametag) {
@ -120,7 +120,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
} else { } else {
if (wVillager.isOptimized()) { if (wVillager.isOptimized()) {
VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.NAMETAG, event.isAsynchronous()); VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.NAMETAG, event.isAsynchronous());
VillagerOptimizer.callEvent(unOptimizeEvent); unOptimizeEvent.callEvent();
if (unOptimizeEvent.isCancelled()) return; if (unOptimizeEvent.isCancelled()) return;
wVillager.setOptimization(OptimizationType.NONE); wVillager.setOptimization(OptimizationType.NONE);

4
VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
View File

@ -99,7 +99,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener
if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.WORKSTATION_COOLDOWN.get())) { if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.WORKSTATION_COOLDOWN.get())) {
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.WORKSTATION, player, event.isAsynchronous()); VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.WORKSTATION, player, event.isAsynchronous());
VillagerOptimizer.callEvent(optimizeEvent); optimizeEvent.callEvent();
if (optimizeEvent.isCancelled()) return; if (optimizeEvent.isCancelled()) return;
closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType()); closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
@ -165,7 +165,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener
if (closestOptimizedVillager == null) return; if (closestOptimizedVillager == null) return;
VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.WORKSTATION, event.isAsynchronous()); VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.WORKSTATION, event.isAsynchronous());
VillagerOptimizer.callEvent(unOptimizeEvent); unOptimizeEvent.callEvent();
if (unOptimizeEvent.isCancelled()) return; if (unOptimizeEvent.isCancelled()) return;
closestOptimizedVillager.setOptimization(OptimizationType.NONE); closestOptimizedVillager.setOptimization(OptimizationType.NONE);