Bump version and start remover code

Author: UnknownSilicon

build.gradle

@@ -8,7 +8,7 @@ plugins {
 
 group = 'org.parallelmc'
 
-version = '2.2.1'
+version = '2.3.0'
 description = 'A set of utilities and features for use on the Parallel Minecraft server'
 
 java {

src/main/java/parallelmc/parallelutils/Constants.java

@@ -2,7 +2,7 @@
 
 public class Constants {
 
-	public static final Version VERSION = new Version(2, 2, 1);
+	public static final Version VERSION = new Version(2, 3, 0);
 	public static final String PLUGIN_NAME = "ParallelUtils";
 	public static final String DEFAULT_WORLD = "world2";
 }

src/main/java/parallelmc/parallelutils/modules/charms/ParallelCharms.java

@@ -116,6 +116,7 @@ public void onEnable() {
 		manager.registerEvents(new PlayerLeaveListener(puPlugin, this), puPlugin);
 		manager.registerEvents(new PlayerSlotChangedListener(puPlugin, this), puPlugin);
 		manager.registerEvents(new AnvilApplyCharmListener(puPlugin, this), puPlugin);
+		//manager.registerEvents(new GrindstoneRemoveCharmListener(puPlugin, this), puPlugin);
 		manager.registerEvents(new PlayerHeldItemListener(puPlugin, this), puPlugin);
 		manager.registerEvents(new EntityDamageListener(this), puPlugin);
 
@@ -126,6 +127,7 @@ public void onEnable() {
 
 		puPlugin.addCommand("giveCharm", new GiveCharm(this, charmOptions));
 		puPlugin.addCommand("reloadCharms", new ReloadCharms(this));
+		puPlugin.addCommand("giveRemover", new GiveRemover(puPlugin));
 	}
 
 	@Override

src/main/java/parallelmc/parallelutils/modules/charms/commands/GiveRemover.java

@@ -0,0 +1,72 @@
+package parallelmc.parallelutils.modules.charms.commands;
+
+import net.kyori.adventure.text.Component;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryMoveItemEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.NotNull;
+import parallelmc.parallelutils.Parallelutils;
+import parallelmc.parallelutils.commands.ParallelCommand;
+import parallelmc.parallelutils.commands.permissions.ParallelPermission;
+
+import java.util.List;
+
+public class GiveRemover extends ParallelCommand {
+
+	private final Parallelutils puPlugin;
+
+	public GiveRemover(Parallelutils puPlugin) {
+		super("giveRemover", new ParallelPermission("parallelutils.removecharm"));
+		this.puPlugin = puPlugin;
+	}
+
+	@Override
+	public boolean execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String[] args) {
+
+		Player player;
+
+		if (args.length < 2) {
+			if (sender instanceof Player) {
+				player = (Player) sender;
+			} else {
+				return false;
+			}
+		} else {
+			String playerName = args[1];
+
+			player = sender.getServer().getPlayer(playerName);
+		}
+
+		if (player == null) return false;
+
+		ItemStack item = new ItemStack(Material.PAPER);
+
+		ItemMeta meta = item.getItemMeta();
+
+		if (meta == null) return false;
+
+		meta.displayName(Component.text("<italic:false><yellow>Charm Remover"));
+
+		PersistentDataContainer pdc = meta.getPersistentDataContainer();
+
+		pdc.set(new NamespacedKey(puPlugin, "ParallelUtils.CharmRemover"), PersistentDataType.INTEGER, 1);
+
+		item.setItemMeta(meta);
+
+		player.getInventory().addItem(item);
+
+		return true;
+	}
+
+	@Override
+	public List<String> getTabComplete(@NotNull CommandSender sender, @NotNull String[] args) {
+		return null;
+	}
+}

src/main/java/parallelmc/parallelutils/modules/charms/listeners/AnvilApplyCharmListener.java

@@ -64,7 +64,7 @@ public void onAnvilPrep(PrepareAnvilEvent event) {
 			return;
 		}
 
-		// Check if item2 is a charm. If it is not, clear result and do nothing
+		// Check if item2 is a charm applicator. If it is not, clear result and do nothing
 		Charm charm = Charm.getCharmAppl(puPlugin, pCharms, item2);
 		if (charm == null) {
 			return;

src/main/java/parallelmc/parallelutils/modules/charms/listeners/GrindstoneRemoveCharmListener.java

@@ -0,0 +1,97 @@
+package parallelmc.parallelutils.modules.charms.listeners;
+
+import com.destroystokyo.paper.event.inventory.PrepareGrindstoneEvent;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.inventory.GrindstoneInventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+import parallelmc.parallelutils.Parallelutils;
+import parallelmc.parallelutils.modules.charms.ParallelCharms;
+import parallelmc.parallelutils.modules.charms.data.Charm;
+
+import java.util.logging.Level;
+
+public class GrindstoneRemoveCharmListener implements Listener {
+
+	private final Parallelutils puPlugin;
+	private final ParallelCharms pCharms;
+
+	public GrindstoneRemoveCharmListener(Parallelutils puPlugin, ParallelCharms pCharms) {
+		this.puPlugin = puPlugin;
+		this.pCharms = pCharms;
+	}
+
+	@EventHandler(priority = EventPriority.HIGH)
+	public void onGrindstonePrep(PrepareGrindstoneEvent event) { // Ignore that this is deprecated. It shouldn't be
+		GrindstoneInventory inventory = event.getInventory();
+
+		ItemStack upper = inventory.getUpperItem();
+		ItemStack lower = inventory.getLowerItem();
+
+		if (upper == null || lower == null) {
+			return; // Let minecraft deal with it. We don't care
+		}
+
+		// If upper item does not have a charm, ignore. Let minecraft deal with it
+		if (!Charm.hasCharm(upper)) {
+			return;
+		}
+
+		Player player = null;
+
+		// Only one viewer allowed
+		for (HumanEntity e : event.getViewers()) {
+			if (e instanceof Player pl) {
+				if (player == null) {
+					player = pl;
+				} else {
+					event.setResult(null);
+					return;
+				}
+			}
+		}
+
+
+		if (lower.getType() == Material.PAPER) {
+			ItemMeta meta = lower.getItemMeta();
+
+			PersistentDataContainer pdc = meta.getPersistentDataContainer();
+
+			Integer val = pdc.get(new NamespacedKey(puPlugin, "ParallelUtils.CharmRemover"), PersistentDataType.INTEGER);
+
+			if (val == null) {
+				return;
+			}
+
+			if (val == 1) {
+				// At this point, the upper item has a charm and the lower item is a remover. Set result
+
+				ItemStack result = new ItemStack(upper);
+
+				Charm charm = Charm.parseCharm(pCharms, result, player);
+
+				if (charm == null) {
+					Parallelutils.log(Level.WARNING,  "Something went wrong while taking off a charm!");
+					return;
+				}
+
+				boolean res = charm.takeOff(result, player);
+
+				if (!res) {
+					Parallelutils.log(Level.WARNING,  "Something went wrong while taking off a charm!");
+					return;
+				}
+
+				event.setResult(result);
+			}
+		}
+	}
+}