From e5af76c3ca10d60482c01b440cdb55a337b126a5 Mon Sep 17 00:00:00 2001
From: mfnalex <1122571+mfnalex@users.noreply.github.com>
Date: Thu, 5 Aug 2021 12:46:22 +0200
Subject: [PATCH] 2.2.0 release
---
pom.xml | 7 ++++---
.../jeff_media/bettertridents/commands/ReloadCommand.java | 3 +--
.../de/jeff_media/bettertridents/tasks/WatchTrident.java | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6f3bb98..5b0eb68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
de.jeff_media
BetterTridents
BetterTridents
- 2.1.1
+ 2.2.0
${project.name}
@@ -141,13 +141,14 @@
de.jeff_media
JeffLib
- 1.0-SNAPSHOT
+ 4.0.0-SNAPSHOT
compile
de.jeff_media
SpigotUpdateChecker
- 1.2.4
+ 1.3.0
+ compile
org.bstats
diff --git a/src/main/java/de/jeff_media/bettertridents/commands/ReloadCommand.java b/src/main/java/de/jeff_media/bettertridents/commands/ReloadCommand.java
index 5ed096f..5d5ac3f 100644
--- a/src/main/java/de/jeff_media/bettertridents/commands/ReloadCommand.java
+++ b/src/main/java/de/jeff_media/bettertridents/commands/ReloadCommand.java
@@ -2,7 +2,6 @@ package de.jeff_media.bettertridents.commands;
import de.jeff_media.bettertridents.Main;
import de.jeff_media.bettertridents.config.Permissions;
-import de.jeff_media.jefflib.thirdparty.org.jetbrains.annotations.NotNull;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@@ -13,7 +12,7 @@ public class ReloadCommand implements CommandExecutor {
private final Main main = Main.getInstance();
@Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
+ public boolean onCommand(CommandSender sender, Command command, String alias, String[] args) {
if(!sender.hasPermission(Permissions.RELOAD)) {
sender.sendMessage(command.getPermissionMessage());
diff --git a/src/main/java/de/jeff_media/bettertridents/tasks/WatchTrident.java b/src/main/java/de/jeff_media/bettertridents/tasks/WatchTrident.java
index e03a94b..a0d3b9c 100644
--- a/src/main/java/de/jeff_media/bettertridents/tasks/WatchTrident.java
+++ b/src/main/java/de/jeff_media/bettertridents/tasks/WatchTrident.java
@@ -1,7 +1,7 @@
package de.jeff_media.bettertridents.tasks;
import de.jeff_media.bettertridents.Main;
-import de.jeff_media.jefflib.ReflUtil;
+import de.jeff_media.jefflib.ReflUtils;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Trident;
@@ -21,7 +21,7 @@ public class WatchTrident extends BukkitRunnable {
int fieldCount = 0;
Class> entityThrownTridentClass = null;
try {
- entityThrownTridentClass = ReflUtil.getNMSClass("EntityThrownTrident");
+ entityThrownTridentClass = ReflUtils.getNMSClass("EntityThrownTrident");
} catch (Throwable ignored) {
// 1.17+
}
@@ -31,7 +31,7 @@ public class WatchTrident extends BukkitRunnable {
// 1.17+
entityThrownTridentClass = Class.forName("net.minecraft.world.entity.projectile.EntityThrownTrident");
}
- getHandleMethod = ReflUtil.getOBCClass("entity.CraftTrident").getMethod("getHandle");
+ getHandleMethod = ReflUtils.getOBCClass("entity.CraftTrident").getMethod("getHandle");
for (Field field : entityThrownTridentClass.getDeclaredFields()) {
if (field.getType() == Boolean.TYPE) {
damageDealtField = field;