Skip to content

Commit cf2efba

Browse files
Misat11Misat11
committed
feat: enable testing with Spigot, update few messages, warn users on Java < 17 instead of 11
1 parent b97ba45 commit cf2efba

File tree

6 files changed

+41
-74
lines changed

6 files changed

+41
-74
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ takenaka = "1.2.1-SNAPSHOT"
2323
mappings = "1.8.8+26.1"
2424

2525
# gradle plugins
26-
screaming-plugin-builder = "2.0.0"
26+
screaming-plugin-builder = "2.0.1"
2727
buildconfig = "6.0.7"
2828
lombok = "9.2.0"
2929

‎plugin/build.gradle.kts‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -63,38 +63,46 @@ buildConfig {
6363
runTestServer {
6464
pluginJar(tasks.shadowJar.flatMap { it.archiveFile })
6565

66-
versions(
67-
org.screamingsandals.gradle.run.config.Platform.PAPER,
68-
listOf(
69-
"1.21.11",
70-
"1.21.10",
71-
"1.21.8",
72-
"1.21.4",
73-
"1.21.3",
74-
"1.21.1",
75-
"1.20.6",
76-
"1.20.4",
77-
"1.20.2",
78-
"1.20.1",
79-
"1.19.4",
80-
"1.19.3",
81-
"1.18.2",
82-
"1.17.1",
83-
"1.16.5",
84-
"1.15.2",
85-
"1.14.4",
86-
"1.13.2",
87-
"1.12.2",
88-
"1.11.2",
89-
"1.10.2",
90-
"1.9.4",
91-
"1.8.8",
92-
)
93-
) {
66+
val versionList = listOf(
67+
"26.1.1",
68+
"1.21.11",
69+
"1.21.10",
70+
"1.21.8",
71+
"1.21.4",
72+
"1.21.3",
73+
"1.21.1",
74+
"1.20.6",
75+
"1.20.4",
76+
"1.20.2",
77+
"1.20.1",
78+
"1.19.4",
79+
"1.19.3",
80+
"1.18.2",
81+
"1.17.1",
82+
"1.16.5",
83+
"1.15.2",
84+
"1.14.4",
85+
"1.13.2",
86+
"1.12.2",
87+
"1.11.2",
88+
"1.10.2",
89+
"1.9.4",
90+
"1.8.8",
91+
)
92+
93+
versions(org.screamingsandals.gradle.run.config.Platform.PAPER, versionList) {
9494
jvmArgs("-Dio.papermc.paper.suppress.sout.nags=true", "-DPaper.IgnoreJavaVersion=true")
9595
serverProperties {
9696
onlineMode(false)
9797
property("level-type", "flat")
9898
}
9999
}
100+
101+
versions(org.screamingsandals.gradle.run.config.Platform.SPIGOT, versionList) {
102+
jvmArgs("-DIReallyKnowWhatIAmDoingISwear")
103+
serverProperties {
104+
onlineMode(false)
105+
property("level-type", "flat")
106+
}
107+
}
100108
}

‎plugin/src/main/java/org/screamingsandals/bedwars/Main.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,8 @@ public void onEnable() {
541541
}
542542
try {
543543
float javaVer = Float.parseFloat(System.getProperty("java.class.version"));
544-
if (javaVer < 55) {
545-
getLogger().warning("Bedwars 0.3.0 will require at least Java 11. Your server is not prepared for it. Update your Java or contact your hosting. ");
544+
if (javaVer < 61) {
545+
getLogger().warning("BedWars 0.3.0 will require at least Java 17. Your server is not prepared for it. Update your Java or contact your hosting. ");
546546
getLogger().warning("https://docs.papermc.io/misc/java-install");
547547
}
548548
} catch (Throwable t) { // What if it fails? Why it should fail I don't know :D
@@ -609,9 +609,7 @@ public void onEnable() {
609609
}
610610

611611
if (Main.getConfigurator().config.getBoolean("update-checker.zero.console")
612-
|| Main.getConfigurator().config.getBoolean("update-checker.zero.oped-players")
613-
|| Main.getConfigurator().config.getBoolean("update-checker.one.console")
614-
|| Main.getConfigurator().config.getBoolean("update-checker.one.oped-players")) {
612+
|| Main.getConfigurator().config.getBoolean("update-checker.zero.oped-players")) {
615613
UpdateChecker.run();
616614
}
617615

@@ -630,9 +628,6 @@ public void onEnable() {
630628
preSelectGames = true;
631629
}, 2L);
632630
}
633-
634-
Bukkit.getConsoleSender().sendMessage("§fEverything is loaded! If you like our work, consider visiting our Patreon! <3");
635-
Bukkit.getConsoleSender().sendMessage("§fhttps://www.patreon.com/screamingsandals");
636631
}
637632

638633
public void onDisable() {

‎plugin/src/main/java/org/screamingsandals/bedwars/config/Configurator.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,8 +607,6 @@ public void createFiles() {
607607

608608
checkOrSetConfig(modify, "update-checker.zero.console", true);
609609
checkOrSetConfig(modify, "update-checker.zero.admins", true);
610-
checkOrSetConfig(modify, "update-checker.one.console", true);
611-
checkOrSetConfig(modify, "update-checker.one.admins", true);
612610

613611
checkOrSetConfig(modify, "target-block.allow-destroying-with-explosions", false);
614612
checkOrSetConfig(modify, "target-block.respawn-anchor.fill-on-start", true);

‎plugin/src/main/java/org/screamingsandals/bedwars/utils/UpdateChecker.java‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,6 @@ public static void run() {
6060
Bukkit.getPluginManager().registerEvents(updateListener, Main.getInstance());
6161
}
6262
}
63-
if (result.isOneAvailable) {
64-
float javaVer = Float.parseFloat(System.getProperty("java.class.version"));
65-
if (Main.getConfigurator().config.getBoolean("update-checker.one.console")) {
66-
mpr("update_checker_one").replace("url", result.oneWebsite).send(Bukkit.getConsoleSender());
67-
if (javaVer < 55.0F) {
68-
mpr("update_checker_one_second_bad").send(Bukkit.getConsoleSender());
69-
} else {
70-
mpr("update_checker_one_second_good").send(Bukkit.getConsoleSender());
71-
}
72-
}
73-
if (Main.getConfigurator().config.getBoolean("update-checker.one.admins")) {
74-
if (updateListener == null) {
75-
updateListener = new UpdateListener(result);
76-
Bukkit.getPluginManager().registerEvents(updateListener, Main.getInstance());
77-
}
78-
updateListener.javaVer = javaVer;
79-
}
80-
}
8163
}
8264
} catch (Exception ignored) {
8365
}
@@ -90,10 +72,6 @@ public static class Result {
9072
public String currentZeroVersion;
9173
@SerializedName("zero_update")
9274
public boolean isUpdateAvailable;
93-
@SerializedName("one_available")
94-
public boolean isOneAvailable;
95-
@SerializedName("one_page")
96-
public String oneWebsite;
9775
@SerializedName("zero_download_url")
9876
public String download;
9977

@@ -103,15 +81,12 @@ public String toString() {
10381
"status=" + status +
10482
", currentZeroVersion='" + currentZeroVersion + '\'' +
10583
", isUpdateAvailable=" + isUpdateAvailable +
106-
", isOneAvailable=" + isOneAvailable +
107-
", oneWebsite='" + oneWebsite + '\'' +
10884
", download='" + download + '\'' +
10985
'}';
11086
}
11187
}
11288

