Merge branch 'development'

# Conflicts:
#	resources/Languages/es_ES.yml

.changlogs.md

@@ -187,3 +187,19 @@ End of theSpawn PM3 support
  - all methods to set warps, homes, hubs and spawns are now supporting `yaw` and `pitch` as `float` and **some methods got breaking API changes**!!
 - *[TRANSLATIONS]* - [@MrBlasyMSK](https://github.com/MrBlasyMSK) added a new translation: Spanish ([#34](https://github.com/supercrafter333/theSpawn/pull/34))
 - *[VERSION]* - bumped to the 2nd development version
+
+### Changelog v1.7.0 » v1.8.0
+> This version does contain some code changes from the previous version. It's a feature update.
+- *[NEW]* - added warp editing ([#35](https://github.com/supercrafter333/theSpawn/issues/35))
+ - added new command: `/editwarp` - edit a warp
+- *[NEW]* - added home editing ([#38](https://github.com/supercrafter333/theSpawn/issues/38))
+ - added new command: `/edithome` - edit a home
+- *[NEW]* - added new command: `/back` - Teleports you to the position where you have died ([#43](https://github.com/supercrafter333/theSpawn/issues/43))
+ - added config tags: `use-back-command` [true | false] ; `back-time` [int/number (in minutes)]
+- *[NEW]* - added hub teleport on death ([#39](https://github.com/supercrafter333/theSpawn/issues/39))
+ - added config tag: `hub-teleport-on-death` [true | false]
+- *[NEW]* - **BETA-feature:** added position-checks (default: false)
+ - added `theSpawn::isPositionSafe(Position|Location $position): bool` to check if a position is safe
+ - > This is a beta-feature, it can contain bugs.
+- *[NEW]* - added a [**website for theSpawn**](https://supercrafter333.github.io/theSpawn/)
+- *[VERSION]* - bumped to 1.8.0

.poggit.yml

@@ -9,4 +9,5 @@ projects:
  path: ""
  php: 8.0
  libs:
- - src: https://poggit.pmmp.io/ci/CLADevs/FormAPI-4.0/libFormAPI
+ - src: "https://poggit.pmmp.io/ci/supercrafter333/FormAPI/libFormAPI"
+ version: ^2.1

README.md

@@ -1,30 +1,38 @@
 [![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/ca6cWPpERp)
-# theSpawn - V1.7.0 [![](https://poggit.pmmp.io/shield.state/theSpawn)](https://poggit.pmmp.io/p/theSpawn) [![](https://poggit.pmmp.io/shield.dl.total/theSpawn)](https://poggit.pmmp.io/p/theSpawn)
+# <a href="https://supercrafter333.github.io/theSpawn/"><img src="https://github.com/supercrafter333/theSpawn/blob/master/icon.png?raw=true" width="26" float="left" style="border-radius: 0.3rem"></a> theSpawn - v1.8.0 [![](https://poggit.pmmp.io/shield.state/theSpawn)](https://poggit.pmmp.io/p/theSpawn) [![](https://poggit.pmmp.io/shield.dl.total/theSpawn)](https://poggit.pmmp.io/p/theSpawn)
+✨ **The best teleportation plugin and the best MSpawns alternative!** ✨
+
+<br />
 
 **This plugin is a much better MSpawns alternative! Help me to make this plugin better!**
 
-This plugin is not out of date and will get better developed from time to time. If you need an much better MSpawns alternative, theSpawn is the alternative :)
+This plugin won't be out of date, it will get better developed from time to time. If you need a much better MSpawns alternative, theSpawn is it :)
 
 ### Features
-- All MSpawns features:
- - set/change/remove Spawns
- - set/change/remove Lobbyspawn
+- **All MSpawns features**:
+ - set/change/remove spawns
+ - set/change/remove hub
  - Teleport to spawn/hub
  - Aliases [default: active]
- - use/dont' use hub server
+ - use/don't use hub server
  - API
  - Custom Messages
  - Config
+- **Position validation/check** [default: inactive]
+- **Homes** [default: active]
+ - home editing
+ - Max home count permission [default: inactive]
+- **Warps** [default: active]
+ - warp editing
+ - warp permissions
+ - warp icons
+- **TPAs** [default: active]
+- **Random-Hubs** [default: inactive]
+- **`/back`-command** - Teleports you to the position where you have died [default: active]
 - waterdog teleport to hub server support
-- Homes [default: active]
-- Warps [default: active]
-- TPAs [default: active]
-- Random-Hubs [default: inactive]
-- Teleport to hub on Join [default: active]
-- Multiple languages [default: English (BE)] 
-- Warp permissions
-- Warp icons
-- Max home count permission [default: inactive]
+- Teleport to hub on join [default: active]
+- Teleport to hub on death [default: active]
+- Multiple languages [default: English (BE)]
 - Forms
 
 ### TODOs
@@ -34,36 +42,43 @@ This plugin is not out of date and will get better developed from time to time.
 - [X] Random-Hubs ([#12](https://github.com/supercrafter333/theSpawn/issues/12))
 - [X] TPAs ([#14](https://github.com/supercrafter333/theSpawn/issues/14))
 - [X] Warp icons ([#31](https://github.com/supercrafter333/theSpawn/issues/31))
+- [X] Warp editing ([#35](https://github.com/supercrafter333/theSpawn/issues/35))
+- [X] Home editing ([#38](https://github.com/supercrafter333/theSpawn/issues/38))
+- [X] `/back`-command ([#43](https://github.com/supercrafter333/theSpawn/issues/43))
+- [X] Hub teleport on death ([#39](https://github.com/supercrafter333/theSpawn/issues/39))
 
 ### Report Bug
 You've found a Bug?
 - Go to [Issues](https://github.com/supercrafter333/theSpawn/issues)
 - Click on [New Issue](https://github.com/supercrafter333/theSpawn/issues/new/choose)
 - Write your bug with all Informations that you have down
 - Send Issue
-- Wait, I where answer you
+- Now wait, I'll awnser you soon
 
 ### Commands
-|**Command**|**Description**|
-|-----------|---------------|
-|`/setspawn`|Set the spawn of a world|
-|`/delspawn`|Remove spawn of a world|
-|`/spawn`|Teleport you to spawn|
-|`/sethub [randomHubs: number/int]`|Set the hub of the server|
-|`/delhub [randomHubs: number/int]`|Remove the hub of the server|
-|`/hub`|Teleport you to hub|
-|`/setalias <alias> <world>`|Set an alias|
-|`/delalias <alias>`|Remove an alias|
-|`/sethome <home>`|Set a home|
-|`/delhome <home>`|Remove a home|
-|`/home <home>`|Teleport you to a home|
-|`/setwarp <warp>`|Set a warp|
-|`/delwarp <warp>`|Remove a warp|
-|`/warp <warp>`|Teleport you to a warp|
-|`/tpa <player>`|Send a teleportation awnser to a player|
-|`/tpahere <player>`|Send a teleportation awnser to a player|
-|`/tpaccept <player>`|Accept a tpa|
-|`/tpdecline <player>`|Decline a tpa|
+| **Command** | **Description** |
+|------------------------------------|---------------------------------------------------|
+| `/setspawn` | Set the spawn of a world |
+| `/delspawn` | Remove spawn of a world |
+| `/spawn` | Teleport you to spawn |
+| `/sethub [randomHubs: number/int]` | Set the hub of the server |
+| `/delhub [randomHubs: number/int]` | Remove the hub of the server |
+| `/hub` | Teleport you to hub |
+| `/setalias <alias> <world>` | Set an alias |
+| `/delalias <alias>` | Remove an alias |
+| `/sethome <home>` | Set a home |
+| `/delhome <home>` | Remove a home |
+| `/home <home>` | Teleport you to a home |
+| `/setwarp <warp>` | Set a warp |
+| `/delwarp <warp>` | Remove a warp |
+| `/warp <warp>` | Teleport you to a warp |
+| `/tpa <player>` | Send a teleportation awnser to a player |
+| `/tpahere <player>` | Send a teleportation awnser to a player |
+| `/tpaccept <player>` | Accept a tpa |
+| `/tpdecline <player>` | Decline a tpa |
+| `/editwarp [warp]` | Edit a warp |
+| `/edithome [home]` | Edit a home |
+| `/back` | Teleports you to the position where you have died |
 
 ### License:
 This Plugin has the [Apache License 2.0](/LICENSE)! Plugin by supercrafter333!
@@ -73,8 +88,12 @@ This Plugin has the [Apache License 2.0](/LICENSE)! Plugin by supercrafter333!
 
 Owner: supercrafter333
 
-Helper: AyzrixYTB, MrBlasyMSK
+Translator: AyzrixYTB, MrBlasyMSK
 
 Icon: HannesTheDev [Thank you]
 
-Discord-Tag: `supercrafter333#4062`
+Discord-Tag: [`supercrafter333#4062`](https://discordapp.com/users/511252471616897024)
+
+
+### Join the community
+[![Discord Banner](https://discordapp.com/api/guilds/847099444465238036/widget.png?style=banner3)](https://discord.gg/ca6cWPpERp)

plugin.yml

@@ -1,5 +1,5 @@
 name: theSpawn
-version: 1.7.0
+version: 1.8.0
 api: 4.0.0
 main: supercrafter333\theSpawn\theSpawn
 author: supercrafter333
@@ -29,8 +29,12 @@ permissions:
  default: true
  theSpawn.home.cmd:
  default: true
+ theSpawn.edithome.cmd:
+ default: true
  theSpawn.warp.cmd:
  default: true
+ theSpawn.editwarp.cmd:
+ default: op
  theSpawn.tpa.cmd:
  default: true
  theSpawn.tpahere.cmd:
@@ -44,4 +48,6 @@ permissions:
  theSpawn.homes:
  default: op
  theSpawn.homes.unlimited:
- default: op
+ default: op
+ theSpawn.back.cmd:
+ default: true

resources/Languages/en_BE.yml

@@ -15,6 +15,10 @@ spawn-changed: "§aYou've successfully §7changed §athe spawn for this world! 
 hub-set: "§aYou've successfully §7set§a the hub to world §b{world}§a!"
 hub-changed: "§aYou've successfully §7changed§a the hub to world §b{world}§a!"
 
+#/back command messages
+no-deathposition-found: "§cCannot found your last death position."
+teleported-to-deathposition: "§aYou was successfully teleported to your last death position. §7[§b{X}; {Y}; {Z}; {world}§7]"
+
 #remove messages
 #uses: none
 spawn-removed: "§aYou've successfully removed the spawn of this world!"
@@ -76,6 +80,9 @@ tpa-ended: "The TpaInfo from {source} to {target} is ended now."
 delay-tip: "§8[§eYou where teleported in §7{secs}§e!§8]"
 delay-stopped-by-move: "§cTeleport cancelled because you've moved you."
 
+#position checks
+position-not-safe: "§cThe target position isn't safe. Teleport was cancelled."
+
 #forms
 # warps
 form-warp-menu-title: "Warps"
@@ -91,6 +98,43 @@ form-setWarp-menu-inputIconPathDescription: "Icon-path of the new warp (optional
 form-rmWarp-menu-title: "Delete a warp"
 form-rmWarp-menu-content: "Here you can delete a warp."
 form-rmWarp-menu-warpButton: "§b{warp}§r{line}§7click to delete"
+# editwarp
+##### (choose warp)
+form-chooseEditWarp-menu-title: "Edit a warp"
+form-chooseEditWarp-menu-content: "Please choose a warp to edit."
+form-chooseEditWarp-menu-warpButton: "§b{warp}§r{line}§7click to edit"
+##### (choose action)
+form-editWarp-menu-title: "Edit a warp"
+form-editWarp-menu-content: "§bWarp: §7{warp}{line}§bPosition: §7X={X}; Y={Y}; Z={Z}; World={world}{line}§bPermission: §7{permission}{line}§bIcon: §7{icon}"
+form-editWarp-menu-button-editName: "Edit name"
+form-editWarp-menu-button-editPosition: "Set new position/location here"
+form-editWarp-menu-button-rmPermission: "Remove permission"
+form-editWarp-menu-button-addPermission: "Add permission"
+form-editWarp-menu-button-editIcon: "Edit icon"
+form-editWarp-menu-button-rmIcon: "Remove icon"
+form-editWarp-menu-button-addIcon: "Add icon"
+##### (edit name)
+form-editWarp-editName-title: "Edit a warp"
+form-editWarp-editName-content: "Here you can edit the name of the warp {warp}."
+form-editWarp-editName-inputNameDescription: "Warp-name"
+##### (edit icon-path)
+form-editWarp-editIcon-title: "Edit a warp"
+form-editWarp-editIcon-content: "Here you can add/edit a icon for the warp."
+form-editWarp-editIcon-inputNameDescription: "Icon-path"
+# edit home
+##### (choose home)
+form-chooseEditHome-menu-title: "Edit a home"
+form-chooseEditHome-menu-content: "Please choose a home that you would like to edit."
+form-chooseEditHome-menu-homeButton: "§b{home}§r{line}§7click to edit"
+##### (choose action)
+form-editHome-menu-title: "Edit a home"
+form-editHome-menu-content: "§bHome: §7{home}{line}§bPosition: §7X={X}; Y={Y}; Z={Z}; World={world}"
+form-editHome-menu-editNameButton: "Edit name"
+form-editHome-menu-editPositionButton: "Set new position/location here"
+##### (edit name)
+form-editHome-editName-title: "Edit a home"
+form-editHome-editName-content: "Here you can edit the name of the home {home}."
+form-editHome-editName-inputNameDescription: "Home-name"
 # homes
 form-home-menu-title: "Homes"
 form-home-menu-content: "Please select a home."
@@ -128,7 +172,7 @@ no-spawn-set-for-world: "§cThere's no spawn set for world {world}!"
 
 
 
-#compatible with v1.7.0 (and lower)
+#compatible with v1.8.0(and lower)
 
 
 ############################

resources/Languages/es_ES.yml

@@ -128,7 +128,7 @@ no-spawn-set-for-world: "§cNo hay ningún spawn establecido para el mundo {worl
 
 
 
-#compatible con v1.7.0-dev (y versiones anteriores)
+#compatible con v1.7.1-dev (y versiones anteriores)
 
 
 ############################

resources/Languages/ger_DE.yml

@@ -15,6 +15,10 @@ spawn-changed: "§aDu hast erfolgreich einen §7neuen §aSpawn für diese Welt f
 hub-set: "§aDu hast erfolgreich den Spawn der Lobby für die Welt §b{world} §7gesetzt§a!"
 hub-changed: "§aDu hast erfolgreich einen §7neuen §aSpawn der Lobby für die Welt §b{world}§a festgelegt!"
 
+#/back command messages
+no-deathposition-found: "§cLetzte Todesposition konnte nicht gefunden werden."
+teleported-to-deathposition: "§aDu wurdest erfolgreich zu deiner letzten Todesposition teleportiert. §7[§b{X}; {Y}; {Z}; {world}§7]"
+
 #remove messages
 #uses: none
 spawn-removed: "§aDu hast erfolgreich den Spawn dieser Welt entfernt!"
@@ -91,6 +95,43 @@ form-setWarp-menu-inputIconPathDescription: "Icon-Pfad des neuen Warps (optional
 form-rmWarp-menu-title: "Lösche einen Warp"
 form-rmWarp-menu-content: "Hier kannst du einen Warp löschen."
 form-rmWarp-menu-warpButton: "§b{warp}§r{line}§7Klicke zum Löschen"
+# editwarp
+##### (choose warp)
+form-chooseEditWarp-menu-title: "Edit a warp"
+form-chooseEditWarp-menu-content: "Please choose a warp to edit."
+form-chooseEditWarp-menu-warpButton: "§b{warp}§r{line}§7click to edit"
+##### (choose action)
+form-editWarp-menu-title: "Bearbeite einen Warp"
+form-editWarp-menu-content: "§bWarp: §7{warp}{line}§bPosition: §7X={X}; Y={Y}; Z={Z}; Welt={world}{line}§bBerechtigung: §7{permission}{line}§bIcon: §7{icon}"
+form-editWarp-menu-button-editName: "Name bearbeiten"
+form-editWarp-menu-button-editPosition: "Neue Position hier setzen"
+form-editWarp-menu-button-rmPermission: "Berechtigung entfernen"
+form-editWarp-menu-button-addPermission: "Berechtigung hinzufügen"
+form-editWarp-menu-button-editIcon: "Icon bearbeiten"
+form-editWarp-menu-button-rmIcon: "Icon entfernen"
+form-editWarp-menu-button-addIcon: "Icon hinzufügen"
+##### (edit name)
+form-editWarp-editName-title: "Bearbeite einen Warp"
+form-editWarp-editName-content: "Hier kannst du den Namen des Warp's {warp} bearbeiten."
+form-editWarp-editName-inputNameDescription: "Warp-Name"
+##### (edit icon-path)
+form-editWarp-editIcon-title: "Bearbeite einen Warp"
+form-editWarp-editIcon-content: "Hier kannst du das Icon für den Warp hinzufügen/bearbeiten."
+form-editWarp-editIcon-inputNameDescription: "Icon-Pfad"
+# edit home
+##### (choose home)
+form-chooseEditHome-menu-title: "Bearbeite ein Home"
+form-chooseEditHome-menu-content: "Bitte wähle eine Home aus, welches du bearbeiten möchtest."
+form-chooseEditHome-menu-homeButton: "§b{home}§r{line}§7Klicke zum bearbeiten"
+##### (choose action)
+form-editHome-menu-title: "Bearbeite ein Home"
+form-editHome-menu-content: "§bHome: §7{home}{line}§bPosition: §7X={X}; Y={Y}; Z={Z}; World={world}"
+form-editHome-menu-editNameButton: "Name bearbeiten"
+form-editHome-menu-editPositionButton: "Neue Position hier setzen"
+##### (edit name)
+form-editHome-editName-title: "Bearbeite ein Home"
+form-editHome-editName-content: "Hier kannst du den Namen des Homes {home} ändern."
+form-editHome-editName-inputNameDescription: "Home-Name"
 # homes
 form-home-menu-title: "Homes"
 form-home-menu-content: "Bitte wähle ein Home aus."
@@ -128,7 +169,7 @@ no-spawn-set-for-world: "§cEs wurde noch kein Spawn für die Welt {world} festg
 
 
 
-#compatible with v1.7.0 (and lower)
+#compatible with v1.8.0(and lower)
 
 
 ############################