Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
worldedit = "7.3.9"
worldedit = "7.3.18"

# Minimum versions we apply to make dependencies support newer Java
minimumAsm = "9.7"
Expand Down Expand Up @@ -27,7 +27,7 @@ junit-jupiter-api.module = "org.junit.jupiter:junit-jupiter-api"
junit-jupiter-params.module = "org.junit.jupiter:junit-jupiter-params"
junit-jupiter-engine.module = "org.junit.jupiter:junit-jupiter-engine"

paperApi = "io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT"
paperApi = "io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT"
paperLib = "io.papermc:paperlib:1.0.8"

dummypermscompat = "com.sk89q:dummypermscompat:1.10"
Expand All @@ -42,10 +42,10 @@ commandbook = "com.sk89q:commandbook:2.3"
hamcrest-library = "org.hamcrest:hamcrest-library:2.2"

# Mojang-provided libraries, CHECK AGAINST MINECRAFT for versions
guava = "com.google.guava:guava:33.3.1-jre!!"
guava = "com.google.guava:guava:33.5.0-jre!!"
log4j-bom = "org.apache.logging.log4j:log4j-bom:2.24.1!!"
gson = "com.google.code.gson:gson:2.11.0!!"
fastutil = "it.unimi.dsi:fastutil:8.5.15!!"
gson = "com.google.code.gson:gson:2.13.2!!"
fastutil = "it.unimi.dsi:fastutil:8.5.18!!"

