Merge pull request #132 from Shock95/pm5

2.1.0

.poggit.yml

@@ -3,18 +3,4 @@ projects:
   AuctionHouse:
     path: ""
     icon: icon.png
-    libs:
-    - src: SOF3/await-generator/await-generator
-      version: ^3.1.0
-    - src: poggit/libasynql/libasynql
-      version: ^3.4.0
-    - src: muqsit/invmenu/InvMenu
-      version: ^4.4.1
-      branch: "4.0"
-    - src: ifera-mc/UpdateNotifier/UpdateNotifier
-      version: ^2.2.0
-      branch: API-4.0.0
-    - src: CortexPE/Commando/Commando
-      version: ^3.0.0
-      branch: PM4
 ...

README.md

@@ -4,7 +4,7 @@ Feature-packed AuctionHouse plugin for PocketMine-MP
 ## Overview  
 AuctionHouse allows players to list their items for sale and purchase items that others have listed for sale
 
-![AuctionHouse](https://github.com/Shock95x/AuctionHouse/blob/master/img/auctionhouse.png)  
+![AuctionHouse](https://github.com/Shock95/AuctionHouse/blob/master/img/auctionhouse.png)  
 ---  
 ## Features  
 >- Chest GUI  
@@ -22,7 +22,7 @@ AuctionHouse allows players to list their items for sale and purchase items that
 
 ---  
 ## Download  
-Download the plugin from [Poggit](https://poggit.pmmp.io/p/AuctionHouse) or [GitHub releases](https://github.com/Shock95x/AuctionHouse/releases)
+Download the plugin from [Poggit](https://poggit.pmmp.io/p/AuctionHouse) or [GitHub releases](https://github.com/Shock95/AuctionHouse/releases)
 
 ---  
 ## Config  
@@ -55,7 +55,7 @@ creative-sale: false
 max-listings: 45
 # Shows item lore on the auction house
 show-lore: true
-# Days to automatically delete expired listings (-1 to disable)
+# Days to automatically delete expired listings (0 to disable)
 expired-duration: 15
 # Formats price with commas (ex. 1,000,000)
 price-formatted: true
@@ -91,17 +91,20 @@ cancel_purchase: "minecraft:stained_glass_pane:14"
 ---  
 ## Commands  
 
-| Command        | Description           |  
-| ------------- |:--------------|  
-| /ah      | AuctionHouse main command, opens the shop menu if there are no specified parameters |  
-| /ah shop | Opens the shop menu    |  
-| /ah sell **[price]** | Allows player to list items in their hand on the auction house. **[price]** is the amount that the player is listing the item to sell for     |  
-| /ah listings | Shows all active listings of the player |  
-| /ah listings **[player]**| Shows all active listings of a specific player |  
-| /ah category | Opens category menu |  
-| /ah admin | Opens the AuctionHouse admin menu (OP Command) |  
-| /ah reload | Allows player to reload configuration files (OP command) |  
-| /ah about | Shows AuctionHouse version the server is running |  
+| Command                         | Description                                                                         |  
+|---------------------------------|:------------------------------------------------------------------------------------|  
+| /ah                             | AuctionHouse main command, opens the shop menu if there are no specified parameters |  
+| /ah shop                        | Opens the shop menu                                                                 |  
+| /ah sell **[price]**            | Allows player to sell an item on the auction house                                  |  
+| /ah listings                    | Shows all active listings of the player                                             |  
+| /ah listings **[player]**       | Allows player to see active listings of a specific player                           |  
+| /ah category                    | Allows player to open the category menu                                             |  
+| /ah admin                       | Allows player to open the admin menu (OP Command)                                   |  
+| /ah admin relistall             | Allows player to relist all items in the auction house (OP Command)                 |  
+| /ah admin returnall             | Allows player to return all items in the auction house back to players (OP Command) |  
+| /ah admin listings **[player]** | Allows player to see all listings of a specific player (OP Command)                 |  
+| /ah reload                      | Allows player to reload config files (OP command)                                   |  
+| /ah about                       | Shows plugin version                                                                |  
 ---  
 ## API  
 ### Events  
@@ -114,19 +117,17 @@ cancel_purchase: "minecraft:stained_glass_pane:14"
 | [shock95x\auctionhouse\event\MenuCloseEvent](https://github.com/Shock95x/AuctionHouse/blob/master/src/shock95x/auctionhouse/event/MenuCloseEvent.php) | Called when a menu is closed by player |  
 
 ## Contributing  
-You can contribute to this project by creating or modifying a language file and opening a PR!  
-### Contributors 
-- [Shock95x](https://github.com/Shock95x) (English)  
-- [ipad54](https://github.com/ipad54) (Russian)
-- [No4NaMe](https://github.com/No4NaMe) (Russian)
-- [Unickorn](https://github.com/Unickorn) (German)
-- Chaosfelix4451#0157 (German)
+You can contribute to this project by creating or modifying a language file and opening a PR!
+### Contributors
+- [Shock95](https://github.com/Shock95) (English)
+- [ipad54](https://github.com/ipad54), [No4NaMe](https://github.com/No4NaMe), [XackiGiFF](https://github.com/XackiGiFF) (Russian)
+- [Unickorn](https://github.com/Unickorn), Chaosfelix4451 (German)
 - [xAliTura01](https://github.com/xAliTura01) (Turkish)
 - [NotEnriko](https://github.com/NotEnriko) (Indonesian)
-
-## Credits / Virions Used
+- 
+## Virions Used
 - [InvMenu](https://github.com/Muqsit/InvMenu) (Muqsit)  
 - [libasynql](https://github.com/poggit/libasynql) (SOFe)
 - [await-generator](https://github.com/SOF3/await-generator) (SOFe)
-- [Commando](https://github.com/CortexPE/Commando) (CortexPE)
+- [Commando](https://github.com/Paroxity/Commando) (CortexPE + Paroxity)
 - [UpdateNotifier](https://github.com/ifera-mc/UpdateNotifier) (Ifera)

composer.json

@@ -1,20 +1,53 @@
 {
-	"name": "shock95x/auctionhouse",
+	"name": "shock95/auctionhouse",
 	"description": "Feature-packed AuctionHouse plugin for PocketMine-MP",
-	"type": "project",
+	"type": "pocketmine-plugin",
 	"license": "GPL-3.0-or-later",
 	"authors": [
 		{
-			"name": "Shock95x"
+			"name": "Shock95"
 		}
 	],
 	"require": {
-		"pocketmine/pocketmine-mp": "^4.0",
-		"ext-json": "*"
+		"pocketmine/pocketmine-mp": "^5.0.0",
+		"sof3/await-generator": "^3.6",
+		"sof3/libasynql": "dev-master",
+		"muqsit/invmenu": "^4.6.5",
+		"ifera-mc/update-notifier": "dev-master",
+		"muqsit/simple-packet-handler": "dev-pm5",
+		"cortexpe/commando": "3.1.0"
 	},
-	"autoload": {
-		"psr-4": {
-			"": "./src"
+	"require-dev": {
+		"sof3/pharynx": "^0.3.4"
+	},
+	"repositories": [
+		{
+			"type": "package",
+			"package": {
+				"name": "cortexpe/commando",
+				"version": "3.1.0",
+				"source": {
+					"url": "https://github.com/Paroxity/Commando.git",
+					"type": "git",
+					"reference": "8473a5030c7e9bed6f7a25533a797361898ab47e"
+				},
+				"autoload": {
+					"classmap": ["src"]
+				},
+				"extra": {
+					"virion": {
+						"spec": "3.0",
+						"namespace-root": "CortexPE\\Commando"
+					}
+				}
+			}
+		},
+		{
+			"type": "git",
+			"url": "https://github.com/ifera-mc/UpdateNotifier.git"
 		}
+	],
+	"autoload": {
+		"classmap": ["src"]
 	}
 }

plugin.yml

@@ -1,14 +1,20 @@
 name: AuctionHouse
 main: shock95x\auctionhouse\AuctionHouse
-version: 2.0.2
-api: 4.0.0
-author: Shock95x
+version: 2.1.0
+api: 5.0.0
+author: "Shock95"
 softdepend: [BedrockEconomy]
 virions: ["InvMenu", "libasynql", "await-generator", "UpdateNotifier", "Commando"]
 permissions:
+    auctionhouse.command:
+        default: true
+        description: Allows player to use AuctionHouse command
+    auctionhouse.command.about:
+        default: true
+        description: Allows player to shows plugin information
     auctionhouse.command.shop:
         default: true
-        description: Allows player to open the shop menu
+        description: Allows player to shows AH shop menu
     auctionhouse.command.sell:
         default: true
         description: Allows player to list an item

resources/config.yml

@@ -22,7 +22,7 @@ creative-sale: false
 max-listings: 45
 # Shows item lore on the auction house
 show-lore: true
-# Days to automatically delete expired listings (-1 to disable)
+# Days to automatically delete expired listings (0 to disable)
 expired-duration: 15
 # Formats price with commas (ex. 1,000,000)
 price-formatted: true

resources/language/de_DE.yml

@@ -116,9 +116,7 @@ status-active: "&aAktiv"
 status-expired: "&cAbgelaufen"
 selected-listing-name: "&l&cAngebot verwalten"
 
-duplicate-item: "&aKlickt hier um eine Kopie des Items in deinen Inventar zu erhalten"
-# listing-expired: "&eClick here to make listing &cexpired"
-# listing-active: "&eClick here to make listing &aactive"
+copy-item: "&aKlickt hier um eine Kopie des Items in deinen Inventar zu erhalten"
 delete-item: "&cKlickt hier um das Angebot und das Item zu löschen"
 
 # Pagination items

resources/language/en_US.yml

@@ -20,7 +20,7 @@ cancelled-item: "&eYou have &6cancelled &ean auction. Return cancelled and expir
 cancelled-purchase: "&cYou have cancelled this purchase"    #{PLAYER}, {ITEM}, {PRICE}, {AMOUNT}
 purchased-item: "&2You have bought &d{ITEM} &r&d(x{AMOUNT}) &2for &d{PRICE}"    #{PLAYER}, {ITEM}, {PRICE}, {AMOUNT}
 seller-message: "&e{PLAYER} &bpurchased {ITEM} (x{AMOUNT}) from you for &d{PRICE}!"    #{ITEM}, {AMOUNT}
-returned-item: "&2You have removed &d{ITEM} &r&d(x{AMOUNT}) &2from the auction house." 
+returned-item: "&d{ITEM} &r&d(x{AMOUNT}) &2has been removed from the auction house"
 
 # Error messages
 in-creative: "&cYou cannot sell items while in creative mode."
@@ -119,16 +119,13 @@ status-active: "&aActive"
 status-expired: "&cExpired"
 selected-listing-name: "&l&eManage Listing"
 
-#duplicate-item: "&aClick here to duplicate item to inventory"
-#listing-expired: "&eClick here to make listing &cexpired"
-#listing-active: "&eClick here to make listing &aactive"
-#delete-item: "&cClick here to delete item and listing"
+copy-item: "&bCopy item"
+return-item: "&6Return item"
+delete-item: "&cDelete item"
 
-duplicate-item: "&aAdd item to inventory"
-listing-status:
-    - "Status: {STATUS}"
-    - "&6Change listing status"
-delete-item: "&cDelete listing and item"
+relist-all: "&aRelist all items"
+return-all: "&6Return all items"
+delete-all: "&cDelete all items"
 
 # Pagination items
 previous-page:

resources/language/id_ID.yml

@@ -119,15 +119,7 @@ status-active: "&aAktif"
 status-expired: "&cExpire"
 selected-listing-name: "&l&eAtur barang"
 
-#duplicate-item: "&aKlik disini untuk mengduplikat barang ke inventory kamu"
-#listing-expired: "&eKlik disini untuk membuat barang &cexpire"
-#listing-active: "&eKlik disini untuk membuat barang &aaktif"
-#delete-item: "&cClick here to delete item and listing"
-
-duplicate-item: "&aKasih barang ke inventory kamu"
-listing-status:
-    - "Status: {STATUS}"
-    - "&6Ubah status barang"
+copy-item: "&aKasih barang ke inventory kamu"
 delete-item: "&cBuang Barang dan Item"
 
 # Pagination items

resources/language/ru_RU.yml

@@ -6,10 +6,10 @@ menu-name: '&l&6Аукцион'
 listings-menu-name: '&6Товары на продаже'
 expired-menu-name: '&6Отменённые / истёкшие предметы'
 purchase-menu-name: 'Подтвердите покупку'
-# admin-menu-name: "&l&cAdmin Menu"
-# category-menu-name: "&l&6Category Menu"
-# manage-listing-name: "&l&eManage Listing"
-# player-listing: "&2{player}'s &6Listings"
+admin-menu-name: "&l&cАдмин Меню"
+category-menu-name: "&l&6Категории"
+manage-listing-name: "&l&eУправление витриной"
+player-listing: "&2Витрина товаров &e{player}"
 
 # Chat messages
 item-listed: '&2Вы выставили &d{ITEM} &r&d(x{AMOUNT}) &2 на продажу за &d{PRICE}. &eВведите /ah listings &dчтобы просмотреть все ваши товары'
@@ -22,20 +22,20 @@ returned-item: '&2Вы успешно сняли &d{ITEM} &r&d(x{AMOUNT}) &2 с
 # Error messages
 in-creative: '&cВы не можете продавать предметы в творческом режиме.'
 max-listings: '&cВы не можете иметь более {MAX} активных товаров.' #{MAX}
-invalid-price: '&cНеккоректная цена.'
+invalid-price: '&cНекорректная цена.'
 not-enough-space: 'Недостаточно места в инвентаре'
 self-purchase: '&cВы не можете купить свои предметы на аукционе!'
 no-item: '&cВы должны держать предмет в руке!'
 cannot-afford: '&6У вас недостаточно денег, чтобы купить этот предмет.'
 item-blacklisted: '&cЭтот предмет не может быть выставлен на аукцион!'
 invalid-balance: '&cУ вас недостаточно денег, чтобы выставить предмет на аукцион.'
 listing-gone: '&cЭтого товара больше не существует, вероятно его уже купили.'
-# price-range: "&cInvalid price range"                                                                         #{MIN}, {MAX}
-# in-cooldown: "&cYou are currently in cooldown, please wait &b{M} minute(s) &cand &b{S} second(s)&c."               #{M}, {S}
-# in-cooldown: "&cYou are currently in cooldown, please wait &b{M} minute(s) &cand &b{S} second(s)&c."               #{M}, {S}
-# player-not-found: "&cThis player has no active listings."
-# player-listings-usage: "&cView your listings with /ah listings"
-# inventory-full: "&cYour inventory is full, remove some items to claim your listings."
+price-range: "&cНедопустимый диапазон цен"                                                                         #{MIN}, {MAX}
+in-cooldown: "&cВ данный момент вы находитесь в режиме восстановления, пожалуйста, подождите &b{M} минут(ы) &cи &b{S} секудн(ы)&c."               #{M}, {S}
+player-not-found: "&cУ этого игрока нет активных продаж."
+player-listings-usage: "&cПросмотр ваших активных продаж: /ah listings"
+inventory-full: "&cВаш инвентарь переполнен, удалите некоторые товары, чтобы снять товар с витрины."
+purchase-economy-error: "&cНе удалось завершить транзакцию."
 
 # Items in the menu UI
 listed-item:
@@ -66,6 +66,14 @@ view-listed-items:
         - '&aв данный момент продаете на аукционе.'
         - ''
         - '&9Продажа: &e{SELLING}'
+expired-item:
+    # {PRICE} = Price of listing
+    - "&7-------------------------"
+    - "&aНажмите здесь, чтобы получить товар."
+    - ""
+    - ""
+    - "&9Цена: &e{PRICE}"
+    - "&7-------------------------"
 view-expired-items:
     # {EXPIRED} = Количество истекших аукционов
     name: '&6Забрать просроченные / удалённые предметы'
@@ -108,9 +116,7 @@ status-active: '&aАктивное'
 status-expired: '&cИстёкшие'
 selected-listing-name: '&l&cУправление товаром'
 
-duplicate-item: '&aНажмите, чтобы скопировать предмет в инвентарь'
-listing-expired: '&eНажмите, чтобы сделать товар &cистёкшим'
-listing-active: '&eНажмите, чтобы сделать товар &aактивным'
+copy-item: '&aДобавить предмет в инвентарь'
 delete-item: '&cНажмите, чтобы удалить товар с аукциона'
 
 # Pagination items
@@ -133,7 +139,7 @@ sell-description:
 main-description:
     name: '&6Что это за страница?'
     lore:
-        - '&aЭто аукционный, здесь можно'
+        - '&aЭто аукционный дом, здесь можно'
         - '&aпродавать и покупать предметы'
         - ''
         - '&aАукцион также отличный способ заработать'

resources/language/tr_TR.yml

@@ -118,9 +118,7 @@ status-active: "&aAktif"
 status-expired: "&cSüresi Dolmuş"
 selected-listing-name: "&l&cListeyi Yönet"
 
-duplicate-item: "&aÖğeyi envantere kopyala"
-listing-expired: "&eListelemenin &csüresinin dolmasını&e sağla"
-listing-active: "&eListelemenin &aaktif etmesini&e sağla"
+copy-item: "&aÖğeyi envantere kopyala"
 delete-item: "&cÖğeyi ve listeyi sil"
 
 # Pagination items