Skip to content

Commit 76d3f0f

Browse files
committed
Fix build
1 parent 5ac6950 commit 76d3f0f

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

src/main/java/org/maxgamer/quickshop/util/collector/adapter/CollectorAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.maxgamer.quickshop.economy.Economy_Vault;
3030
import org.maxgamer.quickshop.shop.ShopLoader;
3131
import org.maxgamer.quickshop.util.MsgUtil;
32+
import org.maxgamer.quickshop.util.ReflectFactory;
3233
import org.maxgamer.quickshop.util.Util;
3334
import org.maxgamer.quickshop.util.collector.CollectResolver;
3435
import org.maxgamer.quickshop.util.collector.CollectType;
@@ -94,7 +95,7 @@ public class CollectorAdapter {
9495
data.put("name", plugin.getServer().getName());
9596
data.put("software", plugin.getServer().getVersion());
9697
data.put("version", plugin.getServer().getVersion());
97-
data.put("version_internal", Util.getNMSVersion());
98+
data.put("version_internal", ReflectFactory.getNMSVersion());
9899
data.put("version_data", plugin.getServer().getUnsafe().getDataVersion());
99100
data.put("online_mode", plugin.getServer().getOnlineMode());
100101
data.put("view_distance", plugin.getServer().getViewDistance());

src/main/java/org/maxgamer/quickshop/util/envcheck/EnvironmentChecker.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public ResultContainer spigotBasedServer() {
276276
//API test
277277
try {
278278
plugin.getServer().spigot();
279-
String nmsVersion = Util.getNMSVersion();
279+
String nmsVersion = ReflectFactory.getNMSVersion();
280280
plugin.getLogger().info("Running QuickShop-" + QuickShop.getFork() + " on NMS version " + nmsVersion + " For Minecraft version " + ReflectFactory.getServerVersion());
281281
} catch (Exception e) {
282282
return failed;
@@ -333,7 +333,7 @@ public ResultContainer moddedBasedTest() {
333333

334334
@EnvCheckEntry(name = "CoreSupport Test", priority = 6)
335335
public ResultContainer coreSupportTest() {
336-
String nmsVersion = Util.getNMSVersion();
336+
String nmsVersion = ReflectFactory.getNMSVersion();
337337
GameVersion gameVersion = GameVersion.get(nmsVersion);
338338
if (!gameVersion.isCoreSupports()) {
339339
return new ResultContainer(CheckResult.STOP_WORKING, "Your Minecraft version is no longer supported: " + ReflectFactory.getServerVersion() + " (" + nmsVersion + ")");
@@ -346,7 +346,7 @@ public ResultContainer coreSupportTest() {
346346

347347
@EnvCheckEntry(name = "Virtual DisplayItem Support Test", priority = 7)
348348
public ResultContainer virtualDisplaySupportTest() {
349-
String nmsVersion = Util.getNMSVersion();
349+
String nmsVersion = ReflectFactory.getNMSVersion();
350350
GameVersion gameVersion = GameVersion.get(nmsVersion);
351351
Throwable throwable;
352352
if (!gameVersion.isVirtualDisplaySupports()) {
@@ -374,7 +374,7 @@ public ResultContainer virtualDisplaySupportTest() {
374374

375375
@EnvCheckEntry(name = "GameVersion supporting Test", priority = 9)
376376
public ResultContainer gamerVersionSupportTest() {
377-
String nmsVersion = Util.getNMSVersion();
377+
String nmsVersion = ReflectFactory.getNMSVersion();
378378
GameVersion gameVersion = GameVersion.get(nmsVersion);
379379
if (gameVersion == GameVersion.UNKNOWN) {
380380
return new ResultContainer(CheckResult.WARNING, "Your Minecraft server version not tested by developers, QuickShop may ran into issues on this version.");

src/main/java/org/maxgamer/quickshop/util/matcher/item/QuickShopItemMatcherImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.jetbrains.annotations.Nullable;
3333
import org.maxgamer.quickshop.QuickShop;
3434
import org.maxgamer.quickshop.api.shop.ItemMatcher;
35+
import org.maxgamer.quickshop.util.ReflectFactory;
3536
import org.maxgamer.quickshop.util.Util;
3637
import org.maxgamer.quickshop.util.reload.ReloadResult;
3738
import org.maxgamer.quickshop.util.reload.ReloadStatus;
@@ -468,7 +469,7 @@ public ItemMetaMatcher(@NotNull ConfigurationSection itemMatcherConfig, @NotNull
468469
}
469470
return true;
470471
}));
471-
if (!"v1_13_R1".equals(Util.getNMSVersion()) && !"v1_13_R2".equals(Util.getNMSVersion())) {
472+
if (!"v1_13_R1".equals(ReflectFactory.getNMSVersion()) && !"v1_13_R2".equals(ReflectFactory.getNMSVersion())) {
472473
addIfEnable(itemMatcherConfig, "custommodeldata", ((meta1, meta2) -> {
473474
if (meta1.hasCustomModelData() != meta2.hasCustomModelData()) {
474475
return false;
@@ -478,7 +479,7 @@ public ItemMetaMatcher(@NotNull ConfigurationSection itemMatcherConfig, @NotNull
478479
}
479480
return true;
480481
}));
481-
if (!"v1_14_R1".equals(Util.getNMSVersion())) {
482+
if (!"v1_14_R1".equals(ReflectFactory.getNMSVersion())) {
482483
addIfEnable(itemMatcherConfig, "suspiciousStew", ((meta1, meta2) -> {
483484
if ((meta1 instanceof SuspiciousStewMeta) != (meta2 instanceof SuspiciousStewMeta)) {
484485
return false;

src/main/java/org/maxgamer/quickshop/util/paste/Paste.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.maxgamer.quickshop.api.economy.EconomyCore;
3434
import org.maxgamer.quickshop.economy.Economy_Vault;
3535
import org.maxgamer.quickshop.util.MsgUtil;
36+
import org.maxgamer.quickshop.util.ReflectFactory;
3637
import org.maxgamer.quickshop.util.Util;
3738

3839
import java.io.File;
@@ -116,7 +117,7 @@ public class Paste {
116117
finalReport.append("\tName: ").append(plugin.getServer().getName()).append("\n");
117118
finalReport.append("\tServer Name: ").append(plugin.getServer().getName()).append("\n");
118119
finalReport.append("\tBuild: ").append(plugin.getServer().getVersion()).append("\n");
119-
finalReport.append("\tNMSV: ").append(Util.getNMSVersion()).append("\n");
120+
finalReport.append("\tNMSV: ").append(ReflectFactory.getNMSVersion()).append("\n");
120121
//noinspection deprecation
121122
finalReport.append("\tData Version: ").append(plugin.getServer().getUnsafe().getDataVersion()).append("\n");
122123
if (plugin.getEnvironmentChecker().isFabricBasedServer() || plugin.getEnvironmentChecker().isForgeBasedServer()) {

0 commit comments

Comments
 (0)