Merge branch 'release/1.1'

Author: Fjarik

src/main/java/eu/quantumsociety/deltacraft/DeltaCraft.java

@@ -5,13 +5,12 @@
 import eu.quantumsociety.deltacraft.commands.home.HomesCommand;
 import eu.quantumsociety.deltacraft.commands.home.SetHomeCommand;
 import eu.quantumsociety.deltacraft.commands.kelp.KelpCommand;
+import eu.quantumsociety.deltacraft.commands.other.KahyCommand;
 import eu.quantumsociety.deltacraft.commands.spectate.SpectateCommand;
-import eu.quantumsociety.deltacraft.listeners.ComposterListener;
-import eu.quantumsociety.deltacraft.listeners.KelpGrowListener;
-import eu.quantumsociety.deltacraft.listeners.SpawnerDestroyListener;
-import eu.quantumsociety.deltacraft.listeners.SpectateListener;
+import eu.quantumsociety.deltacraft.listeners.*;
 import eu.quantumsociety.deltacraft.managers.*;
 import eu.quantumsociety.deltacraft.utils.enums.Settings;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -52,17 +51,27 @@ public void onEnable() {
         debugMsg("Spectate loaded");
         this.getCommand("kelp").setExecutor(new KelpCommand(kelpConfigManager, this));
         debugMsg("Kelp farms loaded");
+        this.getCommand("kahy").setExecutor(new KahyCommand(this));
+        debugMsg("Kahy commands loaded");
 
         // Events
         PluginManager plm = this.getServer().getPluginManager();
         plm.registerEvents(new SpectateListener(this), this);
         debugMsg("Spectate listener loaded");
         plm.registerEvents(new KelpGrowListener(this), this);
         debugMsg("Kelp listener loaded");
+        plm.registerEvents(new CampfireListener(this), this);
+        debugMsg("Campfire listener loaded");
         plm.registerEvents(new ComposterListener(this), this);
         debugMsg("Composter listener loaded");
         plm.registerEvents(new SpawnerDestroyListener(this), this);
         debugMsg("Spawner destroy listener loaded");
+        plm.registerEvents(new ShulkerKillListener(), this);
+        debugMsg("Shulker kill listener loaded");
+        plm.registerEvents(new EndTeleportListener(this), this);
+        debugMsg("End restriction listener loaded");
+        plm.registerEvents(new KahyProtectionListener(this), this);
+        debugMsg("Kahy protection listener loaded");
 
         debugMsg("Loaded " + manager.getKelpCacheManager().getCount() + " kelp regions");
 
@@ -116,5 +125,4 @@ public void debugMsg(String message) {
             getLogger().info("[Debug]: " + message);
         }
     }
-
 }

src/main/java/eu/quantumsociety/deltacraft/classes/CachePlayer.java

@@ -4,6 +4,7 @@
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
 
 import java.util.UUID;
 
@@ -12,20 +13,23 @@ public class CachePlayer {
     private Location originalLocation;
     private GameMode prevGameMode;
     private Player player;
+    private Vector originalVelocity;
+    private float fallDistance;
 
-    public CachePlayer(Player p, Location originalLocation, GameMode prevGameMode) {
+    public CachePlayer(Player p, Location originalLocation, GameMode prevGameMode, Vector originalVelocity, float fallDistance) {
         this.id = p.getUniqueId();
         this.originalLocation = originalLocation;
         this.prevGameMode = prevGameMode;
         this.player = p;
+        this.originalVelocity = originalVelocity;
+        this.fallDistance = fallDistance;
     }
 
-    public CachePlayer(UUID id, Location originalLocation, GameMode prevGameMode) {
-        this(Bukkit.getPlayer(id), originalLocation, prevGameMode);
+    public CachePlayer(UUID id, Location originalLocation, GameMode prevGameMode, Vector originalVelocity, float fallDistance) {
+        this(Bukkit.getPlayer(id), originalLocation, prevGameMode, originalVelocity, fallDistance);
     }
 
 
-
     public Location getOriginalLocation() {
         return this.originalLocation;
     }
@@ -38,5 +42,7 @@ public GameMode getPrevGameMode() {
         return this.prevGameMode;
     }
 
-    public Player getPlayer() { return player; }
+    public Player getPlayer() {
+        return player;
+    }
 }

src/main/java/eu/quantumsociety/deltacraft/commands/afk/AfkCommand.kt

@@ -12,7 +12,7 @@ class AfkCommand : CommandExecutor {
             return true;
         }
 
-        val player: Player = sender
+//        val player: Player = sender
 
         return true
     }

src/main/java/eu/quantumsociety/deltacraft/commands/home/HomeCommand.kt

@@ -2,6 +2,7 @@ package eu.quantumsociety.deltacraft.commands.home
 
 import eu.quantumsociety.deltacraft.DeltaCraft
 import eu.quantumsociety.deltacraft.managers.HomesManager
+import eu.quantumsociety.deltacraft.utils.Extensions
 import eu.quantumsociety.deltacraft.utils.TextHelper
 import eu.quantumsociety.deltacraft.utils.enums.Permissions
 import net.md_5.bungee.api.ChatColor
@@ -95,16 +96,18 @@ class HomeCommand(private val configManager: HomesManager) : CommandExecutor, Ta
                                     .append(TextHelper.infoText(" anyway.")).create()))
                             .create()))
 
