From f3f8b1704f383226cab0fce0bbb2a83a6a930224 Mon Sep 17 00:00:00 2001 From: TimmyYue <77110709+TimmyYue@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:47:18 +0800 Subject: [PATCH 1/2] Create main.yml --- .github/workflows/main.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..e9a198a --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,26 @@ +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'zulu' + - name: Build with Maven + run: mvn clean package -DskipTests + + - name: Upload JAR file + uses: actions/upload-artifact@v2 + with: + name: ChatGPT-PowerNukkitx + path: target/*.jar From 2b67fdd123a6c77dee9aa9851b58ebbaa037c06b Mon Sep 17 00:00:00 2001 From: wood Date: Wed, 9 Apr 2025 22:57:19 +0800 Subject: [PATCH 2/2] remove buywarp command remove Teamstatus lang change lang color --- .github/workflows/main.yml | 26 ------- .idea/artifacts/SkyStarModify_jar.xml | 1 + .idea/workspace.xml | 67 +++++++++++------- .../java/org/skystarmodify/LangResource.java | 5 -- .../org/skystarmodify/commands/buywarp.java | 57 --------------- src/main/resources/config.yml | 1 - src/main/resources/lang/en.json | 17 +---- src/main/resources/lang/zh_tw.json | 19 ++--- target/classes/config.yml | 1 - target/classes/lang/en.json | 17 +---- target/classes/lang/zh_tw.json | 19 ++--- .../org/skystarmodify/LangResource$dict.class | Bin 1485 -> 1350 bytes .../org/skystarmodify/LangResource.class | Bin 2182 -> 2182 bytes .../org/skystarmodify/commands/buywarp.class | Bin 5347 -> 0 bytes target/classes/plugin.yml | 6 +- 15 files changed, 59 insertions(+), 177 deletions(-) delete mode 100644 .github/workflows/main.yml delete mode 100644 src/main/java/org/skystarmodify/commands/buywarp.java delete mode 100644 target/classes/org/skystarmodify/commands/buywarp.class diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index e9a198a..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,26 +0,0 @@ -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'zulu' - - name: Build with Maven - run: mvn clean package -DskipTests - - - name: Upload JAR file - uses: actions/upload-artifact@v2 - with: - name: ChatGPT-PowerNukkitx - path: target/*.jar 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 d6b385e75c4ec390437da123aa71c02589010b80..ce7e32afa726408f97ca736e2948f594d21aa5ac 100644 GIT binary patch delta 173 zcmX@heT<9i)W2Q(7#J9A7;GkTO^{|SD9TJuWn>WY$x19s)Xz!GOVd9V*rX80!cBT z3VG6Kac7_1o>0e7z% AbpQYW delta 316 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 dxb`=${SklW|9^9(ntPqtMKvY