From a5adc828dc3e5de836789d343e19ee54df3f2eb8 Mon Sep 17 00:00:00 2001 From: adrian Date: Sun, 14 Dec 2025 16:01:15 -0300 Subject: [PATCH] Fixed some warnings. --- build.gradle.kts | 2 +- .../adrianvic/nemesiseye/impl/PlayerEventListener.java | 2 -- .../java/io/github/adrianvic/nemesiseye/impl/b1_7_3.java | 1 + .../io/github/adrianvic/nemesiseye/impl/commands/Eye.java | 2 +- src/main/java/io/github/adrianvic/nemesiseye/Config.java | 8 ++++---- src/main/java/io/github/adrianvic/nemesiseye/Nemesis.java | 1 - .../io/github/adrianvic/nemesiseye/commands/EyeCore.java | 2 +- .../adrianvic/nemesiseye/commands/sub/PolicyInfo.java | 1 - .../nemesiseye/policy/handlers/useEnchantment.java | 2 +- .../adrianvic/nemesiseye/policy/handlers/useItem.java | 2 +- .../io/github/adrianvic/nemesiseye/impl/commands/Eye.java | 3 +-- .../java/io/github/adrianvic/nemesiseye/impl/r1_21.java | 7 ++----- 12 files changed, 13 insertions(+), 20 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d3f7b54..28061f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,7 +51,7 @@ mcVersions.forEach { ver -> /* ----------------------------------------- */ dependencies { - add("compileOnly", files("libs/craftbukkit-1060.jar")) + add("compileOnly", "io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") add("r1_21CompileOnly", "io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") add("b1_7_3CompileOnly", files("libs/craftbukkit-1060.jar")) } diff --git a/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/PlayerEventListener.java b/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/PlayerEventListener.java index c45789a..b77a56a 100644 --- a/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/PlayerEventListener.java +++ b/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/PlayerEventListener.java @@ -1,8 +1,6 @@ package io.github.adrianvic.nemesiseye.impl; import io.github.adrianvic.nemesiseye.Events; -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockListener; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerListener; diff --git a/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/b1_7_3.java b/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/b1_7_3.java index f8d6fc8..68783b1 100644 --- a/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/b1_7_3.java +++ b/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/b1_7_3.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +@SuppressWarnings("unused") public class b1_7_3 implements Glimmer { JavaPlugin plugin; PluginManager pm; diff --git a/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/commands/Eye.java b/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/commands/Eye.java index c1f5da7..b3db3e5 100644 --- a/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/commands/Eye.java +++ b/src/b1_7_3/java/io/github/adrianvic/nemesiseye/impl/commands/Eye.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; public class Eye implements CommandExecutor { - private EyeCore core; + private final EyeCore core; public Eye() { core = new EyeCore(); diff --git a/src/main/java/io/github/adrianvic/nemesiseye/Config.java b/src/main/java/io/github/adrianvic/nemesiseye/Config.java index 5e286cd..52bc4dc 100644 --- a/src/main/java/io/github/adrianvic/nemesiseye/Config.java +++ b/src/main/java/io/github/adrianvic/nemesiseye/Config.java @@ -9,7 +9,7 @@ import java.util.List; public class Config { private static Config instance = new Config(); - private Glimmer glim = Nemesis.getInstance().getGlimmer(); + private final Glimmer glim = Nemesis.getInstance().getGlimmer(); private File file; private List policies = new ArrayList<>(); @@ -17,10 +17,10 @@ public class Config { private Config() {} public void load() { - List newPolicies = glim.loadPoliciesFromFile(glim.loadConfigFile()); - policies = newPolicies; + policies = glim.loadPoliciesFromFile(glim.loadConfigFile()); } - +// TODO: Implement config saving +// // public void save() { // try { // config.save(file); diff --git a/src/main/java/io/github/adrianvic/nemesiseye/Nemesis.java b/src/main/java/io/github/adrianvic/nemesiseye/Nemesis.java index b2bb00c..d232213 100644 --- a/src/main/java/io/github/adrianvic/nemesiseye/Nemesis.java +++ b/src/main/java/io/github/adrianvic/nemesiseye/Nemesis.java @@ -1,6 +1,5 @@ package io.github.adrianvic.nemesiseye; -import io.github.adrianvic.nemesiseye.commands.EyeCore; import io.github.adrianvic.nemesiseye.reflection.Glimmer; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/io/github/adrianvic/nemesiseye/commands/EyeCore.java b/src/main/java/io/github/adrianvic/nemesiseye/commands/EyeCore.java index 666bfab..38be35b 100644 --- a/src/main/java/io/github/adrianvic/nemesiseye/commands/EyeCore.java +++ b/src/main/java/io/github/adrianvic/nemesiseye/commands/EyeCore.java @@ -49,5 +49,5 @@ public class EyeCore { return List.of(); } - public Map getSubs() { return subs; }; + public Map getSubs() { return subs; } } diff --git a/src/main/java/io/github/adrianvic/nemesiseye/commands/sub/PolicyInfo.java b/src/main/java/io/github/adrianvic/nemesiseye/commands/sub/PolicyInfo.java index d9460e5..20576cf 100644 --- a/src/main/java/io/github/adrianvic/nemesiseye/commands/sub/PolicyInfo.java +++ b/src/main/java/io/github/adrianvic/nemesiseye/commands/sub/PolicyInfo.java @@ -2,7 +2,6 @@ package io.github.adrianvic.nemesiseye.commands.sub; import io.github.adrianvic.nemesiseye.Config; import io.github.adrianvic.nemesiseye.policy.Policy; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import java.util.ArrayList; diff --git a/src/main/java/io/github/adrianvic/nemesiseye/policy/handlers/useEnchantment.java b/src/main/java/io/github/adrianvic/nemesiseye/policy/handlers/useEnchantment.java index 50df134..e34c28f 100644 --- a/src/main/java/io/github/adrianvic/nemesiseye/policy/handlers/useEnchantment.java +++ b/src/main/java/io/github/adrianvic/nemesiseye/policy/handlers/useEnchantment.java @@ -10,7 +10,7 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.ItemStack; public class useEnchantment implements NodeHandler { - private Glimmer glim = Nemesis.getInstance().getGlimmer(); + private final Glimmer glim = Nemesis.getInstance().getGlimmer(); @Override public boolean allows(HumanEntity entity, PolicyNode node, Action action) { diff --git a/src/main/java/io/github/adrianvic/nemesiseye/policy/handlers/useItem.java b/src/main/java/io/github/adrianvic/nemesiseye/policy/handlers/useItem.java index d956816..a28a700 100644 --- a/src/main/java/io/github/adrianvic/nemesiseye/policy/handlers/useItem.java +++ b/src/main/java/io/github/adrianvic/nemesiseye/policy/handlers/useItem.java @@ -10,7 +10,7 @@ import org.bukkit.entity.HumanEntity; public class useItem implements NodeHandler { - private Glimmer glim = Nemesis.getInstance().getGlimmer(); + private final Glimmer glim = Nemesis.getInstance().getGlimmer(); @Override public boolean allows(HumanEntity entity, PolicyNode node, Action action) { diff --git a/src/r1_21/java/io/github/adrianvic/nemesiseye/impl/commands/Eye.java b/src/r1_21/java/io/github/adrianvic/nemesiseye/impl/commands/Eye.java index ca8c0ac..e28b412 100644 --- a/src/r1_21/java/io/github/adrianvic/nemesiseye/impl/commands/Eye.java +++ b/src/r1_21/java/io/github/adrianvic/nemesiseye/impl/commands/Eye.java @@ -1,7 +1,6 @@ package io.github.adrianvic.nemesiseye.impl.commands; import io.github.adrianvic.nemesiseye.commands.EyeCore; -import io.github.adrianvic.nemesiseye.commands.sub.*; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -12,7 +11,7 @@ import org.jetbrains.annotations.Nullable; import java.util.*; public class Eye implements CommandExecutor, TabCompleter { - private EyeCore core; + private final EyeCore core; public Eye() { core = new EyeCore(); diff --git a/src/r1_21/java/io/github/adrianvic/nemesiseye/impl/r1_21.java b/src/r1_21/java/io/github/adrianvic/nemesiseye/impl/r1_21.java index 43d65dc..2d735eb 100644 --- a/src/r1_21/java/io/github/adrianvic/nemesiseye/impl/r1_21.java +++ b/src/r1_21/java/io/github/adrianvic/nemesiseye/impl/r1_21.java @@ -1,6 +1,5 @@ package io.github.adrianvic.nemesiseye.impl; -import io.github.adrianvic.nemesiseye.DataShifter; import io.github.adrianvic.nemesiseye.Nemesis; import io.github.adrianvic.nemesiseye.impl.commands.Eye; import io.github.adrianvic.nemesiseye.policy.Policy; @@ -20,6 +19,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +@SuppressWarnings("unused") public class r1_21 implements Glimmer { @Override public File loadConfigFile() { @@ -86,10 +86,7 @@ public class r1_21 implements Glimmer { @Override public boolean hasItemMeta(ItemStack item) { - if (item.getItemMeta() == null) { - return false; - } - return true; + return item.getItemMeta() != null; } @Override