-
             player.spigot().sendMessage(*text.create())
             return true;
         }
 
+        if (Extensions.isIdiot(player)) {
+            player.spigot().sendMessage(*TextHelper.attentionText("You cannot use home, because you're an idiot!"))
+            return true;
+        }
 
         player.teleport(homeLocation)
         player.sendMessage("Welcome home!")
 
-
         // Effects on teleport
         val world = player.location.world!!
 
@@ -141,5 +144,4 @@ class HomeCommand(private val configManager: HomesManager) : CommandExecutor, Ta
 
         return list
     }
-
 }

src/main/java/eu/quantumsociety/deltacraft/commands/other/KahyCommand.java

@@ -0,0 +1,66 @@
+package eu.quantumsociety.deltacraft.commands.other;
+
+import eu.quantumsociety.deltacraft.DeltaCraft;
+import eu.quantumsociety.deltacraft.utils.Extensions;
+import eu.quantumsociety.deltacraft.utils.TextHelper;
+import eu.quantumsociety.deltacraft.utils.enums.Permissions;
+import net.md_5.bungee.api.ChatColor;
+import org.bukkit.GameMode;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class KahyCommand implements CommandExecutor {
+    private final DeltaCraft plugin;
+
+    public KahyCommand(DeltaCraft plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Executes the given command, returning its success.
+     * <br>
+     * If false is returned, then the "usage" plugin.yml entry for this command
+     * (if defined) will be sent to the player.
+     *
+     * @param sender  Source of the command
+     * @param command Command which was executed
+     * @param label   Alias of the command which was used
+     * @param args    Passed command arguments
+     * @return true if a valid command, otherwise false
+     */
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        if (!(sender instanceof Player)) {
+            sender.sendMessage("Only players can use this commands");
+            return false;
+        }
+        Player p = (Player) sender;
+        if (!p.hasPermission(Permissions.KAHYUSE.getPath())) {
+            p.spigot().sendMessage(TextHelper.insufficientPermissions(Permissions.KAHYUSE));
+            return true;
+        }
+
+        if (p.getGameMode() != GameMode.SURVIVAL) {
+            p.spigot().sendMessage(TextHelper.attentionText("This command can be used only in survival mode"));
+            return true;
+        }
+
+        if (Extensions.isKahy(p)) {
+            p.spigot().sendMessage(TextHelper.attentionText("Kahy, you cannot use protection against yourself"));
+            return true;
+        }
+
+        if (Extensions.hasProtection(p)) {
+            p.removeMetadata(Extensions.kahyProtectionKey, plugin);
+            p.spigot().sendMessage(TextHelper.infoText("Kahy protection disabled"));
+            return true;
+        }
+
+        p.setMetadata(Extensions.kahyProtectionKey, Extensions.getFakeMetadata(plugin));
+        p.spigot().sendMessage(TextHelper.infoText("Kahy protection enabled", ChatColor.GREEN));
+        return true;
+    }
+}

src/main/java/eu/quantumsociety/deltacraft/commands/spectate/SpectateCommand.kt

@@ -4,6 +4,7 @@ import eu.quantumsociety.deltacraft.DeltaCraft
 import eu.quantumsociety.deltacraft.managers.SpectateManager
 import eu.quantumsociety.deltacraft.managers.cache.SpectateCacheManager
 import eu.quantumsociety.deltacraft.managers.cache.FakePlayerManager
+import eu.quantumsociety.deltacraft.utils.Extensions
 import eu.quantumsociety.deltacraft.utils.KeyHelper
 import eu.quantumsociety.deltacraft.utils.TextHelper
 import eu.quantumsociety.deltacraft.utils.enums.Permissions
