Merge branch 'master' into feature/AntiPlayerLootDespawn

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

@@ -0,0 +1,42 @@
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.quarzRecipe;
+
+import eu.mhsl.craftattack.spawn.core.Main;
+import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.ShapelessRecipe;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class QuarzRecipe extends Appliance {
+    private NamespacedKey recipeKey;
+    @Override
+    public void onEnable() {
+        this.recipeKey = new NamespacedKey(Main.instance(), "quarz_block_to_quarz");
+
+        ShapelessRecipe recipe = new ShapelessRecipe(this.recipeKey, new ItemStack(Material.QUARTZ, 4));
+        recipe.addIngredient(Material.QUARTZ_BLOCK);
+
+        Bukkit.addRecipe(recipe);
+        Bukkit.getOnlinePlayers().forEach(this::unlock);
+    }
+
+    @Override
+    public void onDisable() {
+        Bukkit.removeRecipe(this.recipeKey);
+    }
+
+    public void unlock(Player player) {
+        player.discoverRecipe(this.recipeKey);
+    }
+
+    @Override
+    protected @NotNull List<Listener> listeners() {
+        return List.of(new QuarzRecipeListener());
+    }
+}

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

@@ -0,0 +1,12 @@
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.quarzRecipe;
+
+import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+public class QuarzRecipeListener extends ApplianceListener<QuarzRecipe> {
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        this.getAppliance().unlock(event.getPlayer());
+    }
+}

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/security/antiGrief/AntiGrief.java

@@ -20,7 +20,7 @@ import org.bukkit.event.Event;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListMap;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/ProjectStart.java

@@ -58,16 +58,15 @@ public class ProjectStart extends Appliance {
     );
 
     private final Map<GameRule<Boolean>, Boolean> gameRulesAfterStart = Map.ofEntries(
-        entry(GameRule.DO_DAYLIGHT_CYCLE, true),
-        entry(GameRule.DO_INSOMNIA, true),
-        entry(GameRule.DISABLE_RAIDS, false),
-        entry(GameRule.DO_FIRE_TICK, true),
-        entry(GameRule.DO_ENTITY_DROPS, true),
-        entry(GameRule.DO_PATROL_SPAWNING, true),
-        entry(GameRule.DO_TRADER_SPAWNING, true),
-        entry(GameRule.DO_WEATHER_CYCLE, true),
-        entry(GameRule.FALL_DAMAGE, true),
-        entry(GameRule.FIRE_DAMAGE, true)
+            entry(GameRules.ADVANCE_TIME, true),
+            entry(GameRules.SPAWN_PHANTOMS, true),
+            entry(GameRules.RAIDS, true),
+            entry(GameRules.ENTITY_DROPS, true),
+            entry(GameRules.SPAWN_PATROLS, true),
+            entry(GameRules.SPAWN_WANDERING_TRADERS, true),
+            entry(GameRules.ADVANCE_WEATHER, true),
+            entry(GameRules.FALL_DAMAGE, true),
+            entry(GameRules.FIRE_DAMAGE, true)
     );
 
     public ProjectStart() {