From 83f5e87bfe7e5c3ccbdd0decd2a4f92e6bb72c27 Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Wed, 20 Jan 2021 17:45:02 +0000
Subject: [PATCH] Readded discovery

---
 .../com/willfp/talismans/TalismansPlugin.java |  4 ++-
 .../talismans/display/TalismanDisplay.java    |  2 +-
 .../util/DiscoverRecipeListener.java          | 36 +++++++++++++++++++
 .../{ => talismans}/util/ProxyUtils.java      |  2 +-
 .../talismans/util/WatcherTriggers.java       |  1 -
 5 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java
 rename eco-core/core-plugin/src/main/java/com/willfp/talismans/{ => talismans}/util/ProxyUtils.java (93%)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java
index 9a74c83..a5a6339 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java
@@ -17,6 +17,7 @@ import com.willfp.talismans.integrations.mcmmo.McmmoManager;
 import com.willfp.talismans.integrations.mcmmo.plugins.McmmoIntegrationImpl;
 import com.willfp.talismans.talismans.Talismans;
 import com.willfp.talismans.talismans.util.BlockPlaceListener;
+import com.willfp.talismans.talismans.util.DiscoverRecipeListener;
 import com.willfp.talismans.talismans.util.TalismanChecks;
 import com.willfp.talismans.talismans.util.TalismanCraftListener;
 import com.willfp.talismans.talismans.util.WatcherTriggers;
@@ -158,7 +159,8 @@ public class TalismansPlugin extends AbstractEcoPlugin {
                 new WatcherTriggers(this),
                 new BlockPlaceListener(),
                 new TalismanCraftListener(),
-                new TalismanEquipEventListeners(this)
+                new TalismanEquipEventListeners(this),
+                new DiscoverRecipeListener(this)
         );
     }
 
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java
index 3d2cd1e..401d0b5 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java
@@ -3,7 +3,7 @@ package com.willfp.talismans.display;
 import com.willfp.talismans.proxy.proxies.SkullProxy;
 import com.willfp.talismans.talismans.Talisman;
 import com.willfp.talismans.talismans.util.TalismanChecks;
-import com.willfp.talismans.util.ProxyUtils;
+import com.willfp.talismans.talismans.util.ProxyUtils;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java
new file mode 100644
index 0000000..54ca3b6
--- /dev/null
+++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java
@@ -0,0 +1,36 @@
+package com.willfp.talismans.talismans.util;
+
+import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.talismans.talismans.Talisman;
+import com.willfp.talismans.talismans.Talismans;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class DiscoverRecipeListener extends PluginDependent implements Listener {
+    /**
+     * Register listener.
+     *
+     * @param plugin Talismans.
+     */
+    public DiscoverRecipeListener(@NotNull final AbstractEcoPlugin plugin) {
+        super(plugin);
+    }
+
+    /**
+     * Unlock all recipes on player join.
+     *
+     * @param event The event to listen for.
+     */
+    @EventHandler
+    public void onJoin(@NotNull final PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+
+        if (this.getPlugin().getConfigYml().getBool("crafting.discover")) {
+            Talismans.values().stream().filter(Talisman::isEnabled).map(Talisman::getKey).forEach(player::discoverRecipe);
+        }
+    }
+}
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/util/ProxyUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/ProxyUtils.java
similarity index 93%
rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/util/ProxyUtils.java
rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/ProxyUtils.java
index 9c4461f..8df62e0 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/util/ProxyUtils.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/ProxyUtils.java
@@ -1,4 +1,4 @@
-package com.willfp.talismans.util;
+package com.willfp.talismans.talismans.util;
 
 import com.willfp.eco.util.proxy.AbstractProxy;
 import com.willfp.talismans.TalismansPlugin;
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java
index 03e0581..e9af3e8 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java
@@ -6,7 +6,6 @@ import com.willfp.eco.util.internal.PluginDependent;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.talismans.integrations.mcmmo.McmmoManager;
 import com.willfp.talismans.proxy.proxies.TridentStackProxy;
-import com.willfp.talismans.util.ProxyUtils;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Arrow;