@@ -14,6 +15,7 @@ import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
+import org.bukkit.util.Vector
 
 class SpectateCommand(private val configManager: SpectateManager, private val plugin: DeltaCraft, private val fakePlayerHelper: FakePlayerManager = FakePlayerManager(plugin)) : CommandExecutor {
     private val spectateCache: SpectateCacheManager
@@ -43,19 +45,25 @@ class SpectateCommand(private val configManager: SpectateManager, private val pl
     private fun switchBack(p: Player, keys: KeyHelper): Boolean {
         val l = configManager.getLocation(keys)
         val g = configManager.getGamemode(keys)
+        val vel = configManager.getVelocity(keys)
+        val fallDis = configManager.getFallDistance(keys)
         p.setPlayerListName(p.name)
 
         fakePlayerHelper.despawnFakePlayerToAll(p)
 
-        return switchBack(p, l, g)
+        return switchBack(p, l, g, vel, fallDis)
     }
 
-    private fun switchBack(p: Player, l: Location, gm: GameMode): Boolean {
+    private fun switchBack(p: Player, l: Location, gm: GameMode, velocity: Vector, fallDistance: Float): Boolean {
+        p.setMetadata(this.spectateCache.teleportBackKey, Extensions.getFakeMetadata(plugin))
+
         val id = p.uniqueId
         spectateCache.removeItem(id)
         configManager.delete(id)
         p.teleport(l)
         p.gameMode = gm
+        p.velocity = velocity
+        p.fallDistance = fallDistance
         p.sendMessage(ChatColor.YELLOW.toString() + "You are no longer Spectating!")
         return true
     }
@@ -65,9 +73,12 @@ class SpectateCommand(private val configManager: SpectateManager, private val pl
 
         val loc = p.location
         val gm = p.gameMode
-        configManager.save(keys, loc, gm)
-        spectateCache.addItem(p, loc, gm)
+        val vel = p.velocity
+        val dis = p.fallDistance
+        configManager.save(keys, loc, gm, vel, dis)
+        spectateCache.addItem(p, loc, gm, vel, dis)
         p.gameMode = GameMode.SPECTATOR
+
         p.spigot().sendMessage(*TextHelper.infoText("You are now Spectating!"))
         p.setPlayerListName("${p.name} (Spectating) ")
         return true

src/main/java/eu/quantumsociety/deltacraft/listeners/CampfireListener.kt

@@ -0,0 +1,86 @@
+package eu.quantumsociety.deltacraft.listeners
+
+import eu.quantumsociety.deltacraft.DeltaCraft
+import org.bukkit.Material
+import org.bukkit.block.Campfire
+import org.bukkit.block.Dispenser
+import org.bukkit.block.data.Directional
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.block.BlockDispenseEvent
+import org.bukkit.inventory.ItemStack
+
+class CampfireListener(private val plugin: DeltaCraft) : Listener {
+
+    @EventHandler(ignoreCancelled = true)
+    fun onBlockDispenseEvent(event: BlockDispenseEvent) {
+        val emitter = event.block
+        if (emitter.type != Material.DISPENSER) {
+            return
+        }
+
+        val emitterDirectional = emitter.blockData as Directional
+        val direction = emitterDirectional.facing.direction
+        val destination = emitter.location.clone()
+                .add(direction).block
+
+        if (destination.type != Material.CAMPFIRE &&
+                destination.type != Material.SOUL_CAMPFIRE) {
+            return
+        }
+
+        val item = event.item.clone()
+        val type = item.type
+        if (type != Material.BEEF &&
+                type != Material.CHICKEN &&
+                type != Material.RABBIT &&
+                type != Material.PORKCHOP &&
+                type != Material.MUTTON &&
+                type != Material.COD &&
+                type != Material.SALMON &&
+                type != Material.POTATO &&
+                type != Material.KELP) {
+            return
+        }
+
+        if (destination.state !is Campfire) {
+            return
+        }
+
+        val campfire = destination.state as Campfire
+        var position = -1
+        when {
+            campfire.getItem(0) == null -> {
+                position = 0
+            }
+            campfire.getItem(1) == null -> {
+                position = 1
+            }
+            campfire.getItem(2) == null -> {
+                position = 2
+            }
+            campfire.getItem(3) == null -> {
+                position = 3
+            }
+        }
+
+        if (position >= 0) {
+            item.amount = 1
+
+            campfire.setCookTime(position, 0)
+            campfire.setCookTimeTotal(position, 600)
+            campfire.setItem(position, item)
+            campfire.update()
+
+            event.isCancelled = true
+
+            plugin.server.scheduler.runTaskLater(plugin, Runnable {
+                val origState = event.block.state
+                if (origState is Dispenser) {
+                    val inv = origState.inventory;
+                    inv.removeItem(ItemStack(event.item.type, 1))
+                }
+            }, 2)
+        }
+    }
+}