diff --git a/.idea/artifacts/SkyStarModify_jar.xml b/.idea/artifacts/SkyStarModify_jar.xml index 62e5417..2d58432 100644 --- a/.idea/artifacts/SkyStarModify_jar.xml +++ b/.idea/artifacts/SkyStarModify_jar.xml @@ -8,6 +8,7 @@ + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d27fa0a..198603b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,34 +10,21 @@ - - - - - - - - - - - + + - - - - - - - + + + + + + + + - - - - + + - - - + + + + + + + + + + + + + + { + "lastFilter": { + "state": "OPEN", + "assignee": "TimmyYue" + } +} + { + "selectedUrlAndAccountId": { + "url": "https://github.com/TimmyYue/SkyStarModify.git", + "accountId": "378da9bb-1f3d-4fcd-a96f-6097f4608d17" + } +} { "customColor": "", "associatedIndex": 1 @@ -68,11 +80,12 @@ "JAR Application.Spigot Debug.executor": "Debug", "Maven.SkyStarModify [package].executor": "Run", "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.git.unshallow": "true", "SHARE_PROJECT_CONFIGURATION_FILES": "true", "git-widget-placeholder": "main", "kotlin-language-version-configured": "true", - "last_opened_file_path": "/home/codingbear/SkyStarTest/plugins", - "project.structure.last.edited": "Project", + "last_opened_file_path": "/Users/hsutimmy/IdeaProjects/SkyStarModify", + "project.structure.last.edited": "Artifacts", "project.structure.proportion": "0.23828125", "project.structure.side.proportion": "0.2567325", "settings.editor.selected.configurable": "editor.preferences.fonts.default" diff --git a/src/main/java/org/skystarmodify/LangResource.java b/src/main/java/org/skystarmodify/LangResource.java index de4a002..0f90570 100644 --- a/src/main/java/org/skystarmodify/LangResource.java +++ b/src/main/java/org/skystarmodify/LangResource.java @@ -9,12 +9,7 @@ public class LangResource { public class dict { - public String wrapName; public String price; - public String warpAlreadyExist; - public String warpMoneyNotEnough; - public String warpCreateSuccessfully; - public String warpUnknownError; public String error; public String skShopHeader; public String skShopDetails; diff --git a/src/main/java/org/skystarmodify/commands/buywarp.java b/src/main/java/org/skystarmodify/commands/buywarp.java deleted file mode 100644 index 421c9be..0000000 --- a/src/main/java/org/skystarmodify/commands/buywarp.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.skystarmodify.commands; - -import com.earth2me.essentials.Essentials; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Warps; -import dev.jorel.commandapi.CommandAPICommand; -import dev.jorel.commandapi.CommandPermission; -import dev.jorel.commandapi.arguments.GreedyStringArgument; -import net.ess3.api.MaxMoneyException; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.skystarmodify.LangResource; -import org.skystarmodify.SkyStarModify; - -import java.math.BigDecimal; - -public class buywarp { - private LangResource lang; - public buywarp(){ - SkyStarModify ssm = (SkyStarModify) Bukkit.getServer().getPluginManager().getPlugin("SkyStarModify"); - this.lang = ssm.langRes; - - Essentials ess = (Essentials) Bukkit.getServer().getPluginManager().getPlugin("Essentials"); - Warps warps = ess.getWarps(); - String cmdName = this.getClass().getName(); - new CommandAPICommand("buywarp") - .withArguments(new GreedyStringArgument(lang.lang.wrapName)) - .withPermission(CommandPermission.NONE) - .executes((sender, args) -> { - String warpName = (String)args.get(0); - if (warps.isWarp(warpName)){ - sender.sendMessage(lang.lang.warpAlreadyExist); - return; - } - User essSender = ess.getUser((Player)sender); - BigDecimal playerMoney = essSender.getMoney(); - BigDecimal warpPrice = BigDecimal.valueOf((int)(ssm.config.get("warpPrice"))); - if (playerMoney.compareTo(warpPrice) < 0){ - sender.sendMessage(lang.lang.warpMoneyNotEnough); - return; - } - try { - if (warpName.contains(" ")){ - throw new Exception("awa"); - } - warps.setWarp(warpName,((Player)sender).getLocation()); - ess.getUser((Player)sender).setMoney(playerMoney.subtract(warpPrice)); - sender.sendMessage(lang.lang.warpCreateSuccessfully.replaceAll("%warpName%",warpName)); - } - catch (MaxMoneyException ignored) {} - catch (Exception e) { - sender.sendMessage(lang.lang.warpUnknownError); - } - }) - .register(); - } -} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 08c58f2..fe5235a 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,2 +1 @@ lang: zh_tw -warpPrice: 10 \ No newline at end of file diff --git a/src/main/resources/lang/en.json b/src/main/resources/lang/en.json index 6660852..e2b0942 100644 --- a/src/main/resources/lang/en.json +++ b/src/main/resources/lang/en.json @@ -1,5 +1,4 @@ { - "wrapName": "Wrap name", "price": "Price", "item": "Item", "amount": "Amount", @@ -7,19 +6,13 @@ "total": "Total", "singlePrice": "Price per item", - "warpAlreadyExist": "§bWarp §3Helper §f§l⋙ §cThere is a warp with same name exist！", - "warpMoneyNotEnough": "§bWarp §3Helper §f§l⋙ §cYour money is not enough to buy a warp！", - "warpCreateSuccessfully": "§bWarp §3Helper §f§l⋙ §aWarp §e%warpName% §acreated successfully！", - "warpUnknownError": "§bWarp §3Helper §f§l⋙ §cFailed to create warp because unknown error.", - - "error": "§4Error", "buy": "Shop selling", "sell": "Player selling", - "skShopHeader": "§c============§6【SkyStarShop】§c============", + "skShopHeader": "§e===========§6【SkyStarShop】§e===========", "skShopDetails": "§7Details : ", "skShopMessageType": "§7Message Type : ", - "skShopActionType": "§7Action Type : ", + "skShopActionType": "§7Action Type : §b", "skShopSinglePrice": "§7Price per item : §e", "skShopTotal": "§7Total : §e", "skShopUpstore": "§eUpstore", @@ -38,9 +31,5 @@ "skShopCmdArgError": "Command argument error", "skShopDiscordTitle": "Sky Star Shop", "skShopDiscordContent": "Player %player_name% visited Sky Star Shop.", - "skShopDiscordFooter": "Tech support by @codingbear", - "skPlayerOnlineTimeSystemTitle" : "Player Online Time Report System", - "skYesterdayPlayersOnlineTimeData" : "Players' online time report yesterday :", - "skTeam": "Team", - "skTime": "Online time(second)" + "skShopDiscordFooter": "Tech support by @codingbear" } \ No newline at end of file diff --git a/src/main/resources/lang/zh_tw.json b/src/main/resources/lang/zh_tw.json index f16a518..94e395e 100644 --- a/src/main/resources/lang/zh_tw.json +++ b/src/main/resources/lang/zh_tw.json @@ -1,5 +1,4 @@ { - "wrapName": "地標名稱", "price": "商品價格", "item": "商店商品", "amount": "交易數量", @@ -7,28 +6,22 @@ "total": "交易總價", "singlePrice": "商品單價", - "warpAlreadyExist": "§b地標§3小幫手 §f§l⋙ §c同名稱的地標已經存在！", - "warpMoneyNotEnough": "§b地標§3小幫手 §f§l⋙ §c你的金錢不足以設立一個地標！", - "warpCreateSuccessfully": "§b地標§3小幫手 §f§l⋙ §a地標§e%warpName%§a已成功創立！", - "warpUnknownError": "§b地標§3小幫手 §f§l⋙ §c由於未知的錯誤，導致地標無法成功建立。", - - "error": "§4錯誤", "buy": "商城出售", "sell": "玩家出售", - "skShopHeader": "§c============§6【天星商城】§c============", + "skShopHeader": "§e===========§6【天星商城】§e===========", "skShopDetails": "§7詳細訊息 : ", "skShopMessageType": "§7訊息類別 : ", "skShopActionType": "§7觸發行為 : ", "skShopSinglePrice": "§7商品單價 : §e", "skShopTotal": "§7商品總價 : §e", "skShopAmount": "§7商品總數 : §e", - "skShopBal": "§7所有財產 : §e", + "skShopBal": "§7遊戲幣餘額 : §e", "skShopUpstore": "§e上架", "skUpstoreFsError": "無法建立商品檔案", "skShopSinglePriceError": "商品價格必須大於0", "skShopItemName": "§7商品名稱 : ", - "skShopTradeType": "§7交易類別 : ", + "skShopTradeType": "§7交易類別 : §b", "skShopItemFsError": "你要求的交易項目檔案出現問題，請聯絡伺服器服主或插件師", "skShopItemDNEError": "你要求的交易項目不存在", "skShopMoneyNotEnoughError": "你的金錢不足以購買你選定的商品", @@ -38,9 +31,5 @@ "skShopCmdArgError": "指令參數錯誤", "skShopDiscordTitle": "天星官方商城", "skShopDiscordContent": "玩家 %player_name% 光顧了天星商城。", - "skShopDiscordFooter": "由 南極熊@codingbear 提供技術支援", - "skPlayerOnlineTimeSystemTitle" : "玩家上線時間統計報表系統", - "skYesterdayPlayersOnlineTimeData" : "昨天的報表:", - "skTeam": "公會", - "skTime": "上線時間(秒)" + "skShopDiscordFooter": "由 南極熊@codingbear 提供技術支援" } \ No newline at end of file diff --git a/target/classes/config.yml b/target/classes/config.yml index 08c58f2..fe5235a 100644 --- a/target/classes/config.yml +++ b/target/classes/config.yml @@ -1,2 +1 @@ lang: zh_tw -warpPrice: 10 \ No newline at end of file diff --git a/target/classes/lang/en.json b/target/classes/lang/en.json index 6660852..e2b0942 100644 --- a/target/classes/lang/en.json +++ b/target/classes/lang/en.json @@ -1,5 +1,4 @@ { - "wrapName": "Wrap name", "price": "Price", "item": "Item", "amount": "Amount", @@ -7,19 +6,13 @@ "total": "Total", "singlePrice": "Price per item", - "warpAlreadyExist": "§bWarp §3Helper §f§l⋙ §cThere is a warp with same name exist！", - "warpMoneyNotEnough": "§bWarp §3Helper §f§l⋙ §cYour money is not enough to buy a warp！", - "warpCreateSuccessfully": "§bWarp §3Helper §f§l⋙ §aWarp §e%warpName% §acreated successfully！", - "warpUnknownError": "§bWarp §3Helper §f§l⋙ §cFailed to create warp because unknown error.", - - "error": "§4Error", "buy": "Shop selling", "sell": "Player selling", - "skShopHeader": "§c============§6【SkyStarShop】§c============", + "skShopHeader": "§e===========§6【SkyStarShop】§e===========", "skShopDetails": "§7Details : ", "skShopMessageType": "§7Message Type : ", - "skShopActionType": "§7Action Type : ", + "skShopActionType": "§7Action Type : §b", "skShopSinglePrice": "§7Price per item : §e", "skShopTotal": "§7Total : §e", "skShopUpstore": "§eUpstore", @@ -38,9 +31,5 @@ "skShopCmdArgError": "Command argument error", "skShopDiscordTitle": "Sky Star Shop", "skShopDiscordContent": "Player %player_name% visited Sky Star Shop.", - "skShopDiscordFooter": "Tech support by @codingbear", - "skPlayerOnlineTimeSystemTitle" : "Player Online Time Report System", - "skYesterdayPlayersOnlineTimeData" : "Players' online time report yesterday :", - "skTeam": "Team", - "skTime": "Online time(second)" + "skShopDiscordFooter": "Tech support by @codingbear" } \ No newline at end of file diff --git a/target/classes/lang/zh_tw.json b/target/classes/lang/zh_tw.json index f16a518..94e395e 100644 --- a/target/classes/lang/zh_tw.json +++ b/target/classes/lang/zh_tw.json @@ -1,5 +1,4 @@ { - "wrapName": "地標名稱", "price": "商品價格", "item": "商店商品", "amount": "交易數量", @@ -7,28 +6,22 @@ "total": "交易總價", "singlePrice": "商品單價", - "warpAlreadyExist": "§b地標§3小幫手 §f§l⋙ §c同名稱的地標已經存在！", - "warpMoneyNotEnough": "§b地標§3小幫手 §f§l⋙ §c你的金錢不足以設立一個地標！", - "warpCreateSuccessfully": "§b地標§3小幫手 §f§l⋙ §a地標§e%warpName%§a已成功創立！", - "warpUnknownError": "§b地標§3小幫手 §f§l⋙ §c由於未知的錯誤，導致地標無法成功建立。", - - "error": "§4錯誤", "buy": "商城出售", "sell": "玩家出售", - "skShopHeader": "§c============§6【天星商城】§c============", + "skShopHeader": "§e===========§6【天星商城】§e===========", "skShopDetails": "§7詳細訊息 : ", "skShopMessageType": "§7訊息類別 : ", "skShopActionType": "§7觸發行為 : ", "skShopSinglePrice": "§7商品單價 : §e", "skShopTotal": "§7商品總價 : §e", "skShopAmount": "§7商品總數 : §e", - "skShopBal": "§7所有財產 : §e", + "skShopBal": "§7遊戲幣餘額 : §e", "skShopUpstore": "§e上架", "skUpstoreFsError": "無法建立商品檔案", "skShopSinglePriceError": "商品價格必須大於0", "skShopItemName": "§7商品名稱 : ", - "skShopTradeType": "§7交易類別 : ", + "skShopTradeType": "§7交易類別 : §b", "skShopItemFsError": "你要求的交易項目檔案出現問題，請聯絡伺服器服主或插件師", "skShopItemDNEError": "你要求的交易項目不存在", "skShopMoneyNotEnoughError": "你的金錢不足以購買你選定的商品", @@ -38,9 +31,5 @@ "skShopCmdArgError": "指令參數錯誤", "skShopDiscordTitle": "天星官方商城", "skShopDiscordContent": "玩家 %player_name% 光顧了天星商城。", - "skShopDiscordFooter": "由 南極熊@codingbear 提供技術支援", - "skPlayerOnlineTimeSystemTitle" : "玩家上線時間統計報表系統", - "skYesterdayPlayersOnlineTimeData" : "昨天的報表:", - "skTeam": "公會", - "skTime": "上線時間(秒)" + "skShopDiscordFooter": "由 南極熊@codingbear 提供技術支援" } \ No newline at end of file diff --git a/target/classes/org/skystarmodify/LangResource$dict.class b/target/classes/org/skystarmodify/LangResource$dict.class index d6b385e..ce7e32a 100644 Binary files a/target/classes/org/skystarmodify/LangResource$dict.class and b/target/classes/org/skystarmodify/LangResource$dict.class differ diff --git a/target/classes/org/skystarmodify/LangResource.class b/target/classes/org/skystarmodify/LangResource.class index 1438f16..9e5bb04 100644 Binary files a/target/classes/org/skystarmodify/LangResource.class and b/target/classes/org/skystarmodify/LangResource.class differ diff --git a/target/classes/org/skystarmodify/commands/buywarp.class b/target/classes/org/skystarmodify/commands/buywarp.class deleted file mode 100644 index a73903c..0000000 Binary files a/target/classes/org/skystarmodify/commands/buywarp.class and /dev/null differ diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index 5653ee9..5fee645 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,9 +1,11 @@ name: SkyStarModify version: '0.2.3' main: org.skystarmodify.SkyStarModify -api-version: '1.20' +api-version: '1.21' depend: - CommandAPI - Essentials - NBTAPI - - DiscordSRV \ No newline at end of file + - DiscordSRV + - PlaceholderAPI + - TaiwanifyEveryItem \ No newline at end of file