From c568365b4dd1b702493a07830398b56262db5bcf Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Tue, 29 Mar 2022 22:09:39 +0800 Subject: [PATCH 01/25] fix wrong update link --- src/main/java/org/maxgamer/quickshop/watcher/UpdateWatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/maxgamer/quickshop/watcher/UpdateWatcher.java b/src/main/java/org/maxgamer/quickshop/watcher/UpdateWatcher.java index 13054f8a11..26a26356f5 100644 --- a/src/main/java/org/maxgamer/quickshop/watcher/UpdateWatcher.java +++ b/src/main/java/org/maxgamer/quickshop/watcher/UpdateWatcher.java @@ -113,7 +113,7 @@ public void init() { player.sendMessage(ChatColor.GREEN + "---------------------------------------------------"); player.sendMessage(ChatColor.GREEN + notify); player.sendMessage(ChatColor.GREEN + "Type command " + ChatColor.YELLOW + "/qs update" + ChatColor.GREEN + " or click the link below to update QuickShop :)"); - player.sendMessage(ChatColor.AQUA + " https://ci.codemc.io/job/Ghost-chu/job/QuickShop-Reremake-SNAPSHOT"); + player.sendMessage(ChatColor.AQUA + "https://ci.codemc.io/job/PotatoCraft-Studio/job/QuickShop-Reremake-SNAPSHOT"); player.sendMessage(ChatColor.GREEN + "---------------------------------------------------"); } } From 4aa440fb3d6d59d116a094c5ed186023cb26dcd3 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Tue, 29 Mar 2022 22:11:17 +0800 Subject: [PATCH 02/25] update link --- .../java/org/maxgamer/quickshop/watcher/UpdateWatcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/maxgamer/quickshop/watcher/UpdateWatcher.java b/src/main/java/org/maxgamer/quickshop/watcher/UpdateWatcher.java index 26a26356f5..d23190fd12 100644 --- a/src/main/java/org/maxgamer/quickshop/watcher/UpdateWatcher.java +++ b/src/main/java/org/maxgamer/quickshop/watcher/UpdateWatcher.java @@ -92,7 +92,7 @@ public void init() { "A new version of QuickShop snapshot has been released! [" + updater.getRemoteServerVersion() + "]"); QuickShop.getInstance() .getLogger() - .info("Update here: https://ci.codemc.io/job/Ghost-chu/job/QuickShop-Reremake-SNAPSHOT"); + .info("Update here: https://ci.codemc.io/job/PotatoCraft-Studio/job/QuickShop-Reremake-SNAPSHOT"); for (Player player : Bukkit.getOnlinePlayers()) { if (QuickShop.getPermissionManager() @@ -113,7 +113,7 @@ public void init() { player.sendMessage(ChatColor.GREEN + "---------------------------------------------------"); player.sendMessage(ChatColor.GREEN + notify); player.sendMessage(ChatColor.GREEN + "Type command " + ChatColor.YELLOW + "/qs update" + ChatColor.GREEN + " or click the link below to update QuickShop :)"); - player.sendMessage(ChatColor.AQUA + "https://ci.codemc.io/job/PotatoCraft-Studio/job/QuickShop-Reremake-SNAPSHOT"); + player.sendMessage(ChatColor.AQUA + " https://ci.codemc.io/job/PotatoCraft-Studio/job/QuickShop-Reremake-SNAPSHOT"); player.sendMessage(ChatColor.GREEN + "---------------------------------------------------"); } } From dd24df48a648905f3a2568f517c00865528ceacf Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Thu, 31 Mar 2022 22:10:00 +0800 Subject: [PATCH 03/25] update link --- .github/ISSUE_TEMPLATE/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 74a56f8d0a..d1c2b9e8ed 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,7 +4,7 @@ contact_links: about: |- Bleeding-edge builds with the latest features and bug fixes. DEV-BUILDS MAY CAUSE DAMAGE TO YOUR SERVER! MAKE BACKUPS FIRST! - url: 'https://ci.codemc.io/job/Ghost-chu/job/QuickShop-Reremake-SNAPSHOT/' + url: 'https://ci.codemc.io/job/PotatoCraft-Studio/job/QuickShop-Reremake-SNAPSHOT/' - name: 'Feature Requests' about: 'Use our discussions page to request changes towards QuickShop.' url: 'https://github.com/PotatoCraft-Studio/QuickShop-Reremake/discussions/categories/ideas' From 7f93bcfd1c4dcfb4d3307ccb59bbd2980562348f Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Mon, 13 Feb 2023 00:59:06 +0800 Subject: [PATCH 04/25] Update MCBBS Link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8492f01c6..3a71827944 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ from [KaiKikuchi's QuickShop upstream repository](https://github.com/KaiKikuchi/ ## Downloads -| | | | +| | | | | :---: | :---: | :---: | :---: | | **Spigot** | **BukkitDev** | **MCBBS** | **Jenkins** | From ab04742e162178490e27c323ad7e341107a1057a Mon Sep 17 00:00:00 2001 From: KASUNHapangama <88395585+KASUNHapangama@users.noreply.github.com> Date: Thu, 20 Apr 2023 09:27:22 +0530 Subject: [PATCH 05/25] Update EnvironmentChecker.java Removed Security Check --- .../util/envcheck/EnvironmentChecker.java | 63 ------------------- 1 file changed, 63 deletions(-) diff --git a/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java b/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java index 2341b91767..e76b8ee5d3 100644 --- a/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java +++ b/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java @@ -28,14 +28,11 @@ import org.maxgamer.quickshop.api.shop.DisplayType; import org.maxgamer.quickshop.shop.VirtualDisplayItem; import org.maxgamer.quickshop.util.GameVersion; -import org.maxgamer.quickshop.util.JsonUtil; import org.maxgamer.quickshop.util.MsgUtil; import org.maxgamer.quickshop.util.ReflectFactory; import org.maxgamer.quickshop.util.Util; -import org.maxgamer.quickshop.util.security.JarVerifyTool; import java.io.IOException; -import java.io.InputStream; import java.lang.reflect.Method; import java.net.URLDecoder; import java.util.ArrayList; @@ -46,8 +43,6 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; import java.util.logging.Level; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -192,64 +187,6 @@ public boolean isOutdatedJvm() { } } - @SneakyThrows - @EnvCheckEntry(name = "Signature Verify", priority = 0, stage = {EnvCheckEntry.Stage.ON_LOAD, EnvCheckEntry.Stage.ON_ENABLE}) - public ResultContainer securityVerify() { - JarVerifyTool tool = new JarVerifyTool(); - JarFile jarFile = null; - try { - ClassLoader loader = this.getClass().getClassLoader(); - try (InputStream stream1 = loader.getResourceAsStream("META-INF/MANIFEST.MF"); - InputStream stream2 = loader.getResourceAsStream("META-INF/SELFSIGN.DSA"); - InputStream stream3 = loader.getResourceAsStream("META-INF/SELFSIGN.SF")) { - if (stream1 == null || stream2 == null || stream3 == null) { - if(stream1 == null){ - this.reportMaker.signatureFileMissing("META-INF/MANIFEST.MF"); - } - if(stream2 == null){ - this.reportMaker.signatureFileMissing("META-INF/SELFSIGN.DSA"); - } - if(stream3 == null){ - this.reportMaker.signatureFileMissing("META-INF/SELFSIGN.SF"); - } - plugin.getLogger().warning("The signature could not be found! The QuickShop jar has been modified or you're running a custom build."); - return new ResultContainer(CheckResult.KILL_SERVER, "Security risk detected, QuickShop jar has been modified."); - } - } - String jarPath = this.getClass().getProtectionDomain().getCodeSource().getLocation().getFile(); - jarPath = URLDecoder.decode(jarPath, "UTF-8"); - Util.debugLog("JarPath selected: " + jarPath); - jarFile = new JarFile(jarPath); - List modifiedEntry = tool.verify(jarFile); - if (modifiedEntry.isEmpty()) { - return new ResultContainer(CheckResult.PASSED, "The jar is valid. No issues detected."); - } else { - modifiedEntry.forEach(jarEntry -> { - this.reportMaker.signatureVerifyFail(jarEntry); - plugin.getLogger().warning(">> Modified Class Detected <<"); - plugin.getLogger().warning("Name: " + jarEntry.getName()); - plugin.getLogger().warning("CRC: " + jarEntry.getCrc()); - plugin.getLogger().warning(JsonUtil.getGson().toJson(jarEntry)); - }); - plugin.getLogger().severe("QuickShop detected that the jar has been modified! This is usually caused by the file being corrupted or virus infected."); - plugin.getLogger().severe("To prevent severe server failure, QuickShop has been disabled."); - plugin.getLogger().severe("For further information, Please join our support Discord server: https://discord.com/invite/bfefw2E."); - return new ResultContainer(CheckResult.KILL_SERVER, "Security risk detected, QuickShop jar has been modified."); - } - } catch (Exception ioException) { - plugin.getLogger().log(Level.WARNING, "ALERT: QuickShop cannot validate itself. This may be caused by you having deleted QuickShop's jar while the server is running.", ioException); - return new ResultContainer(CheckResult.KILL_SERVER, "Failed to validate digital signature! Security may be compromised!"); - } finally { - if (jarFile != null) { - try { - jarFile.close(); - } catch (IOException ignored) { - } - } - } - } - - @EnvCheckEntry(name = "Plugin Manifest Check", priority = 1, stage = {EnvCheckEntry.Stage.ON_LOAD, EnvCheckEntry.Stage.ON_ENABLE}) public ResultContainer manifestCheck() { String mainClass = plugin.getDescription().getMain(); From 076205e50260c26a47c6e31f842e7d928f3fc937 Mon Sep 17 00:00:00 2001 From: KASUNHapangama <88395585+KASUNHapangama@users.noreply.github.com> Date: Thu, 20 Apr 2023 09:32:43 +0530 Subject: [PATCH 06/25] Update EnvironmentChecker.java --- .../util/envcheck/EnvironmentChecker.java | 44 ------------------- 1 file changed, 44 deletions(-) diff --git a/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java b/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java index e76b8ee5d3..8d69eb4fe4 100644 --- a/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java +++ b/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java @@ -187,50 +187,6 @@ public boolean isOutdatedJvm() { } } - @EnvCheckEntry(name = "Plugin Manifest Check", priority = 1, stage = {EnvCheckEntry.Stage.ON_LOAD, EnvCheckEntry.Stage.ON_ENABLE}) - public ResultContainer manifestCheck() { - String mainClass = plugin.getDescription().getMain(); - if(!mainClass.equals("org.maxgamer.quickshop.QuickShop")){ - this.reportMaker.manifestModified(plugin.getDescription()); - plugin.getLogger().warning("ALERT: Detected main class has been modified!"); - plugin.getLogger().warning("Should be: org.maxgamer.quickshop.QuickShop"); - plugin.getLogger().warning("Actually: "+mainClass); - return new ResultContainer(CheckResult.KILL_SERVER, "Failed to validate main class! Security may be compromised!"); - - } - return new ResultContainer(CheckResult.PASSED, "Check passed."); - } - - @EnvCheckEntry(name = "Potential Infection Characteristics Check", priority = 1, stage = {EnvCheckEntry.Stage.ON_LOAD, EnvCheckEntry.Stage.ON_ENABLE}) - public ResultContainer potentialCheck() { - String jarPath = this.getClass().getProtectionDomain().getCodeSource().getLocation().getFile(); - try { - jarPath = URLDecoder.decode(jarPath, "UTF-8"); - Util.debugLog("JarPath selected: " + jarPath); - ZipFile zipFile = new ZipFile(jarPath); - Enumeration zipEntryEnumeration = zipFile.entries(); - boolean found = false; - while(zipEntryEnumeration.hasMoreElements()){ - ZipEntry entry = zipEntryEnumeration.nextElement(); - if(entry.getName().startsWith("javassist") || entry.getName().startsWith(".")){ - found = true; - this.reportMaker.potentialInfected(entry); - plugin.getLogger().log(Level.WARNING, "Potential Infection Detected:"); - plugin.getLogger().log(Level.WARNING, "File: "+entry.getName()); - plugin.getLogger().log(Level.WARNING, "CRC: "+entry.getCrc()); - plugin.getLogger().log(Level.WARNING, "Time: "+entry.getTime()); - } - } - if(found){ - plugin.getLogger().log(Level.WARNING, "ALERT: QuickShop detected Potential Infection, this jar may already infected by malware, stop the server and create full server backup immediately, run virus scan and contact the QuickShop support if you need!"); - return new ResultContainer(CheckResult.KILL_SERVER, "Potential Infection detected, Killing server process..."); - } - } catch (IOException e) { - plugin.getLogger().log(Level.WARNING, "ALERT: QuickShop cannot validate itself. This may be caused by you having deleted QuickShop's jar while the server is running.", e); - return new ResultContainer(CheckResult.KILL_SERVER, "Failed to validate files in jar! Security may be compromised!"); - } - return new ResultContainer(CheckResult.PASSED, "Check passed."); - } @SneakyThrows From c72c6e8196a77f50d7e6ce4417d8e9d9d33b81c9 Mon Sep 17 00:00:00 2001 From: KASUNHapangama <88395585+KASUNHapangama@users.noreply.github.com> Date: Fri, 21 Apr 2023 10:25:38 +0530 Subject: [PATCH 07/25] Update README.md --- README.md | 103 ++---------------------------------------------------- 1 file changed, 2 insertions(+), 101 deletions(-) diff --git a/README.md b/README.md index 3a71827944..daa282e8c3 100644 --- a/README.md +++ b/README.md @@ -1,102 +1,3 @@ -# QuickShop-Reremake +If Your Plugin Disabled itself Bc of a Malware and You dont have anything else to do you can use this version of quickshop plugin witch doesnt have malware cheker -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/e33e2fafe3ac4d4eb9048d154bbd874e)](https://www.codacy.com/gh/PotatoCraft-Studio/QuickShop-Reremake/dashboard?utm_source=github.com&utm_medium=referral&utm_content=PotatoCraft-Studio/QuickShop-Reremake&utm_campaign=Badge_Grade) -[![CodeFactor](https://www.codefactor.io/repository/github/potatocraft-studio/quickshop-reremake/badge)](https://www.codefactor.io/repository/github/potatocraft-studio/quickshop-reremake) -![BuildStatus](https://ci.codemc.io/job/PotatoCraft-Studio/job/QuickShop-Reremake/21/badge/icon) -![TestsPassed](https://img.shields.io/jenkins/tests?compact_message&jobUrl=https://ci.codemc.io/job/PotatoCraft-Studio/job/QuickShop-Reremake) -![Contributors](https://img.shields.io/github/contributors/potatocraft-studio/QuickShop-Reremake) -[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FPotatoCraft-Studio%2FQuickShop-Reremake.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FPotatoCraft-Studio%2FQuickShop-Reremake?ref=badge_shield) ---- - -![Java](https://img.shields.io/badge/java-version%208%2B%20(currently%20is%208--16)-orange) -![MC](https://img.shields.io/badge/minecraft-java%20edition%201.15%2B-blueviolet) -![Ver](https://img.shields.io/spiget/version/62575?label=version) -![Downloads](https://img.shields.io/spiget/downloads/62575?label=downloads) -![Rating](https://img.shields.io/spiget/rating/62575?label=rating) ---- - -QuickShop is a **FREE** shop plugin that allows players to easily sell/buy any items from a chest without any commands. In fact, -none of the commands that QuickShop provides are ever needed by a player. QuickShop-Reremake is a **FREE** fork of QuickShop -NotLikeMe with more features, bug fixes and other improvements. -QuickShop-Reremake is made by PotatoCraft Studio -from [KaiKikuchi's QuickShop upstream repository](https://github.com/KaiKikuchi/QuickShop). - -## Support - -| | | -| :---: | :---: | -| [**Discord**](https://discord.gg/bfefw2E) | [**Github Issues**](https://github.com/PotatoCraft-Studio/QuickShop-Reremake/issues) | - -## Features - -- Easy to use -- Toggleable Display Item on top of the chest -- NBT Data, Enchantment, Tool Damage, Potion, and Mob Egg support -- Unlimited chest support -- Blacklist support & bypass permissions -- Shops that buy and sell items at the same time (Using double chests) -- Customisable permission checks -- UUID support -- Better shop protection [Reremake] -- Item display name i18n [Reremake] -- Enchantment display name i18n [Reremake] -- A cool item preview [Reremake] -- World/region protection plugins support [Reremake] -- ProtocolLib based Virtual DisplayItem support [Reremake] -- Powerful API [Reremake] -- Optimized performance [Reremake] - -## Downloads - -| | | | - | :---: | :---: | :---: | :---: | -| **Spigot** | **BukkitDev** | **MCBBS** | **Jenkins** | - -## Contribute - -If you're a developer, you can contribute to the QuickShop code! Just make a fork and install the Lombok plugin, -then make a pull request when you're done! Please try to -follow [Google Java Style](https://google.github.io/styleguide/javaguide.html). Also do not increase the plugin version -number. Thank you very much! - -To compile the QuickShop and debug it by yourself, please follow these steps: - -0. Make sure you're using Java16 JDK in your PATH. -1. Compile main-project without signature by using debug profile: `mvn install -Pdebug` -2. Start your server with extra flag to skip the QuickShop signature - checks: `-Dorg.maxgamer.quickshop.util.envcheck.skip.SIGNATURE_VERIFY` - -## Maven - -```XML - - - quickshop-repo - https://repo.codemc.io/repository/maven-public/ - - - -org.maxgamer -QuickShop -{VERSION} -provided - -``` - -## Bstats - -[![BigImage](https://bstats.org/signatures/bukkit/QuickShop-Reremake.svg)](https://bstats.org/plugin/bukkit/QuickShop-Reremake/3320) - -## License - -[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FPotatoCraft-Studio%2FQuickShop-Reremake.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FPotatoCraft-Studio%2FQuickShop-Reremake?ref=badge_large) - -## Developer API - -```java -Plugin plugin = Bukkit.getPluginManager().getPlugin("QuickShop"); -if(plugin != null){ - QuickShopAPI api = (QuickShopAPI)plugin; - api.xxxx; -} -``` +I highly suggest trying your best at removing the malware first From 6fa0abd125b5e780ed09fa1c307e3e9eff1eaed2 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sat, 5 Aug 2023 00:47:26 +0800 Subject: [PATCH 08/25] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index daa282e8c3..c312cb845c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1 @@ -If Your Plugin Disabled itself Bc of a Malware and You dont have anything else to do you can use this version of quickshop plugin witch doesnt have malware cheker - -I highly suggest trying your best at removing the malware first +## QuickShopReremake-NoMalware-Checker From 4a6eb4937f398432393e26c85a33c9aa4f68bd87 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sat, 5 Aug 2023 10:23:27 +0800 Subject: [PATCH 09/25] =?UTF-8?q?[ci=20skip]Rename=20sync-crowdinota.yml?= =?UTF-8?q?=20to=20=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync-crowdinota.yml => ".github/workflows/\343\200\202" | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/sync-crowdinota.yml => ".github/workflows/\343\200\202" (100%) diff --git a/.github/workflows/sync-crowdinota.yml "b/.github/workflows/\343\200\202" similarity index 100% rename from .github/workflows/sync-crowdinota.yml rename to ".github/workflows/\343\200\202" From 8ad64296365dffd4487d2ea42c9bce6248af397d Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sat, 5 Aug 2023 10:24:15 +0800 Subject: [PATCH 10/25] [ci skip]Rename crowdin.yml to 1 --- .github/workflows/{crowdin.yml => 1} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{crowdin.yml => 1} (100%) diff --git a/.github/workflows/crowdin.yml b/.github/workflows/1 similarity index 100% rename from .github/workflows/crowdin.yml rename to .github/workflows/1 From 287921331bcb7adf506b710d751e1601db7bb613 Mon Sep 17 00:00:00 2001 From: galacticwarrior9 Date: Sun, 18 Feb 2024 21:22:36 +0000 Subject: [PATCH 11/25] Add 1.20.3 and 1.20.4 support --- pom.xml | 2 +- .../java/org/maxgamer/quickshop/economy/Trader.java | 12 ++++++++++++ .../org/maxgamer/quickshop/util/GameVersion.java | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91e4b02630..e8de68e6d7 100644 --- a/pom.xml +++ b/pom.xml @@ -627,7 +627,7 @@ org.spigotmc spigot-api - 1.20.2-R0.1-SNAPSHOT + 1.20.4-R0.1-SNAPSHOT provided diff --git a/src/main/java/org/maxgamer/quickshop/economy/Trader.java b/src/main/java/org/maxgamer/quickshop/economy/Trader.java index ceb328bbd8..91131fa88a 100644 --- a/src/main/java/org/maxgamer/quickshop/economy/Trader.java +++ b/src/main/java/org/maxgamer/quickshop/economy/Trader.java @@ -245,4 +245,16 @@ public boolean isOp() { public void setOp(boolean value) { offlinePlayer.setOp(value); } + + @Nullable + @Override + public Location getLocation() { + return offlinePlayer.getLocation(); + } + + @Nullable + @Override + public Location getRespawnLocation() { + return offlinePlayer.getRespawnLocation(); + } } diff --git a/src/main/java/org/maxgamer/quickshop/util/GameVersion.java b/src/main/java/org/maxgamer/quickshop/util/GameVersion.java index 958348c0e8..06932c15d2 100644 --- a/src/main/java/org/maxgamer/quickshop/util/GameVersion.java +++ b/src/main/java/org/maxgamer/quickshop/util/GameVersion.java @@ -68,6 +68,7 @@ public enum GameVersion { v1_19_R3(true, false, true, true, true, true), v1_20_R1(true, false, true, true, true, true), v1_20_R2(true, false, true, true, true, true), + v1_20_R3(true, false, true, true, true, true), UNKNOWN(true, false, false, true, true, true); /** From be6087144244a0d13b30f20dcb9531f438d0e8b7 Mon Sep 17 00:00:00 2001 From: galacticwarrior9 Date: Sun, 24 Mar 2024 11:32:17 +0000 Subject: [PATCH 12/25] Fix https://github.com/PotatoCraft-Studio/QuickShop-Reremake/issues/455 It appears that the reset colour is invalid in 1.20.4. --- src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java | 2 +- src/main/java/org/maxgamer/quickshop/util/Util.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java b/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java index 0cb4a15c84..ac3a6488c8 100644 --- a/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java +++ b/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java @@ -100,7 +100,7 @@ public class ContainerShop implements Shop { @EqualsAndHashCode.Exclude @Deprecated - private static final String SHOP_SIGN_PREFIX = "§d§o §r"; + private static final String SHOP_SIGN_PREFIX = "§d§o §0"; @NotNull private final Location location; private final YamlConfiguration extra; diff --git a/src/main/java/org/maxgamer/quickshop/util/Util.java b/src/main/java/org/maxgamer/quickshop/util/Util.java index 5281c3ec17..321a6e5ee5 100644 --- a/src/main/java/org/maxgamer/quickshop/util/Util.java +++ b/src/main/java/org/maxgamer/quickshop/util/Util.java @@ -1199,7 +1199,7 @@ public static String parseColours(@Nullable String text) { parser.reset(); //A hack for saving reset character - text = text.replace("&r", "&l&r").replace("§r", "§l§r"); + text = text.replace("&r", "&l&r").replace("§f", "§l§f"); return toLegacyText(parser.enable(MineDownParser.Option.LEGACY_COLORS).enable(MineDownParser.Option.APPEND_COLORS_TO_EMPTY_STRING).backwardsCompatibility(true).parse(text).create()); } From 86869ab52b85527ac3a535fd4b6c3da8d7226884 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sat, 4 May 2024 23:25:24 +0800 Subject: [PATCH 13/25] Update maven.yml --- .github/workflows/maven.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index bf5b5c25c6..7c0bf24d64 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,3 +29,8 @@ jobs: # run: mvn -B install --file src/integration/plotsquared/5/pom.xml - name: Build with Maven run: mvn -B test --file pom.xml -Pdebug + - name: Jar + uses: actions/upload-artifact@v3 + with: + name: QuickShop-Reremake + path: build/libs From 220f78873637a3ca5cce0573212dd99c8fc8828a Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sat, 4 May 2024 23:33:22 +0800 Subject: [PATCH 14/25] Update maven.yml --- .github/workflows/maven.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7c0bf24d64..807266e511 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,8 +29,7 @@ jobs: # run: mvn -B install --file src/integration/plotsquared/5/pom.xml - name: Build with Maven run: mvn -B test --file pom.xml -Pdebug - - name: Jar + - name: upload jar uses: actions/upload-artifact@v3 with: - name: QuickShop-Reremake - path: build/libs + name: QuickShop From 9aa704d597da38dd00549f3258817887922240e6 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sat, 4 May 2024 23:38:22 +0800 Subject: [PATCH 15/25] Update maven.yml --- .github/workflows/maven.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 807266e511..37989e089a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -33,3 +33,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: QuickShop + path: | + **/target/*.jar From 956540a6b056fe791683b480662f53fef2815167 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sat, 4 May 2024 23:44:43 +0800 Subject: [PATCH 16/25] Update maven.yml --- .github/workflows/maven.yml | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 37989e089a..11d59bb07d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,36 +1,33 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven -name: Maven Test +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Java CI with Maven on: push: - branches: [ master ] + branches: [ "master" ] pull_request: - branches: [ master ] + branches: [ "master" ] jobs: build: - runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 - name: Set up JDK 17 uses: actions/setup-java@v2 with: java-version: '17' - distribution: 'adopt' - # - name: Build JsonConfiguration - # run: | - # git clone https://github.com/sandtechnology/JsonConfiguration.git - # mvn -B install --file JsonConfiguration/pom.xml - # - name: Build Integration - # run: mvn -B install --file src/integration/plotsquared/5/pom.xml + distribution: 'temurin' + cache: 'maven' - name: Build with Maven - run: mvn -B test --file pom.xml -Pdebug - - name: upload jar - uses: actions/upload-artifact@v3 + run: mvn package --batch-mode --update-snapshots -T 1.5C -f pom.xml -P github + - uses: actions/upload-artifact@v3 with: name: QuickShop path: | From 872ace6f8bbff6fe89a82308f31e6c5cda67f364 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sun, 5 May 2024 00:29:26 +0800 Subject: [PATCH 17/25] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c312cb845c..44096c542e 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ -## QuickShopReremake-NoMalware-Checker +## Recommended Migration to QuickShop-Hikari + +This version of QuickShop-Reremake runs on the 1.20.5+ Paper server. +but there are many bugs and broken features +We recommend that you upgrade to 1.20.5 and use this version of QuickShop-Reremake to convert to QuickShop-Hikari. From 95549f9dd79d6c2116e40ab6a05ff667f414dee9 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Tue, 14 May 2024 23:49:15 +0800 Subject: [PATCH 18/25] [ci skip]Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 44096c542e..79a9462206 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,6 @@ This version of QuickShop-Reremake runs on the 1.20.5+ Paper server. but there are many bugs and broken features We recommend that you upgrade to 1.20.5 and use this version of QuickShop-Reremake to convert to QuickShop-Hikari. + + +**This is a 3rd-party build** From 61e2cac337769420313798dad4306b380249ad40 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO Date: Sat, 8 Jun 2024 01:23:52 +0800 Subject: [PATCH 19/25] [ci skip]update --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 79a9462206..ea351d0561 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ ## Recommended Migration to QuickShop-Hikari -This version of QuickShop-Reremake runs on the 1.20.5+ Paper server. -but there are many bugs and broken features -We recommend that you upgrade to 1.20.5 and use this version of QuickShop-Reremake to convert to QuickShop-Hikari. - +QuickShop-Reremake (v5.1.2.5) is broken in Paper 1.20.5+ Server +You can download the support version from Github releases and then [migrate to QuickShop-Hikari(CLICK ME)](https://ghost-chu.github.io/QuickShop-Hikari-Documents/docs/addon/reremake-migrator) +I strongly do not recommend this version of QuickShop-Reremake for use on the server + Because there are many bugs and broken features. I **only recommend you use this version to migrate to QuickShop-Hikari** **This is a 3rd-party build** From 42a03ff5ca37888ff6c82f444fed08dc3663e0d5 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sat, 8 Jun 2024 21:32:06 +0800 Subject: [PATCH 20/25] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea351d0561..2564175fe7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ QuickShop-Reremake (v5.1.2.5) is broken in Paper 1.20.5+ Server You can download the support version from Github releases and then [migrate to QuickShop-Hikari(CLICK ME)](https://ghost-chu.github.io/QuickShop-Hikari-Documents/docs/addon/reremake-migrator) -I strongly do not recommend this version of QuickShop-Reremake for use on the server - Because there are many bugs and broken features. I **only recommend you use this version to migrate to QuickShop-Hikari** +I strongly do not recommend this version of QuickShop-Reremake for use on the server +Because there are many bugs and broken features in Paper 1.20.5+ Server. +I **only recommend you use this version to migrate to QuickShop-Hikari** **This is a 3rd-party build** From 75a807cc51bcb7944c0e3bf8d43ff6ddbb962446 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:51:19 +0800 Subject: [PATCH 21/25] [ci skip]Update README.md --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2564175fe7..a911ff6669 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## Recommended Migration to QuickShop-Hikari +## Recommended Migration to QuickShop-Hikari(EN) QuickShop-Reremake (v5.1.2.5) is broken in Paper 1.20.5+ Server You can download the support version from Github releases and then [migrate to QuickShop-Hikari(CLICK ME)](https://ghost-chu.github.io/QuickShop-Hikari-Documents/docs/addon/reremake-migrator) @@ -7,3 +7,13 @@ Because there are many bugs and broken features in Paper 1.20.5+ Server. I **only recommend you use this version to migrate to QuickShop-Hikari** **This is a 3rd-party build** + +## 推荐转换到 QuickShop-Hikari(CN) + +QuickShop-Reremake (v5.1.2.5) 在 Paper 1.20.5+ 的服务器运行存在BUG +你可以在 Github Releases 下载支持在 Paper 1.20.5+ 服务器运行的 QuickShop-Reremake 第三方修改构建,然后[转换到QuickShop-Hikari(点击我)](https://ghost-chu.github.io/QuickShop-Hikari-Documents/docs/addon/reremake-migrator) +我强烈不建议你使用该版本的 QuickShop-Reremake 在服务器中 +因为在 Paper 1.20.5+ 服务器中，该版本有许多BUG +我 **只建议你使用这个版本来转换到QuickShop-Hikari** + +**这是第三方修改构建** From 9f8d024153fb43a544184a1d310f51b8223a9a11 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Mon, 15 Jul 2024 02:30:19 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a911ff6669..32732e794a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Recommended Migration to QuickShop-Hikari(EN) QuickShop-Reremake (v5.1.2.5) is broken in Paper 1.20.5+ Server -You can download the support version from Github releases and then [migrate to QuickShop-Hikari(CLICK ME)](https://ghost-chu.github.io/QuickShop-Hikari-Documents/docs/addon/reremake-migrator) +You can download the support version from Github releases and then [migrate to QuickShop-Hikari(CLICK ME)](https://quickshop-community.github.io/QuickShop-Hikari-Documents/docs/addon/reremake-migrator) I strongly do not recommend this version of QuickShop-Reremake for use on the server Because there are many bugs and broken features in Paper 1.20.5+ Server. I **only recommend you use this version to migrate to QuickShop-Hikari** @@ -11,7 +11,7 @@ I **only recommend you use this version to migrate to QuickShop-Hikari** ## 推荐转换到 QuickShop-Hikari(CN) QuickShop-Reremake (v5.1.2.5) 在 Paper 1.20.5+ 的服务器运行存在BUG -你可以在 Github Releases 下载支持在 Paper 1.20.5+ 服务器运行的 QuickShop-Reremake 第三方修改构建,然后[转换到QuickShop-Hikari(点击我)](https://ghost-chu.github.io/QuickShop-Hikari-Documents/docs/addon/reremake-migrator) +你可以在 Github Releases 下载支持在 Paper 1.20.5+ 服务器运行的 QuickShop-Reremake 第三方修改构建,然后[转换到QuickShop-Hikari(点击我)](https://quickshop-community.github.io/QuickShop-Hikari-Documents/docs/addon/reremake-migrator) 我强烈不建议你使用该版本的 QuickShop-Reremake 在服务器中 因为在 Paper 1.20.5+ 服务器中，该版本有许多BUG 我 **只建议你使用这个版本来转换到QuickShop-Hikari** From 1e1f0c2808d0f5891387e81e62b4b95fcebe386e Mon Sep 17 00:00:00 2001 From: YuanYuanOwO Date: Sun, 17 Nov 2024 21:59:51 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E8=AF=95=E8=AF=95=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=9D=A5=E8=87=AA=20Hikari=20=E7=9A=84=20com?= =?UTF-8?q?mit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maxgamer/quickshop/util/envcheck/EnvironmentChecker.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java b/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java index 8d69eb4fe4..dd4230a868 100644 --- a/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java +++ b/src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java @@ -311,6 +311,9 @@ public ResultContainer coreSupportTest() { @EnvCheckEntry(name = "Virtual DisplayItem Support Test", priority = 7) public ResultContainer virtualDisplaySupportTest() { + if(!plugin.isDisplayEnabled()) { + return new ResultContainer(CheckResult.PASSED, "The setting shop.display-items is disabled."); + } String nmsVersion = ReflectFactory.getNMSVersion(); GameVersion gameVersion = GameVersion.get(nmsVersion); Throwable throwable; From 75ce2554d1b4c7ad8b4b1de3534ca91b2a3c9662 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:01:41 +0800 Subject: [PATCH 24/25] Update maven.yml --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 11d59bb07d..d34f4c7e24 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,9 +10,9 @@ name: Java CI with Maven on: push: - branches: [ "master" ] + branches: [ "master","ignore-display-messages" ] pull_request: - branches: [ "master" ] + branches: [ "master","ignore-display-messages" ] jobs: build: From f72fe3c97a78572193f31134ded3f872bd992074 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:04:00 +0800 Subject: [PATCH 25/25] Update maven.yml --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d34f4c7e24..cbb1f1e089 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,9 +10,9 @@ name: Java CI with Maven on: push: - branches: [ "master","ignore-display-messages" ] + branches: [ "master", "ignore-display-messages" ] pull_request: - branches: [ "master","ignore-display-messages" ] + branches: [ "master", "ignore-display-messages" ] jobs: build: