Always update window properties

Instead of relying on Spigot to update or maintain window properties that the client disagrees with, manually update them to prevent desync.

Closes #6

Author: Jikoo

pom.xml

@@ -7,9 +7,13 @@
   <groupId>com.github.jikoo</groupId>
   <artifactId>enchantableblocks</artifactId>
   <name>EnchantableBlocks</name>
-  <version>2.0.4</version>
+  <version>2.0.5</version>
   <packaging>jar</packaging>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <repositories>
     <repository>
       <id>spigot-repo</id>
@@ -26,7 +30,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.14-R0.1-SNAPSHOT</version>
+      <version>1.15.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -52,7 +56,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2</version>
         <configuration>
           <minimizeJar>true</minimizeJar>
         </configuration>

src/main/java/com/github/jikoo/enchantableblocks/enchanting/AnvilEnchanter.java

@@ -10,6 +10,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.PrepareAnvilEvent;
 import org.bukkit.inventory.AnvilInventory;
+import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -140,7 +141,10 @@ public void onPrepareAnvil(PrepareAnvilEvent event) {
 
 		event.setResult(result);
 		final int repairCost = cost;
-		plugin.getServer().getScheduler().runTask(plugin, () -> inventory.setRepairCost(repairCost));
+		plugin.getServer().getScheduler().runTask(plugin, () -> {
+			inventory.setRepairCost(repairCost);
+			clicker.setWindowProperty(InventoryView.Property.REPAIR_COST, repairCost);
+		});
 	}
 
 	private int getEnchantmentMultiplier(final Enchantment enchantment, final boolean book) {

src/main/java/com/github/jikoo/enchantableblocks/enchanting/TableEnchanter.java

@@ -1,8 +1,12 @@
 package com.github.jikoo.enchantableblocks.enchanting;
 
 import com.github.jikoo.enchantableblocks.EnchantableBlocksPlugin;
-
 import com.github.jikoo.enchantableblocks.block.EnchantableFurnace;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.enchantments.EnchantmentOffer;
@@ -11,10 +15,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.enchantment.EnchantItemEvent;
 import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import org.bukkit.inventory.InventoryView;
 
 /**
  * Listener for handling enchanting in an enchantment table.
@@ -113,6 +114,19 @@ public void onPrepareItemEnchant(final PrepareItemEnchantEvent event) {
 			return materialOffers;
 		});
 
+		// Force button refresh
+		Bukkit.getScheduler().runTaskLater(plugin, () -> {
+			event.getEnchanter().setWindowProperty(InventoryView.Property.ENCHANT_BUTTON1, event.getOffers()[0].getCost());
+			event.getEnchanter().setWindowProperty(InventoryView.Property.ENCHANT_BUTTON2, event.getOffers()[1].getCost());
+			event.getEnchanter().setWindowProperty(InventoryView.Property.ENCHANT_BUTTON3, event.getOffers()[2].getCost());
+			event.getEnchanter().setWindowProperty(InventoryView.Property.ENCHANT_LEVEL1, event.getOffers()[0].getEnchantmentLevel());
+			event.getEnchanter().setWindowProperty(InventoryView.Property.ENCHANT_LEVEL2, event.getOffers()[1].getEnchantmentLevel());
+			event.getEnchanter().setWindowProperty(InventoryView.Property.ENCHANT_LEVEL3, event.getOffers()[2].getEnchantmentLevel());
+			event.getEnchanter().setWindowProperty(InventoryView.Property.ENCHANT_ID1, getEnchantmentId(event.getOffers()[0].getEnchantment()));
+			event.getEnchanter().setWindowProperty(InventoryView.Property.ENCHANT_ID2, getEnchantmentId(event.getOffers()[1].getEnchantment()));
+			event.getEnchanter().setWindowProperty(InventoryView.Property.ENCHANT_ID3, getEnchantmentId(event.getOffers()[2].getEnchantment()));
+		}, 1L);
+
 	}
 
 
@@ -139,4 +153,22 @@ public void onEnchantItemSucceed(final EnchantItemEvent event) {
 		this.enchantmentOffers.remove(uuid);
 	}
 
+	private int getEnchantmentId(Enchantment enchantment) {
+		String[] split = Bukkit.getServer().getClass().getPackage().getName().split("\\.");
+		String nmsVersion = split[split.length - 1];
+
+		try {
+			Class<?> clazzIRegistry = Class.forName("net.minecraft.server." + nmsVersion + ".IRegistry");
+			Object enchantmentRegistry = clazzIRegistry.getDeclaredField("ENCHANTMENT").get(null);
+			Method methodIRegistry_a = clazzIRegistry.getDeclaredMethod("a", Object.class);
+
+			Class<?> clazzCraftEnchant = Class.forName("org.bukkit.craftbukkit." + nmsVersion + ".enchantments.CraftEnchantment");
+			Method methodCraftEnchant_getRaw = clazzCraftEnchant.getDeclaredMethod("getRaw", Enchantment.class);
+
+			return (int) methodIRegistry_a.invoke(enchantmentRegistry, methodCraftEnchant_getRaw.invoke(null, enchantment));
+		} catch (ReflectiveOperationException e) {
+			return 0;
+		}
+	}
+
 }