4 Commits
Author SHA1 Message Date
MineTec 46ee734bbc Refactored game rule handling in ProjectStart to use a unified GameRuleSetting record, eliminating redundant methods and improving code clarity. 2026-10-13 22:41:14 +02:00
jannis a1ab06a80d fixed game rules 2026-10-13 22:29:33 +02:00
jannis cf3fd2f38f changed old gamerules to new and added quarz recipe 2026-10-13 21:41:00 +02:00
MineTecandClaude Opus 5.5 7d0a28b015 updated to Paper 26.2, Java 25 and Gradle 9.6.1
- paper-api 26.2.build.129-stable (all modules), Java toolchain 25, shadow 9.6.1
- fixed NoSuchFieldError on join/quit/chat: Adventure 5 ClickEvent API
  (ClickEvent.suggestCommand / openUrl instead of ClickEvent.Action constants)
- fixed NBTComponent generics in AntiFormattedBook
- replaced javax.annotation with org.jetbrains.annotations (no longer provided by paper-api)
- local.gradle.example: Gradle 9 compatible (archiveFile, providers.exec)

The previous state is tagged as paper-1.21.10.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-07 23:44:13 +02:00
17 changed files with 92 additions and 34 deletions

No files matched your search

+2 -2
View File
@@ -1,6 +1,6 @@
plugins { plugins {
id 'java' id 'java'
id 'com.gradleup.shadow' version "8.3.5" id 'com.gradleup.shadow' version "9.6.1"
} }
allprojects { allprojects {
@@ -29,7 +29,7 @@ subprojects {
java { java {
toolchain { toolchain {
languageVersion = JavaLanguageVersion.of(21) languageVersion = JavaLanguageVersion.of(25)
} }
} }
} }
+1 -1
View File
@@ -1,7 +1,7 @@
dependencies { dependencies {
implementation project(':core') implementation project(':core')
compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT' compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable'
compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT' compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT'
implementation 'org.apache.httpcomponents:httpclient:4.5.14' implementation 'org.apache.httpcomponents:httpclient:4.5.14'
implementation 'com.sparkjava:spark-core:2.9.4' implementation 'com.sparkjava:spark-core:2.9.4'
@@ -25,7 +25,7 @@ public class ChatMessages extends Appliance {
public Component addReportActions(Component message, String username) { public Component addReportActions(Component message, String username) {
return message return message
.hoverEvent(HoverEvent.showText(Component.text("Klicke, um diesen Spieler zu reporten").color(NamedTextColor.GOLD))) .hoverEvent(HoverEvent.showText(Component.text("Klicke, um diesen Spieler zu reporten").color(NamedTextColor.GOLD)))
.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.SUGGEST_COMMAND, String.format("/report %s ", username))); .clickEvent(ClickEvent.suggestCommand(String.format("/report %s ", username)));
} }
@Override @Override
@@ -85,7 +85,7 @@ public class Report extends Appliance {
.append( .append(
Component Component
.text(createdReport.data().url(), NamedTextColor.GRAY) .text(createdReport.data().url(), NamedTextColor.GRAY)
.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, createdReport.data().url())) .clickEvent(ClickEvent.openUrl(createdReport.data().url()))
) )
.appendNewline() .appendNewline()
.appendNewline() .appendNewline()
@@ -32,7 +32,7 @@ public class AntiFormattedBook extends Appliance {
if (component instanceof TextComponent tc && tc.content().indexOf(SECTION) >= 0) return true; if (component instanceof TextComponent tc && tc.content().indexOf(SECTION) >= 0) return true;
if (component instanceof NBTComponent<?, ?> nbt) { if (component instanceof NBTComponent<?> nbt) {
if (nbt.separator() != null && this.hasFormattingDeep(nbt.separator())) return true; if (nbt.separator() != null && this.hasFormattingDeep(nbt.separator())) return true;
} }
+1 -1
View File
@@ -1,5 +1,5 @@
dependencies { dependencies {
compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT' compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable'
compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT' compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT'
implementation 'org.apache.httpcomponents:httpclient:4.5.14' implementation 'org.apache.httpcomponents:httpclient:4.5.14'
implementation 'com.sparkjava:spark-core:2.9.4' implementation 'com.sparkjava:spark-core:2.9.4'
@@ -32,7 +32,7 @@ public class IteratorUtil {
} }
public static void times(int times, Runnable callback) { public static void times(int times, Runnable callback) {
IntStream.range(0, times).forEach(value -> callback.run()); IntStream.range(0, times).forEach(_ -> callback.run());
} }
public static <T> void iterateListInGlobal(int sectionStart, List<T> list, BiConsumer<Integer, T> callback) { public static <T> void iterateListInGlobal(int sectionStart, List<T> list, BiConsumer<Integer, T> callback) {
+1 -1
View File
@@ -2,7 +2,7 @@ dependencies {
implementation project(':core') implementation project(':core')
implementation project(':common') implementation project(':common')
compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT' compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable'
compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT' compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT'
implementation 'org.apache.httpcomponents:httpclient:4.5.14' implementation 'org.apache.httpcomponents:httpclient:4.5.14'
implementation 'com.sparkjava:spark-core:2.9.4' implementation 'com.sparkjava:spark-core:2.9.4'
@@ -0,0 +1,42 @@
package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.quarzRecipe;
import eu.mhsl.craftattack.spawn.core.Main;
import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.entity.Player;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.ShapelessRecipe;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class QuarzRecipe extends Appliance {
private NamespacedKey recipeKey;
@Override
public void onEnable() {
this.recipeKey = new NamespacedKey(Main.instance(), "quarz_block_to_quarz");
ShapelessRecipe recipe = new ShapelessRecipe(this.recipeKey, new ItemStack(Material.QUARTZ, 4));
recipe.addIngredient(Material.QUARTZ_BLOCK);
Bukkit.addRecipe(recipe);
Bukkit.getOnlinePlayers().forEach(this::unlock);
}
@Override
public void onDisable() {
Bukkit.removeRecipe(this.recipeKey);
}
public void unlock(Player player) {
player.discoverRecipe(this.recipeKey);
}
@Override
protected @NotNull List<Listener> listeners() {
return List.of(new QuarzRecipeListener());
}
}
@@ -0,0 +1,12 @@
package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.quarzRecipe;
import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent;
public class QuarzRecipeListener extends ApplianceListener<QuarzRecipe> {
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
this.getAppliance().unlock(event.getPlayer());
}
}
@@ -20,7 +20,7 @@ import org.bukkit.event.Event;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import javax.annotation.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -26,10 +26,8 @@ import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import static java.util.Map.entry;
import static org.bukkit.Sound.MUSIC_DISC_LAVA_CHICKEN; import static org.bukkit.Sound.MUSIC_DISC_LAVA_CHICKEN;
public class ProjectStart extends Appliance { public class ProjectStart extends Appliance {
@@ -57,17 +55,23 @@ public class ProjectStart extends Appliance {
) )
); );
private final Map<GameRule<Boolean>, Boolean> gameRulesAfterStart = Map.ofEntries( private record GameRuleSetting<T>(GameRule<T> rule, T before, T after) {
entry(GameRule.DO_DAYLIGHT_CYCLE, true), void apply(boolean afterStart) {
entry(GameRule.DO_INSOMNIA, true), IteratorUtil.worlds(world -> world.setGameRule(this.rule, afterStart ? this.after : this.before));
entry(GameRule.DISABLE_RAIDS, false), }
entry(GameRule.DO_FIRE_TICK, true), }
entry(GameRule.DO_ENTITY_DROPS, true),
entry(GameRule.DO_PATROL_SPAWNING, true), private final List<GameRuleSetting<?>> gameRules = List.of(
entry(GameRule.DO_TRADER_SPAWNING, true), new GameRuleSetting<>(GameRules.ADVANCE_TIME, false, true),
entry(GameRule.DO_WEATHER_CYCLE, true), new GameRuleSetting<>(GameRules.SPAWN_PHANTOMS, false, true),
entry(GameRule.FALL_DAMAGE, true), new GameRuleSetting<>(GameRules.RAIDS, false, true),
entry(GameRule.FIRE_DAMAGE, true) new GameRuleSetting<>(GameRules.ENTITY_DROPS, false, true),
new GameRuleSetting<>(GameRules.SPAWN_PATROLS, false, true),
new GameRuleSetting<>(GameRules.SPAWN_WANDERING_TRADERS, false, true),
new GameRuleSetting<>(GameRules.ADVANCE_WEATHER, false, true),
new GameRuleSetting<>(GameRules.FALL_DAMAGE, false, true),
new GameRuleSetting<>(GameRules.FIRE_DAMAGE, false, true),
new GameRuleSetting<>(GameRules.FIRE_SPREAD_RADIUS_AROUND_PLAYER, 0, -1)
); );
public ProjectStart() { public ProjectStart() {
@@ -76,7 +80,7 @@ public class ProjectStart extends Appliance {
this.countdown.addCustomAnnouncement( this.countdown.addCustomAnnouncement(
new Countdown.CustomAnnouncements( new Countdown.CustomAnnouncements(
counter -> counter == this.startMusicAt, counter -> counter == this.startMusicAt,
counter -> this.glassLocation _ -> this.glassLocation
.getWorld() .getWorld()
.playSound(this.glassLocation, MUSIC_DISC_LAVA_CHICKEN, SoundCategory.RECORDS, 500f, 1f) .playSound(this.glassLocation, MUSIC_DISC_LAVA_CHICKEN, SoundCategory.RECORDS, 500f, 1f)
) )
@@ -121,7 +125,7 @@ public class ProjectStart extends Appliance {
this.setEnabled(false); this.setEnabled(false);
IteratorUtil.worlds(World::getWorldBorder, worldBorder -> worldBorder.setSize(worldBorder.getMaxSize())); IteratorUtil.worlds(World::getWorldBorder, worldBorder -> worldBorder.setSize(worldBorder.getMaxSize()));
IteratorUtil.worlds(world -> IteratorUtil.setGameRules(this.gameRulesAfterStart, false)); this.gameRules.forEach(setting -> setting.apply(true));
Bukkit.getWorlds().getFirst().setFullTime(0); Bukkit.getWorlds().getFirst().setFullTime(0);
this.netherFireLocations.forEach(location -> Objects.requireNonNull(this.startWorld).getBlockAt(location).setType(Material.FIRE)); this.netherFireLocations.forEach(location -> Objects.requireNonNull(this.startWorld).getBlockAt(location).setType(Material.FIRE));
@@ -168,7 +172,7 @@ public class ProjectStart extends Appliance {
worldBorder.setDamageAmount(0); worldBorder.setDamageAmount(0);
}); });
IteratorUtil.worlds(world -> world, world -> IteratorUtil.setGameRules(this.gameRulesAfterStart, true)); this.gameRules.forEach(setting -> setting.apply(false));
this.resetAdvancements(); this.resetAdvancements();
this.blockCycle.reset(); this.blockCycle.reset();
+1 -1
View File
@@ -2,7 +2,7 @@ dependencies {
implementation project(':common') implementation project(':common')
implementation project(':core') implementation project(':core')
compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT' compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable'
compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT' compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT'
implementation 'org.apache.httpcomponents:httpclient:4.5.14' implementation 'org.apache.httpcomponents:httpclient:4.5.14'
implementation 'com.sparkjava:spark-core:2.9.4' implementation 'com.sparkjava:spark-core:2.9.4'
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
+4 -4
View File
@@ -1,6 +1,6 @@
tasks.register('deployVaroPlugin', Copy) { tasks.register('deployVaroPlugin', Copy) {
dependsOn ":varo:shadowJar" dependsOn ":varo:shadowJar"
from { project(":varo").shadowJar.archivePath } from { project(":varo").shadowJar.archiveFile }
into file('path') // path to plugins folder into file('path') // path to plugins folder
rename { fileName -> "varo.jar" } rename { fileName -> "varo.jar" }
} }
@@ -10,15 +10,15 @@ tasks.register("uploadVaroPlugin") {
doLast { doLast {
def jarFile = project(":varo").tasks.named("shadowJar").get().outputs.files.singleFile def jarFile = project(":varo").tasks.named("shadowJar").get().outputs.files.singleFile
exec { providers.exec {
commandLine "scp", "-4", "-P", "22", jarFile.absolutePath, "user@host:path/varo.jar" commandLine "scp", "-4", "-P", "22", jarFile.absolutePath, "user@host:path/varo.jar"
} }.result.get()
} }
} }
tasks.register('deployCraftAttackPlugin', Copy) { tasks.register('deployCraftAttackPlugin', Copy) {
dependsOn ":craftattack:shadowJar" dependsOn ":craftattack:shadowJar"
from { project(":craftattack").shadowJar.archivePath } from { project(":craftattack").shadowJar.archiveFile }
into file('path') // path to plugins folder into file('path') // path to plugins folder
rename { fileName -> "craftattack.jar" } rename { fileName -> "craftattack.jar" }
} }
+1 -1
View File
@@ -2,7 +2,7 @@ dependencies {
implementation project(':core') implementation project(':core')
implementation project(':common') implementation project(':common')
compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT' compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable'
implementation 'org.apache.httpcomponents:httpclient:4.5.14' implementation 'org.apache.httpcomponents:httpclient:4.5.14'
implementation 'com.sparkjava:spark-core:2.9.4' implementation 'com.sparkjava:spark-core:2.9.4'
} }
@@ -11,7 +11,7 @@ import org.bukkit.event.player.PlayerItemConsumeEvent;
import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import javax.annotation.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Collection; import java.util.Collection;
class ForbiddenPotionsListener extends ApplianceListener<ForbiddenItems> { class ForbiddenPotionsListener extends ApplianceListener<ForbiddenItems> {