Merge remote-tracking branch 'origin/master'

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/quarzRecipe/QuarzRecipe.java

@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 public class QuarzRecipe extends Appliance {
-    private NamespacedKey recipeKey;
+    protected NamespacedKey recipeKey;
     @Override
     public void onEnable() {
         this.recipeKey = new NamespacedKey(Main.instance(), "quarz_block_to_quarz");
@@ -26,11 +26,6 @@ public class QuarzRecipe extends Appliance {
         Bukkit.getOnlinePlayers().forEach(this::unlock);
     }
 
-    @Override
-    public void onDisable() {
-        Bukkit.removeRecipe(this.recipeKey);
-    }
-
     public void unlock(Player player) {
         player.discoverRecipe(this.recipeKey);
     }

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/quarzRecipe/QuarzRecipeListener.java

@@ -1,12 +1,19 @@
 package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.quarzRecipe;
 
 import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
+import io.papermc.paper.event.player.PlayerInventorySlotChangeEvent;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.inventory.ItemStack;
 
 class QuarzRecipeListener extends ApplianceListener<QuarzRecipe> {
     @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
+    public void shouldDiscover(PlayerInventorySlotChangeEvent event) {
-        this.getAppliance().unlock(event.getPlayer());
+        ItemStack clickedItem = event.getNewItemStack();
+        Player player = event.getPlayer();
+        if(clickedItem.getType() != Material.QUARTZ_BLOCK) return;
+        if(player.hasDiscoveredRecipe(this.getAppliance().recipeKey)) return;
+        this.getAppliance().unlock(player);
     }
 }