mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-26 00:55:28 +02:00
Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
6fc25bc034 | ||
![]() |
1054018e1e | ||
![]() |
0508a7f6b6 | ||
![]() |
da0a57a48c | ||
![]() |
87859b002b | ||
![]() |
4f4ba07bd2 | ||
![]() |
53771a3ece |
@@ -837,7 +837,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
|
|||||||
case "HOPPER_MINECART":
|
case "HOPPER_MINECART":
|
||||||
case "MINECART_MOB_SPAWNER":
|
case "MINECART_MOB_SPAWNER":
|
||||||
case "SPAWNER_MINECART":
|
case "SPAWNER_MINECART":
|
||||||
case "ENDER_CRYSTAL":
|
case "END_CRYSTAL":
|
||||||
|
case "ENDER_CRYSTAL": // Backwards compatibility for 1.20.4
|
||||||
case "MINECART_TNT":
|
case "MINECART_TNT":
|
||||||
case "TNT_MINECART":
|
case "TNT_MINECART":
|
||||||
case "CHEST_BOAT":
|
case "CHEST_BOAT":
|
||||||
@@ -955,6 +956,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
|
|||||||
case "ENDERMITE":
|
case "ENDERMITE":
|
||||||
case "ENDER_DRAGON":
|
case "ENDER_DRAGON":
|
||||||
case "GHAST":
|
case "GHAST":
|
||||||
|
case "HAPPY_GHAST": // 1.21.6+
|
||||||
|
case "GHASTLING": // 1.21.6+
|
||||||
case "GIANT":
|
case "GIANT":
|
||||||
case "GUARDIAN":
|
case "GUARDIAN":
|
||||||
case "HORSE":
|
case "HORSE":
|
||||||
|
@@ -115,7 +115,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
|||||||
this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType());
|
this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType());
|
||||||
storeInventory(boat);
|
storeInventory(boat);
|
||||||
}
|
}
|
||||||
case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
|
case "ARROW", "EGG", "END_CRYSTAL", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
|
||||||
"FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
|
"FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
|
||||||
"MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
|
"MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
|
||||||
"THROWN_EXP_BOTTLE", "WITHER_SKULL", "UNKNOWN", "SPECTRAL_ARROW", "SHULKER_BULLET", "DRAGON_FIREBALL", "AREA_EFFECT_CLOUD",
|
"THROWN_EXP_BOTTLE", "WITHER_SKULL", "UNKNOWN", "SPECTRAL_ARROW", "SHULKER_BULLET", "DRAGON_FIREBALL", "AREA_EFFECT_CLOUD",
|
||||||
@@ -272,7 +272,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
|||||||
this.dataByte = (byte) entity1.getPhase().ordinal();
|
this.dataByte = (byte) entity1.getPhase().ordinal();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
|
case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "HAPPY_GHAST", "GHASTLING", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
|
||||||
"ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH",
|
"ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH",
|
||||||
"GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN", "SNOW_GOLEM" -> {
|
"GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN", "SNOW_GOLEM" -> {
|
||||||
storeLiving((LivingEntity) entity);
|
storeLiving((LivingEntity) entity);
|
||||||
@@ -511,7 +511,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
|||||||
((Slime) entity).setSize(this.dataByte);
|
((Slime) entity).setSize(this.dataByte);
|
||||||
return entity;
|
return entity;
|
||||||
} */
|
} */
|
||||||
case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
|
case "ARROW", "EGG", "END_CRYSTAL", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
|
||||||
"FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
|
"FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
|
||||||
"MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
|
"MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
|
||||||
"SPLASH_POTION", "THROWN_EXP_BOTTLE", "SPECTRAL_ARROW", "SHULKER_BULLET", "AREA_EFFECT_CLOUD",
|
"SPLASH_POTION", "THROWN_EXP_BOTTLE", "SPECTRAL_ARROW", "SHULKER_BULLET", "AREA_EFFECT_CLOUD",
|
||||||
@@ -676,7 +676,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
|||||||
restoreLiving((LivingEntity) entity);
|
restoreLiving((LivingEntity) entity);
|
||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
case "ENDERMITE", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> {
|
case "ENDERMITE", "GHAST", "HAPPY_GHAST", "GHASTLING", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> {
|
||||||
restoreLiving((LivingEntity) entity);
|
restoreLiving((LivingEntity) entity);
|
||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
|
@@ -79,6 +79,7 @@ import com.plotsquared.core.util.task.TaskManager;
|
|||||||
import com.plotsquared.core.util.task.TaskTime;
|
import com.plotsquared.core.util.task.TaskTime;
|
||||||
import com.sk89q.worldedit.WorldEdit;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
|
import com.sk89q.worldedit.util.Enums;
|
||||||
import com.sk89q.worldedit.world.block.BlockType;
|
import com.sk89q.worldedit.world.block.BlockType;
|
||||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||||
import io.papermc.lib.PaperLib;
|
import io.papermc.lib.PaperLib;
|
||||||
@@ -159,6 +160,7 @@ import java.util.Collections;
|
|||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
@@ -183,6 +185,15 @@ public class PlayerEventListener implements Listener {
|
|||||||
Material.WRITABLE_BOOK,
|
Material.WRITABLE_BOOK,
|
||||||
Material.WRITTEN_BOOK
|
Material.WRITTEN_BOOK
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The correct EntityType for End Crystal, determined once at class loading time.
|
||||||
|
* Tries END_CRYSTAL first (1.21+), falls back to ENDER_CRYSTAL (1.20.4 and older).
|
||||||
|
*/
|
||||||
|
private static final EntityType END_CRYSTAL_ENTITY_TYPE = Objects.requireNonNull(
|
||||||
|
Enums.findByValue(EntityType.class, "END_CRYSTAL", "ENDER_CRYSTAL")
|
||||||
|
);
|
||||||
|
|
||||||
private static final Set<String> DYES;
|
private static final Set<String> DYES;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
@@ -1317,8 +1328,8 @@ public class PlayerEventListener implements Listener {
|
|||||||
// reset the player's hand item if spawning needs to be cancelled.
|
// reset the player's hand item if spawning needs to be cancelled.
|
||||||
if (type == Material.ARMOR_STAND || type == Material.END_CRYSTAL) {
|
if (type == Material.ARMOR_STAND || type == Material.END_CRYSTAL) {
|
||||||
Plot plot = location.getOwnedPlotAbs();
|
Plot plot = location.getOwnedPlotAbs();
|
||||||
if (BukkitEntityUtil.checkEntity(type == Material.ARMOR_STAND ? EntityType.ARMOR_STAND : EntityType.ENDER_CRYSTAL,
|
EntityType entityType = type == Material.ARMOR_STAND ? EntityType.ARMOR_STAND : END_CRYSTAL_ENTITY_TYPE;
|
||||||
plot)) {
|
if (BukkitEntityUtil.checkEntity(entityType, plot)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@@ -101,6 +101,10 @@ public class Grant extends Command {
|
|||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
access.set(access.get().orElse(0) + 1);
|
access.set(access.get().orElse(0) + 1);
|
||||||
|
player.sendMessage(
|
||||||
|
TranslatableCaption.of("grants.added"),
|
||||||
|
TagResolver.resolver("grants", Tag.inserting(Component.text(access.get().orElse(0))))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@@ -63,4 +63,18 @@ public class PlotTitle {
|
|||||||
return subtitle;
|
return subtitle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provides a string representation of this plot title value (used in placeholders).
|
||||||
|
*
|
||||||
|
* @return the plot title representation in the format {@code "<title>" "<subtitle>"}
|
||||||
|
* @since TODO
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "\"%s\" \"%s\"".formatted(
|
||||||
|
this.title != null ? this.title : "",
|
||||||
|
this.subtitle != null ? this.subtitle : ""
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -456,7 +456,7 @@
|
|||||||
"category.command_category_debug": "<gray>Debug</gray>",
|
"category.command_category_debug": "<gray>Debug</gray>",
|
||||||
"category.command_category_administration": "<gray>Admin</gray>",
|
"category.command_category_administration": "<gray>Admin</gray>",
|
||||||
"grants.granted_plots": "<prefix><gold>Result: <gray><amount> </gray>grants left.</gold>",
|
"grants.granted_plots": "<prefix><gold>Result: <gray><amount> </gray>grants left.</gold>",
|
||||||
"grants.added": "<prefix><gold><grants></gold> <gray>grant(s) have been added.</gray>",
|
"grants.added": "<prefix><gold>1</gold> <gray>grant has been added. (<grants> total grants)</gray>",
|
||||||
"events.event_denied": "<prefix><gold><value> </gold><gray>Cancelled by external plugin.</gray>",
|
"events.event_denied": "<prefix><gold><value> </gold><gray>Cancelled by external plugin.</gray>",
|
||||||
"backups.backup_impossible": "<prefix><red>Backups are not enabled for this plot: <plot>.</red>",
|
"backups.backup_impossible": "<prefix><red>Backups are not enabled for this plot: <plot>.</red>",
|
||||||
"backups.backup_save_success": "<prefix><gold>The backup was created successfully.</gold>",
|
"backups.backup_save_success": "<prefix><gold>The backup was created successfully.</gold>",
|
||||||
|
@@ -37,12 +37,7 @@ class ClickStripTransformTest {
|
|||||||
void removeClickEvent() {
|
void removeClickEvent() {
|
||||||
var commonAction = ClickEvent.Action.OPEN_FILE;
|
var commonAction = ClickEvent.Action.OPEN_FILE;
|
||||||
var transform = new ClickStripTransform(EnumSet.of(commonAction));
|
var transform = new ClickStripTransform(EnumSet.of(commonAction));
|
||||||
var component = Component.text("Hello")
|
var component = Component.text("Hello").clickEvent(ClickEvent.openFile("World"));
|
||||||
.clickEvent(ClickEvent.clickEvent(
|
|
||||||
commonAction,
|
|
||||||
"World"
|
|
||||||
)
|
|
||||||
);
|
|
||||||
var transformedComponent = transform.transform(component);
|
var transformedComponent = transform.transform(component);
|
||||||
Assertions.assertNull(transformedComponent.clickEvent());
|
Assertions.assertNull(transformedComponent.clickEvent());
|
||||||
}
|
}
|
||||||
@@ -52,10 +47,7 @@ class ClickStripTransformTest {
|
|||||||
void ignoreClickEvent() {
|
void ignoreClickEvent() {
|
||||||
var actionToRemove = ClickEvent.Action.SUGGEST_COMMAND;
|
var actionToRemove = ClickEvent.Action.SUGGEST_COMMAND;
|
||||||
var transform = new ClickStripTransform(EnumSet.of(actionToRemove));
|
var transform = new ClickStripTransform(EnumSet.of(actionToRemove));
|
||||||
var originalClickEvent = ClickEvent.clickEvent(
|
var originalClickEvent = ClickEvent.changePage(1337);
|
||||||
ClickEvent.Action.CHANGE_PAGE,
|
|
||||||
"World"
|
|
||||||
);
|
|
||||||
var component = Component.text("Hello")
|
var component = Component.text("Hello")
|
||||||
.clickEvent(originalClickEvent);
|
.clickEvent(originalClickEvent);
|
||||||
var transformedComponent = transform.transform(component);
|
var transformedComponent = transform.transform(component);
|
||||||
@@ -76,12 +68,12 @@ class ClickStripTransformTest {
|
|||||||
.insertion("DEF");
|
.insertion("DEF");
|
||||||
var component = Component.text("Hello ")
|
var component = Component.text("Hello ")
|
||||||
.append(
|
.append(
|
||||||
inner.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, "https://example.org"))
|
inner.clickEvent(ClickEvent.openUrl("https://example.org"))
|
||||||
);
|
);
|
||||||
var transformedComponent = transform.transform(component);
|
var transformedComponent = transform.transform(component);
|
||||||
Assertions.assertFalse(transformedComponent.children().isEmpty()); // child still exists
|
Assertions.assertFalse(transformedComponent.children().isEmpty()); // child still exists
|
||||||
Assertions.assertEquals(inner, transformedComponent.children().get(0)); // only the click event has changed
|
Assertions.assertEquals(inner, transformedComponent.children().getFirst()); // only the click event has changed
|
||||||
Assertions.assertNull(transformedComponent.children().get(0).clickEvent());
|
Assertions.assertNull(transformedComponent.children().getFirst().clickEvent());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -1,9 +1,7 @@
|
|||||||
import com.diffplug.gradle.spotless.SpotlessPlugin
|
import com.diffplug.gradle.spotless.SpotlessPlugin
|
||||||
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
|
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
|
||||||
import com.vanniktech.maven.publish.SonatypeHost
|
|
||||||
import groovy.json.JsonSlurper
|
import groovy.json.JsonSlurper
|
||||||
import xyz.jpenilla.runpaper.task.RunServer
|
import xyz.jpenilla.runpaper.task.RunServer
|
||||||
import java.net.URI
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
@@ -172,7 +170,7 @@ subprojects {
|
|||||||
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
|
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
|
||||||
}
|
}
|
||||||
|
|
||||||
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
|
publishToMavenCentral()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,7 +204,7 @@ tasks.getByName<Jar>("jar") {
|
|||||||
enabled = false
|
enabled = false
|
||||||
}
|
}
|
||||||
|
|
||||||
val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5")
|
val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8")
|
||||||
tasks {
|
tasks {
|
||||||
register("cacheLatestFaweArtifact") {
|
register("cacheLatestFaweArtifact") {
|
||||||
val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
|
val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
|
||||||
|
@@ -7,7 +7,7 @@ checkerqual = "3.49.5"
|
|||||||
gson = "2.10"
|
gson = "2.10"
|
||||||
guava = "31.1-jre"
|
guava = "31.1-jre"
|
||||||
snakeyaml = "2.0"
|
snakeyaml = "2.0"
|
||||||
adventure = "4.21.0"
|
adventure = "4.23.0"
|
||||||
adventure-bukkit = "4.4.0"
|
adventure-bukkit = "4.4.0"
|
||||||
log4j = "2.19.0"
|
log4j = "2.19.0"
|
||||||
|
|
||||||
@@ -35,8 +35,8 @@ serverlib = "2.3.7"
|
|||||||
# Gradle plugins
|
# Gradle plugins
|
||||||
shadow = "8.3.8"
|
shadow = "8.3.8"
|
||||||
grgit = "4.1.1"
|
grgit = "4.1.1"
|
||||||
spotless = "7.1.0"
|
spotless = "7.2.0"
|
||||||
publish = "0.33.0"
|
publish = "0.34.0"
|
||||||
runPaper = "2.3.1"
|
runPaper = "2.3.1"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
Reference in New Issue
Block a user