# Bukkit-provided libraries, CHECK AGAINST SPIGOT for versions
# Note that we need to balance support for older MC versus working at all on newer ones, so the exact versions here
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -947,9 +947,22 @@ private static void putMaterialTag(Tag<Material> tag, Integer value) {

// 1.21.6
MATERIAL_FLAGS.put(Material.DRIED_GHAST, 0);
putMaterialTag(Tag.ITEMS_HARNESSES, 0);

// 1.21.9
MATERIAL_FLAGS.put(Material.COPPER_TORCH, 0);
MATERIAL_FLAGS.put(Material.COPPER_WALL_TORCH, 0);
MATERIAL_FLAGS.put(Material.COPPER_HELMET, 0);
MATERIAL_FLAGS.put(Material.COPPER_CHESTPLATE, 0);
MATERIAL_FLAGS.put(Material.COPPER_LEGGINGS, 0);
MATERIAL_FLAGS.put(Material.COPPER_BOOTS, 0);
MATERIAL_FLAGS.put(Material.COPPER_HORSE_ARMOR, 0);
MATERIAL_FLAGS.put(Material.COPPER_SWORD, 0);
MATERIAL_FLAGS.put(Material.COPPER_PICKAXE, 0);
MATERIAL_FLAGS.put(Material.COPPER_AXE, 0);
MATERIAL_FLAGS.put(Material.COPPER_SHOVEL, 0);
MATERIAL_FLAGS.put(Material.COPPER_HOE, 0);
MATERIAL_FLAGS.put(Material.COPPER_NUGGET, 0);
putMaterialTag(Tag.BARS, 0);
putMaterialTag(Tag.CHAINS, 0);
putMaterialTag(Tag.COPPER_CHESTS, MODIFIED_ON_RIGHT);
Expand All @@ -958,6 +971,15 @@ private static void putMaterialTag(Tag<Material> tag, Integer value) {
putMaterialTag(Tag.LIGHTNING_RODS, 0);
putMaterialTag(Tag.WOODEN_SHELVES, MODIFIED_ON_RIGHT);

// 1.21.11
MATERIAL_FLAGS.put(Material.COPPER_NAUTILUS_ARMOR, 0);
MATERIAL_FLAGS.put(Material.IRON_NAUTILUS_ARMOR, 0);
MATERIAL_FLAGS.put(Material.GOLDEN_NAUTILUS_ARMOR, 0);
MATERIAL_FLAGS.put(Material.DIAMOND_NAUTILUS_ARMOR, 0);
MATERIAL_FLAGS.put(Material.NETHERITE_NAUTILUS_ARMOR, 0);
MATERIAL_FLAGS.put(Material.NETHERITE_HORSE_ARMOR, 0);
putMaterialTag(Tag.ITEMS_SPEARS, 0);

Stream.concat(Stream.concat(
Tag.CORAL_BLOCKS.getValues().stream(),
Tag.CORALS.getValues().stream()),
Expand Down Expand Up @@ -1232,8 +1254,9 @@ public static EntityType getEntitySpawnEgg(Material material) {
case BLAZE_SPAWN_EGG -> EntityType.BLAZE;
case BOGGED_SPAWN_EGG -> EntityType.BOGGED;
case BREEZE_SPAWN_EGG -> EntityType.BREEZE;
case CAT_SPAWN_EGG -> EntityType.CAT;
case CAMEL_HUSK_SPAWN_EGG -> EntityType.CAMEL_HUSK;
case CAMEL_SPAWN_EGG -> EntityType.CAMEL;
case CAT_SPAWN_EGG -> EntityType.CAT;
case CAVE_SPIDER_SPAWN_EGG -> EntityType.CAVE_SPIDER;
case CHICKEN_SPAWN_EGG -> EntityType.CHICKEN;
case COD_SPAWN_EGG -> EntityType.COD;
Expand All @@ -1245,9 +1268,9 @@ public static EntityType getEntitySpawnEgg(Material material) {
case DONKEY_SPAWN_EGG -> EntityType.DONKEY;
case DROWNED_SPAWN_EGG -> EntityType.DROWNED;
case ELDER_GUARDIAN_SPAWN_EGG -> EntityType.ELDER_GUARDIAN;
case ENDER_DRAGON_SPAWN_EGG -> EntityType.ENDER_DRAGON;
case ENDERMAN_SPAWN_EGG -> EntityType.ENDERMAN;
case ENDERMITE_SPAWN_EGG -> EntityType.ENDERMITE;
case ENDER_DRAGON_SPAWN_EGG -> EntityType.ENDER_DRAGON;
case EVOKER_SPAWN_EGG -> EntityType.EVOKER;
case FOX_SPAWN_EGG -> EntityType.FOX;
case FROG_SPAWN_EGG -> EntityType.FROG;
Expand All @@ -1264,12 +1287,15 @@ public static EntityType getEntitySpawnEgg(Material material) {
case MAGMA_CUBE_SPAWN_EGG -> EntityType.MAGMA_CUBE;
case MOOSHROOM_SPAWN_EGG -> EntityType.MOOSHROOM;
case MULE_SPAWN_EGG -> EntityType.MULE;
case NAUTILUS_SPAWN_EGG -> EntityType.NAUTILUS;
case OCELOT_SPAWN_EGG -> EntityType.OCELOT;
case PANDA_SPAWN_EGG -> EntityType.PANDA;
case PARCHED_SPAWN_EGG -> EntityType.PARCHED;
case PARROT_SPAWN_EGG -> EntityType.PARROT;
case PHANTOM_SPAWN_EGG -> EntityType.PHANTOM;
case PIGLIN_BRUTE_SPAWN_EGG -> EntityType.PIGLIN_BRUTE;
case PIGLIN_SPAWN_EGG -> EntityType.PIGLIN;
case PIG_SPAWN_EGG -> EntityType.PIG;
case PILLAGER_SPAWN_EGG -> EntityType.PILLAGER;
case POLAR_BEAR_SPAWN_EGG -> EntityType.POLAR_BEAR;
case PUFFERFISH_SPAWN_EGG -> EntityType.PUFFERFISH;
Expand Down Expand Up @@ -1298,15 +1324,15 @@ public static EntityType getEntitySpawnEgg(Material material) {
case WANDERING_TRADER_SPAWN_EGG -> EntityType.WANDERING_TRADER;
case WARDEN_SPAWN_EGG -> EntityType.WARDEN;
case WITCH_SPAWN_EGG -> EntityType.WITCH;
case WITHER_SPAWN_EGG -> EntityType.WITHER;
case WITHER_SKELETON_SPAWN_EGG -> EntityType.WITHER_SKELETON;
case WITHER_SPAWN_EGG -> EntityType.WITHER;
case WOLF_SPAWN_EGG -> EntityType.WOLF;
case ZOGLIN_SPAWN_EGG -> EntityType.ZOGLIN;
case ZOMBIE_HORSE_SPAWN_EGG -> EntityType.ZOMBIE_HORSE;
case ZOMBIFIED_PIGLIN_SPAWN_EGG -> EntityType.ZOMBIFIED_PIGLIN;
case ZOMBIE_NAUTILUS_SPAWN_EGG -> EntityType.ZOMBIE_NAUTILUS;
case ZOMBIE_SPAWN_EGG -> EntityType.ZOMBIE;
case ZOMBIE_VILLAGER_SPAWN_EGG -> EntityType.ZOMBIE_VILLAGER;
case PIG_SPAWN_EGG -> EntityType.PIG;
case ZOMBIFIED_PIGLIN_SPAWN_EGG -> EntityType.ZOMBIFIED_PIGLIN;
default -> null;
};
}
Expand Down
2 changes: 1 addition & 1 deletion worldguard-bukkit/src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ name: WorldGuard
main: com.sk89q.worldguard.bukkit.WorldGuardPlugin
version: "${internalVersion}"
depend: [WorldEdit]
api-version: "1.21.10"
api-version: "1.21.11"