11389
public static class UpdateListener implements Listener {
114-
public float javaVer;
11590
private Result result;
11691

11792
public UpdateListener(Result result) {
@@ -126,15 +101,6 @@ public void onPlayerJoin(PlayerJoinEvent event) {
126101
mpr("update_checker_zero").replace("version", result.currentZeroVersion).send(player);
127102
mpr("update_checker_zero_second").replace("url", result.download).send(player);
128103
}
129-
130-
if (Main.getConfigurator().config.getBoolean("update-checker.one.admins") && result.isOneAvailable) {
131-
mpr("update_checker_one").replace("url", result.oneWebsite).send(player);
132-
if (javaVer < 55.0F) {
133-
mpr("update_checker_one_second_bad").send(player);
134-
} else {
135-
mpr("update_checker_one_second_good").send(player);
136-
}
137-
}
138104
}
139105

140106
}

‎plugin/src/main/java/org/screamingsandals/bedwars/utils/VersionFallback.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static void applyFallbackIfNeeded() {
7070

7171
MapperPlatforms.setCurrentPlatform(MapperPlatform.create(latest, MapperPlatforms.getCurrentPlatform().getClassLoader(), mappingNamespaces));
7272
Bukkit.getLogger().warning("[BedWars] This Minecraft version (" + version + ") is newer than the latest supported version (" + latest + ").");
73-
Bukkit.getLogger().warning("[BedWars] Compatibility is unknown. Check for updates or official support confirmation.");
73+
Bukkit.getLogger().warning("[BedWars] Compatibility is unknown. Check for updates or official support confirmation. If support is confirmed, ignore this message.");
7474
Bukkit.getLogger().info("[BedWars] Loaded fallback NMS modules for " + latest + " in namespaces " + Arrays.toString(mappingNamespaces));
7575
}
7676

0 commit comments

Comments
 (0)