fix #4

src/main/java/cat/nyaa/saika/Configure.java

@@ -53,7 +53,6 @@ public class Configure extends PluginConfigure {
  @Serializable(name = "sound.success")
  public SoundConf successSound = new SoundConf();
 
-
  @Serializable(name = "sound.fail")
  public SoundConf failSound = new SoundConf();
 
@@ -91,9 +90,13 @@ public class Configure extends PluginConfigure {
 
  @Serializable(name = "forge.lowEfficiency.multiplier")
  public double lowEfficiencyMultiplier = 1.5;
+
  @Serializable(name = "log.enabled")
  public boolean logEnabled = false;
 
+ @Serializable(name = "directInteract")
+ public boolean directInteractEnabled = false;
+
 
  public static class SoundConf implements ISerializable {
  @Serializable

src/main/java/cat/nyaa/saika/forge/ui/ForgeUi.java

@@ -95,6 +95,7 @@ public void updateValidation() {
  }
 
  public ForgeableItem onForge() {
+ this.updateValidation();
  ForgeManager forgeManager = ForgeManager.getForgeManager();
  if (validation.equals(RecipieValidation.VALID)) {
  ForgeableItem item = forgeManager.forgeItem(getRecipe());

src/main/java/cat/nyaa/saika/forge/ui/ForgeUiEvents.java

@@ -13,12 +13,15 @@
 import cat.nyaa.saika.forge.roll.ForgeRecipe;
 import cat.nyaa.saika.log.Logger;
 import org.bukkit.*;
+import org.bukkit.block.Block;
 import org.bukkit.entity.ExperienceOrb;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.*;
+import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
@@ -58,15 +61,6 @@ public static void registerRepulse(Inventory inventory, RepulseUi repulseUi) {
  repulseUiList.put(inventory, repulseUi);
  }
 
- @EventHandler
- public void onInventoryClose(InventoryCloseEvent ev) {
- Inventory inventory = ev.getInventory();
- giveItemBack(ev, inventory, forgeUiList);
- giveItemBack(ev, inventory, enchantUiList);
- giveItemBack(ev, inventory, recycleUiList);
- giveItemBack(ev, inventory, repulseUiList);
- }
-
  private void giveItemBack(InventoryCloseEvent ev, Inventory inventory, Map<Inventory, ? extends InventoryHolder> enchantUiList) {
  if (enchantUiList.remove(inventory) != null) {
  for (int i = 0; i < 3; i++) {
@@ -85,6 +79,43 @@ private void giveItemBack(InventoryCloseEvent ev, Inventory inventory, Map<Inven
  }
  }
 
+ @EventHandler
+ public void onDirectInteract(PlayerInteractEvent event){
+ Configure configure = plugin.getConfigure();
+ if (!configure.directInteractEnabled) {
+ return;
+ }
+ if (event.getAction().equals(Action.RIGHT_CLICK_BLOCK)){
+ Player player = event.getPlayer();
+ Block clickedBlock = event.getClickedBlock();
+ if (clickedBlock != null){
+ if (player.isSneaking()){
+ return;
+ }
+ Material forgeBlock = configure.getForgeBlock();
+ Material enchantBlock = configure.getEnchantBlock();
+ if (clickedBlock.getType().equals(forgeBlock)){
+ event.setCancelled(true);
+ new ForgeUi().openInventory(player);
+ return;
+ }else if (clickedBlock.getType().equals(enchantBlock)){
+ event.setCancelled(true);
+ new EnchantUi().openInventory(player);
+ return;
+ }
+ }
+ }
+ }
+
+ @EventHandler
+ public void onInventoryClose(InventoryCloseEvent ev) {
+ Inventory inventory = ev.getInventory();
+ giveItemBack(ev, inventory, forgeUiList);
+ giveItemBack(ev, inventory, enchantUiList);
+ giveItemBack(ev, inventory, recycleUiList);
+ giveItemBack(ev, inventory, repulseUiList);
+ }
+
  @EventHandler
  public void onInventoryDrag(InventoryDragEvent ev) {
  Inventory clickedInventory = ev.getView().getTopInventory();
@@ -255,8 +286,8 @@ private void forgeUiClicked(InventoryClickEvent ev, Inventory clickedInventory)
  if (currentItem != null && currentItem.getItemMeta() != null) {
  if (currentItem.getItemMeta().getCustomTagContainer().hasCustomTag(INDICATOR, ItemTagType.STRING)) {
  forgeUi.updateValidation();
- ForgeRecipe recipe = forgeUi.getRecipe();
  ForgeableItem item = forgeUi.onForge();
+ ForgeRecipe recipe = forgeUi.getRecipe();
  if (item != null) {
  ItemStack itemStack = item.getItemStack().clone();
  String level = item.getLevel();