Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-12-23 09:37:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1971 from EngineHub/version/1.19.3

Browse Source 
Update to Minecraft 1.19.3
This commit is contained in:
JOO200 2022-12-19 11:01:20 +01:00 committed by GitHub
commit 8bc7ff49ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 186 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
buildSrc/src/main/kotlin/Versions.kt
View File

@ -1,9 +1,10 @@
object Versions { object Versions {
// const val PISTON = "0.4.3" // const val PISTON = "0.4.3"
// const val AUTO_VALUE = "1.6.5" // const val AUTO_VALUE = "1.6.5"
const val WORLDEDIT = "7.2.10" const val WORLDEDIT = "7.2.12"
const val JUNIT = "5.7.0" const val JUNIT = "5.9.1"
const val SQUIRRELID = "0.3.0" const val MOCKITO = "4.9.0"
const val GUAVA = "31.0.1-jre" const val SQUIRRELID = "0.3.1"
const val MOCKITO = "3.7.7" const val GUAVA = "31.1-jre"
const val FINDBUGS = "3.0.2"
} }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

18
gradlew vendored
View File

@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@ -80,10 +80,10 @@ do
esac esac
done done
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # This is normally unused
# shellcheck disable=SC2034
APP_NAME="Gradle"
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
case $MAX_FD in #( case $MAX_FD in #(
'' | soft) :;; #( '' | soft) :;; #(
*) *)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac esac
@ -205,6 +209,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \ org.gradle.wrapper.GradleWrapperMain \
"$@" "$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args. # Use "xargs" to parse quoted args.
# #
# With -n1 it outputs one arg per line, with the quotes and backslashes removed. # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

15
gradlew.bat vendored
View File

@ -14,7 +14,7 @@
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd if %ERRORLEVEL% equ 0 goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 set EXIT_CODE=%ERRORLEVEL%
exit /b 1 if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal

6
worldguard-bukkit/build.gradle.kts
View File

@ -28,15 +28,15 @@
dependencies { dependencies {
"api"(project(":worldguard-core")) "api"(project(":worldguard-core"))
"compileOnly"("io.papermc.paper:paper-api:1.19-R0.1-SNAPSHOT") "compileOnly"("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
"runtimeOnly"("org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT") { "runtimeOnly"("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT") {
exclude("junit", "junit") exclude("junit", "junit")
} }
"api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false } "api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }
"implementation"("com.google.guava:guava:${Versions.GUAVA}") "implementation"("com.google.guava:guava:${Versions.GUAVA}")
"compileOnly"("com.sk89q:commandbook:2.3") { isTransitive = false } "compileOnly"("com.sk89q:commandbook:2.3") { isTransitive = false }
"shadeOnly"("io.papermc:paperlib:1.0.7") "shadeOnly"("io.papermc:paperlib:1.0.7")
"shadeOnly"("org.bstats:bstats-bukkit:2.1.0") "shadeOnly"("org.bstats:bstats-bukkit:3.0.0")
"shadeOnly"("co.aikar:minecraft-timings:1.0.4") "shadeOnly"("co.aikar:minecraft-timings:1.0.4")
} }

7
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View File

@ -1197,10 +1197,13 @@ private static <T extends Event & Cancellable> void handleBlockRightClick(T even
} }
// Handle created spawn eggs // Handle created spawn eggs
if (item != null && Materials.isSpawnEgg(item.getType())) { if (item != null) {
Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), Materials.getEntitySpawnEgg(item.getType()))); EntityType possibleEntityType = Materials.getEntitySpawnEgg(item.getType());
if (possibleEntityType != null) {
Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), possibleEntityType));
return; return;
} }
}
// handle water/lava placement // handle water/lava placement
if (item != null && (item.getType() == Material.WATER_BUCKET || item.getType() == Material.LAVA_BUCKET)) { if (item != null && (item.getType() == Material.WATER_BUCKET || item.getType() == Material.LAVA_BUCKET)) {

417
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java
View File

@ -52,6 +52,11 @@ public final class Materials {
private static final Map<Material, Integer> MATERIAL_FLAGS = new EnumMap<>(Material.class); private static final Map<Material, Integer> MATERIAL_FLAGS = new EnumMap<>(Material.class);
private static final Set<PotionEffectType> DAMAGE_EFFECTS = new HashSet<>(); private static final Set<PotionEffectType> DAMAGE_EFFECTS = new HashSet<>();
private static void putMaterialTag(Tag<Material> tag, Integer value) {
tag.getValues().forEach(mat -> MATERIAL_FLAGS.put(mat, value));
}
private static Tag<Material> SIGNS_TAG;
static { static {
ENTITY_ITEMS.put(EntityType.PAINTING, Material.PAINTING); ENTITY_ITEMS.put(EntityType.PAINTING, Material.PAINTING);
ENTITY_ITEMS.put(EntityType.ARROW, Material.ARROW); ENTITY_ITEMS.put(EntityType.ARROW, Material.ARROW);
@ -110,7 +115,7 @@ public final class Materials {
MATERIAL_FLAGS.put(Material.IRON_BLOCK, 0); MATERIAL_FLAGS.put(Material.IRON_BLOCK, 0);
MATERIAL_FLAGS.put(Material.BRICK, 0); MATERIAL_FLAGS.put(Material.BRICK, 0);
MATERIAL_FLAGS.put(Material.TNT, MODIFIED_ON_RIGHT); MATERIAL_FLAGS.put(Material.TNT, MODIFIED_ON_RIGHT);
MATERIAL_FLAGS.put(Material.BOOKSHELF, 0); MATERIAL_FLAGS.put(Material.BOOKSHELF, MODIFIED_ON_RIGHT);
MATERIAL_FLAGS.put(Material.MOSSY_COBBLESTONE, 0); MATERIAL_FLAGS.put(Material.MOSSY_COBBLESTONE, 0);
MATERIAL_FLAGS.put(Material.OBSIDIAN, 0); MATERIAL_FLAGS.put(Material.OBSIDIAN, 0);
MATERIAL_FLAGS.put(Material.TORCH, 0); MATERIAL_FLAGS.put(Material.TORCH, 0);
@ -815,111 +820,54 @@ public final class Materials {
MATERIAL_FLAGS.put(Material.ECHO_SHARD, 0); MATERIAL_FLAGS.put(Material.ECHO_SHARD, 0);
MATERIAL_FLAGS.put(Material.REINFORCED_DEEPSLATE, 0); MATERIAL_FLAGS.put(Material.REINFORCED_DEEPSLATE, 0);
// 1.19.3: Try to register those things
try {
SIGNS_TAG = Tag.ALL_SIGNS;
MATERIAL_FLAGS.put(Material.BAMBOO_MOSAIC, 0);
MATERIAL_FLAGS.put(Material.BAMBOO_BLOCK, 0);
MATERIAL_FLAGS.put(Material.STRIPPED_BAMBOO_BLOCK, 0);
} catch (NoSuchFieldError ignored) {
SIGNS_TAG = Tag.SIGNS;
}
// Generated via tag // Generated via tag
for (Material woodenDoor : Tag.WOODEN_DOORS.getValues()) { putMaterialTag(Tag.WOODEN_DOORS, MODIFIED_ON_RIGHT);
MATERIAL_FLAGS.put(woodenDoor, MODIFIED_ON_RIGHT); putMaterialTag(Tag.WOODEN_TRAPDOORS, MODIFIED_ON_RIGHT);
} putMaterialTag(Tag.SHULKER_BOXES, MODIFIED_ON_RIGHT);
for (Material woodenTrapdoor : Tag.WOODEN_TRAPDOORS.getValues()) { putMaterialTag(Tag.ITEMS_BOATS, 0);
MATERIAL_FLAGS.put(woodenTrapdoor, MODIFIED_ON_RIGHT); putMaterialTag(Tag.BANNERS, 0);
} putMaterialTag(Tag.SLABS, 0);
for (Material shulkerBox : Tag.SHULKER_BOXES.getValues()) { putMaterialTag(Tag.PLANKS, 0);
MATERIAL_FLAGS.put(shulkerBox, MODIFIED_ON_RIGHT); putMaterialTag(Tag.WOOL_CARPETS, 0);
} putMaterialTag(Tag.SAPLINGS, 0);
for (Material boat : Tag.ITEMS_BOATS.getValues()) { putMaterialTag(Tag.LOGS, 0);
MATERIAL_FLAGS.put(boat, 0); putMaterialTag(Tag.LEAVES, 0);
} putMaterialTag(Tag.STAIRS, 0);
for (Material banner : Tag.BANNERS.getValues()) { putMaterialTag(Tag.WOOL, 0);
MATERIAL_FLAGS.put(banner, 0); putMaterialTag(Tag.WOODEN_PRESSURE_PLATES, 0);
} putMaterialTag(Tag.BUTTONS, MODIFIED_ON_RIGHT);
for (Material slab : Tag.SLABS.getValues()) { putMaterialTag(Tag.FLOWER_POTS, MODIFIED_ON_RIGHT);
MATERIAL_FLAGS.put(slab, 0); putMaterialTag(Tag.WALLS, 0);
} putMaterialTag(SIGNS_TAG, 0);
for (Material plank : Tag.PLANKS.getValues()) { putMaterialTag(Tag.SMALL_FLOWERS, 0);
MATERIAL_FLAGS.put(plank, 0); putMaterialTag(Tag.BEDS, MODIFIED_ON_RIGHT);
} putMaterialTag(Tag.ITEMS_MUSIC_DISCS, 0);
for (Material carpet : Tag.WOOL_CARPETS.getValues()) { putMaterialTag(Tag.ITEMS_BANNERS, 0);
MATERIAL_FLAGS.put(carpet, 0); putMaterialTag(Tag.FENCE_GATES, MODIFIED_ON_RIGHT);
} putMaterialTag(Tag.FENCES, 0);
for (Material sapling : Tag.SAPLINGS.getValues()) {
MATERIAL_FLAGS.put(sapling, 0); putMaterialTag(Tag.COAL_ORES, 0);
} putMaterialTag(Tag.IRON_ORES, 0);
for (Material log : Tag.LOGS.getValues()) { putMaterialTag(Tag.GOLD_ORES, 0);
MATERIAL_FLAGS.put(log, 0); putMaterialTag(Tag.DIAMOND_ORES, 0);
} putMaterialTag(Tag.REDSTONE_ORES, 0);
for (Material leaves : Tag.LEAVES.getValues()) { putMaterialTag(Tag.COPPER_ORES, 0);
MATERIAL_FLAGS.put(leaves, 0); putMaterialTag(Tag.EMERALD_ORES, 0);
} putMaterialTag(Tag.LAPIS_ORES, 0);
for (Material stair : Tag.STAIRS.getValues()) { putMaterialTag(Tag.CANDLES, MODIFIED_ON_RIGHT);
MATERIAL_FLAGS.put(stair, 0); putMaterialTag(Tag.CANDLE_CAKES, MODIFIED_ON_RIGHT);
} putMaterialTag(Tag.CAULDRONS, MODIFIED_ON_RIGHT);
for (Material wool : Tag.WOOL.getValues()) {
MATERIAL_FLAGS.put(wool, 0);
}
for (Material plate : Tag.WOODEN_PRESSURE_PLATES.getValues()) {
MATERIAL_FLAGS.put(plate, 0);
}
for (Material button : Tag.BUTTONS.getValues()) {
MATERIAL_FLAGS.put(button, MODIFIED_ON_RIGHT);
}
for (Material pot : Tag.FLOWER_POTS.getValues()) {
MATERIAL_FLAGS.put(pot, MODIFIED_ON_RIGHT);
}
for (Material wall : Tag.WALLS.getValues()) {
MATERIAL_FLAGS.put(wall, 0);
}
for (Material sign : Tag.SIGNS.getValues()) {
MATERIAL_FLAGS.put(sign, 0);
}
for (Material flower : Tag.SMALL_FLOWERS.getValues()) {
MATERIAL_FLAGS.put(flower, 0);
}
for (Material bed : Tag.BEDS.getValues()) {
MATERIAL_FLAGS.put(bed, MODIFIED_ON_RIGHT);
}
for (Material musicDisc : Tag.ITEMS_MUSIC_DISCS.getValues()) {
MATERIAL_FLAGS.put(musicDisc, 0);
}
for (Material bannerPat : Tag.ITEMS_BANNERS.getValues()) {
MATERIAL_FLAGS.put(bannerPat, 0);
}
for (Material fenceGate : Tag.FENCE_GATES.getValues()) {
MATERIAL_FLAGS.put(fenceGate, MODIFIED_ON_RIGHT);
}
for (Material fence : Tag.FENCES.getValues()) {
MATERIAL_FLAGS.put(fence, 0);
} for (Material coalOre : Tag.COAL_ORES.getValues()) {
MATERIAL_FLAGS.put(coalOre, 0);
}
for (Material ironOre : Tag.IRON_ORES.getValues()) {
MATERIAL_FLAGS.put(ironOre, 0);
}
for (Material goldOre : Tag.GOLD_ORES.getValues()) {
MATERIAL_FLAGS.put(goldOre, 0);
}
for (Material diamondOre : Tag.DIAMOND_ORES.getValues()) {
MATERIAL_FLAGS.put(diamondOre, 0);
}
for (Material redstoneOre : Tag.REDSTONE_ORES.getValues()) {
MATERIAL_FLAGS.put(redstoneOre, 0);
}
for (Material copperOre : Tag.COPPER_ORES.getValues()) {
MATERIAL_FLAGS.put(copperOre, 0);
}
for (Material emeraldOre : Tag.EMERALD_ORES.getValues()) {
MATERIAL_FLAGS.put(emeraldOre, 0);
}
for (Material lapisOre : Tag.LAPIS_ORES.getValues()) {
MATERIAL_FLAGS.put(lapisOre, 0);
}
for (Material candle : Tag.CANDLES.getValues()) {
MATERIAL_FLAGS.put(candle, MODIFIED_ON_RIGHT);
}
for (Material candleCakes : Tag.CANDLE_CAKES.getValues()) {
MATERIAL_FLAGS.put(candleCakes, MODIFIED_ON_RIGHT);
}
for (Material cauldron : Tag.CAULDRONS.getValues()) {
MATERIAL_FLAGS.put(cauldron, MODIFIED_ON_RIGHT);
}
Stream.concat(Stream.concat( Stream.concat(Stream.concat(
Tag.CORAL_BLOCKS.getValues().stream(), Tag.CORAL_BLOCKS.getValues().stream(),
@ -1170,173 +1118,89 @@ public static boolean isInventoryBlock(Material material) {
} }
public static boolean isSpawnEgg(Material material) { public static boolean isSpawnEgg(Material material) {
return switch (material) { return getEntitySpawnEgg(material) != null;
case AXOLOTL_SPAWN_EGG, BAT_SPAWN_EGG, BEE_SPAWN_EGG, BLAZE_SPAWN_EGG, CAT_SPAWN_EGG,
CAVE_SPIDER_SPAWN_EGG, CHICKEN_SPAWN_EGG, COD_SPAWN_EGG, COW_SPAWN_EGG, CREEPER_SPAWN_EGG,
DOLPHIN_SPAWN_EGG, DONKEY_SPAWN_EGG, DROWNED_SPAWN_EGG, ELDER_GUARDIAN_SPAWN_EGG,
ENDERMAN_SPAWN_EGG, ENDERMITE_SPAWN_EGG, EVOKER_SPAWN_EGG, FOX_SPAWN_EGG,
GHAST_SPAWN_EGG, GLOW_SQUID_SPAWN_EGG, GOAT_SPAWN_EGG, GUARDIAN_SPAWN_EGG,
HOGLIN_SPAWN_EGG, HORSE_SPAWN_EGG, HUSK_SPAWN_EGG, LLAMA_SPAWN_EGG, MAGMA_CUBE_SPAWN_EGG,
MOOSHROOM_SPAWN_EGG, MULE_SPAWN_EGG, OCELOT_SPAWN_EGG, PANDA_SPAWN_EGG, PARROT_SPAWN_EGG,
PHANTOM_SPAWN_EGG, PIGLIN_BRUTE_SPAWN_EGG, PIGLIN_SPAWN_EGG, PIG_SPAWN_EGG, PILLAGER_SPAWN_EGG,
POLAR_BEAR_SPAWN_EGG, PUFFERFISH_SPAWN_EGG, RABBIT_SPAWN_EGG, RAVAGER_SPAWN_EGG,
SALMON_SPAWN_EGG, SHEEP_SPAWN_EGG, SHULKER_SPAWN_EGG, SILVERFISH_SPAWN_EGG,
SKELETON_HORSE_SPAWN_EGG, SKELETON_SPAWN_EGG, SLIME_SPAWN_EGG, SPIDER_SPAWN_EGG,
SQUID_SPAWN_EGG, STRAY_SPAWN_EGG, STRIDER_SPAWN_EGG, TRADER_LLAMA_SPAWN_EGG,
TROPICAL_FISH_SPAWN_EGG, TURTLE_SPAWN_EGG, VEX_SPAWN_EGG, VILLAGER_SPAWN_EGG,
VINDICATOR_SPAWN_EGG, WANDERING_TRADER_SPAWN_EGG, WITCH_SPAWN_EGG, WITHER_SKELETON_SPAWN_EGG,
WOLF_SPAWN_EGG, ZOGLIN_SPAWN_EGG, ZOMBIE_HORSE_SPAWN_EGG, ZOMBIFIED_PIGLIN_SPAWN_EGG,
ZOMBIE_SPAWN_EGG, ZOMBIE_VILLAGER_SPAWN_EGG, ALLAY_SPAWN_EGG, FROG_SPAWN_EGG, TADPOLE_SPAWN_EGG,
WARDEN_SPAWN_EGG ->
true;
default -> false;
};
} }
public static EntityType getEntitySpawnEgg(Material material) { public static EntityType getEntitySpawnEgg(Material material) {
switch (material) { return switch (material) {
case ALLAY_SPAWN_EGG: case ALLAY_SPAWN_EGG -> EntityType.ALLAY;
return EntityType.ALLAY; case AXOLOTL_SPAWN_EGG -> EntityType.AXOLOTL;
case AXOLOTL_SPAWN_EGG: case SPIDER_SPAWN_EGG -> EntityType.SPIDER;
return EntityType.AXOLOTL; case BAT_SPAWN_EGG -> EntityType.BAT;
case SPIDER_SPAWN_EGG: case BEE_SPAWN_EGG -> EntityType.BEE;
return EntityType.SPIDER; case BLAZE_SPAWN_EGG -> EntityType.BLAZE;
case BAT_SPAWN_EGG: case CAT_SPAWN_EGG -> EntityType.CAT;
return EntityType.BAT; case CAMEL_SPAWN_EGG -> EntityType.CAMEL;
case BEE_SPAWN_EGG: case CAVE_SPIDER_SPAWN_EGG -> EntityType.CAVE_SPIDER;
return EntityType.BEE; case CHICKEN_SPAWN_EGG -> EntityType.CHICKEN;
case BLAZE_SPAWN_EGG: case COD_SPAWN_EGG -> EntityType.COD;
return EntityType.BLAZE; case COW_SPAWN_EGG -> EntityType.COW;
case CAT_SPAWN_EGG: case CREEPER_SPAWN_EGG -> EntityType.CREEPER;
return EntityType.CAT; case DOLPHIN_SPAWN_EGG -> EntityType.DOLPHIN;
case CAVE_SPIDER_SPAWN_EGG: case DONKEY_SPAWN_EGG -> EntityType.DONKEY;
return EntityType.CAVE_SPIDER; case DROWNED_SPAWN_EGG -> EntityType.DROWNED;
case CHICKEN_SPAWN_EGG: case ELDER_GUARDIAN_SPAWN_EGG -> EntityType.ELDER_GUARDIAN;
return EntityType.CHICKEN; case ENDER_DRAGON_SPAWN_EGG -> EntityType.ENDER_DRAGON;
case COD_SPAWN_EGG: case ENDERMAN_SPAWN_EGG -> EntityType.ENDERMAN;
return EntityType.COD; case ENDERMITE_SPAWN_EGG -> EntityType.ENDERMITE;
case COW_SPAWN_EGG: case EVOKER_SPAWN_EGG -> EntityType.EVOKER;
return EntityType.COW; case FOX_SPAWN_EGG -> EntityType.FOX;
case CREEPER_SPAWN_EGG: case FROG_SPAWN_EGG -> EntityType.FROG;
return EntityType.CREEPER; case GHAST_SPAWN_EGG -> EntityType.GHAST;
case DOLPHIN_SPAWN_EGG: case GLOW_SQUID_SPAWN_EGG -> EntityType.GLOW_SQUID;
return EntityType.DOLPHIN; case GOAT_SPAWN_EGG -> EntityType.GOAT;
case DONKEY_SPAWN_EGG: case GUARDIAN_SPAWN_EGG -> EntityType.GUARDIAN;
return EntityType.DONKEY; case HOGLIN_SPAWN_EGG -> EntityType.HOGLIN;
case DROWNED_SPAWN_EGG: case HORSE_SPAWN_EGG -> EntityType.HORSE;
return EntityType.DROWNED; case HUSK_SPAWN_EGG -> EntityType.HUSK;
case ELDER_GUARDIAN_SPAWN_EGG: case IRON_GOLEM_SPAWN_EGG -> EntityType.IRON_GOLEM;
return EntityType.ELDER_GUARDIAN; case LLAMA_SPAWN_EGG -> EntityType.LLAMA;
case ENDERMAN_SPAWN_EGG: case MAGMA_CUBE_SPAWN_EGG -> EntityType.MAGMA_CUBE;
return EntityType.ENDERMAN; case MOOSHROOM_SPAWN_EGG -> EntityType.MUSHROOM_COW;
case ENDERMITE_SPAWN_EGG: case MULE_SPAWN_EGG -> EntityType.MULE;
return EntityType.ENDERMITE; case OCELOT_SPAWN_EGG -> EntityType.OCELOT;
case EVOKER_SPAWN_EGG: case PANDA_SPAWN_EGG -> EntityType.PANDA;
return EntityType.EVOKER; case PARROT_SPAWN_EGG -> EntityType.PARROT;
case FOX_SPAWN_EGG: case PHANTOM_SPAWN_EGG -> EntityType.PHANTOM;
return EntityType.FOX; case PIGLIN_BRUTE_SPAWN_EGG -> EntityType.PIGLIN_BRUTE;
case FROG_SPAWN_EGG: case PIGLIN_SPAWN_EGG -> EntityType.PIGLIN;
return EntityType.FROG; case PILLAGER_SPAWN_EGG -> EntityType.PILLAGER;
case GHAST_SPAWN_EGG: case POLAR_BEAR_SPAWN_EGG -> EntityType.POLAR_BEAR;
return EntityType.GHAST; case PUFFERFISH_SPAWN_EGG -> EntityType.PUFFERFISH;
case GLOW_SQUID_SPAWN_EGG: case RABBIT_SPAWN_EGG -> EntityType.RABBIT;
return EntityType.GLOW_SQUID; case RAVAGER_SPAWN_EGG -> EntityType.RAVAGER;
case GOAT_SPAWN_EGG: case SALMON_SPAWN_EGG -> EntityType.SALMON;
return EntityType.GOAT; case SHEEP_SPAWN_EGG -> EntityType.SHEEP;
case GUARDIAN_SPAWN_EGG: case SHULKER_SPAWN_EGG -> EntityType.SHULKER;
return EntityType.GUARDIAN; case SILVERFISH_SPAWN_EGG -> EntityType.SILVERFISH;
case HOGLIN_SPAWN_EGG: case SKELETON_HORSE_SPAWN_EGG -> EntityType.SKELETON_HORSE;
return EntityType.HOGLIN; case SKELETON_SPAWN_EGG -> EntityType.SKELETON;
case HORSE_SPAWN_EGG: case SLIME_SPAWN_EGG -> EntityType.SLIME;
return EntityType.HORSE; case SNOW_GOLEM_SPAWN_EGG -> EntityType.SNOWMAN;
case HUSK_SPAWN_EGG: case SQUID_SPAWN_EGG -> EntityType.SQUID;
return EntityType.HUSK; case STRAY_SPAWN_EGG -> EntityType.STRAY;
case LLAMA_SPAWN_EGG: case STRIDER_SPAWN_EGG -> EntityType.STRIDER;
return EntityType.LLAMA; case TADPOLE_SPAWN_EGG -> EntityType.TADPOLE;
case MAGMA_CUBE_SPAWN_EGG: case TRADER_LLAMA_SPAWN_EGG -> EntityType.TRADER_LLAMA;
return EntityType.MAGMA_CUBE; case TROPICAL_FISH_SPAWN_EGG -> EntityType.TROPICAL_FISH;
case MOOSHROOM_SPAWN_EGG: case TURTLE_SPAWN_EGG -> EntityType.TURTLE;
return EntityType.MUSHROOM_COW; case VEX_SPAWN_EGG -> EntityType.VEX;
case MULE_SPAWN_EGG: case VILLAGER_SPAWN_EGG -> EntityType.VILLAGER;
return EntityType.MULE; case VINDICATOR_SPAWN_EGG -> EntityType.VINDICATOR;
case OCELOT_SPAWN_EGG: case WANDERING_TRADER_SPAWN_EGG -> EntityType.WANDERING_TRADER;
return EntityType.OCELOT; case WARDEN_SPAWN_EGG -> EntityType.WARDEN;
case PANDA_SPAWN_EGG: case WITCH_SPAWN_EGG -> EntityType.WITCH;
return EntityType.PANDA; case WITHER_SPAWN_EGG -> EntityType.WITHER;
case PARROT_SPAWN_EGG: case WITHER_SKELETON_SPAWN_EGG -> EntityType.WITHER_SKELETON;
return EntityType.PARROT; case WOLF_SPAWN_EGG -> EntityType.WOLF;
case PHANTOM_SPAWN_EGG: case ZOGLIN_SPAWN_EGG -> EntityType.ZOGLIN;
return EntityType.PHANTOM; case ZOMBIE_HORSE_SPAWN_EGG -> EntityType.ZOMBIE_HORSE;
case PIGLIN_BRUTE_SPAWN_EGG: case ZOMBIFIED_PIGLIN_SPAWN_EGG -> EntityType.ZOMBIFIED_PIGLIN;
return EntityType.PIGLIN_BRUTE; case ZOMBIE_SPAWN_EGG -> EntityType.ZOMBIE;
case PIGLIN_SPAWN_EGG: case ZOMBIE_VILLAGER_SPAWN_EGG -> EntityType.ZOMBIE_VILLAGER;
return EntityType.PIGLIN; case PIG_SPAWN_EGG -> EntityType.PIG;
case PILLAGER_SPAWN_EGG: default -> null;
return EntityType.PILLAGER; };
case POLAR_BEAR_SPAWN_EGG:
return EntityType.POLAR_BEAR;
case PUFFERFISH_SPAWN_EGG:
return EntityType.PUFFERFISH;
case RABBIT_SPAWN_EGG:
return EntityType.RABBIT;
case RAVAGER_SPAWN_EGG:
return EntityType.RAVAGER;
case SALMON_SPAWN_EGG:
return EntityType.SALMON;
case SHEEP_SPAWN_EGG:
return EntityType.SHEEP;
case SHULKER_SPAWN_EGG:
return EntityType.SHULKER;
case SILVERFISH_SPAWN_EGG:
return EntityType.SILVERFISH;
case SKELETON_HORSE_SPAWN_EGG:
return EntityType.SKELETON_HORSE;
case SKELETON_SPAWN_EGG:
return EntityType.SKELETON;
case SLIME_SPAWN_EGG:
return EntityType.SLIME;
case SQUID_SPAWN_EGG:
return EntityType.SQUID;
case STRAY_SPAWN_EGG:
return EntityType.STRAY;
case STRIDER_SPAWN_EGG:
return EntityType.STRIDER;
case TADPOLE_SPAWN_EGG:
return EntityType.TADPOLE;
case TRADER_LLAMA_SPAWN_EGG:
return EntityType.TRADER_LLAMA;
case TROPICAL_FISH_SPAWN_EGG:
return EntityType.TROPICAL_FISH;
case TURTLE_SPAWN_EGG:
return EntityType.TURTLE;
case VEX_SPAWN_EGG:
return EntityType.VEX;
case VILLAGER_SPAWN_EGG:
return EntityType.VILLAGER;
case VINDICATOR_SPAWN_EGG:
return EntityType.VINDICATOR;
case WANDERING_TRADER_SPAWN_EGG:
return EntityType.WANDERING_TRADER;
case WARDEN_SPAWN_EGG:
return EntityType.WARDEN;
case WITCH_SPAWN_EGG:
return EntityType.WITCH;
case WITHER_SKELETON_SPAWN_EGG:
return EntityType.WITHER_SKELETON;
case WOLF_SPAWN_EGG:
return EntityType.WOLF;
case ZOMBIE_HORSE_SPAWN_EGG:
return EntityType.ZOMBIE_HORSE;
case ZOMBIFIED_PIGLIN_SPAWN_EGG:
return EntityType.ZOMBIFIED_PIGLIN;
case ZOMBIE_SPAWN_EGG:
return EntityType.ZOMBIE;
case ZOMBIE_VILLAGER_SPAWN_EGG:
return EntityType.ZOMBIE_VILLAGER;
case PIG_SPAWN_EGG:
default: // Uhh
return EntityType.PIG;
}
} }
public static boolean isBed(Material material) { public static boolean isBed(Material material) {
@ -1360,9 +1224,10 @@ public static boolean isCoral(Material material) {
* @return true if the material is a crop * @return true if the material is a crop
*/ */
public static boolean isCrop(Material type) { public static boolean isCrop(Material type) {
if (Tag.CROPS.isTagged(type)) return true;
// yea, that's not all, there are some more
return switch (type) { return switch (type) {
case WHEAT, CARROTS, POTATOES, BEETROOTS, MELON_STEM, PUMPKIN_STEM, case PUMPKIN, MELON, CACTUS, SUGAR_CANE, BAMBOO, BAMBOO_SAPLING,
PUMPKIN, MELON, CACTUS, SUGAR_CANE, BAMBOO, BAMBOO_SAPLING,
SWEET_BERRY_BUSH, NETHER_WART, CAVE_VINES, CAVE_VINES_PLANT -> SWEET_BERRY_BUSH, NETHER_WART, CAVE_VINES, CAVE_VINES_PLANT ->
true; true;
default -> false; default -> false;
@ -1517,7 +1382,6 @@ public static boolean isToolApplicable(Material toolMaterial, Material targetMat
case NETHERITE_HOE: case NETHERITE_HOE:
return switch (targetMaterial) { return switch (targetMaterial) {
case GRASS_BLOCK, DIRT, DIRT_PATH, ROOTED_DIRT -> case GRASS_BLOCK, DIRT, DIRT_PATH, ROOTED_DIRT ->
// case COARSE_DIRT: // already handled by the server...
true; true;
default -> false; default -> false;
}; };
@ -1527,11 +1391,10 @@ public static boolean isToolApplicable(Material toolMaterial, Material targetMat
case GOLDEN_AXE: case GOLDEN_AXE:
case DIAMOND_AXE: case DIAMOND_AXE:
case NETHERITE_AXE: case NETHERITE_AXE:
if (isWaxedCopper(targetMaterial)) if (isWaxedCopper(targetMaterial)) return true;
return true; if (Tag.LOGS.isTagged(targetMaterial)) return true;
return switch (targetMaterial) { return switch (targetMaterial) {
case OAK_LOG, DARK_OAK_LOG, ACACIA_LOG, BIRCH_LOG, SPRUCE_LOG, JUNGLE_LOG, case OAK_WOOD, DARK_OAK_WOOD, ACACIA_WOOD, BIRCH_WOOD, SPRUCE_WOOD, PUMPKIN, BAMBOO_BLOCK,
OAK_WOOD, DARK_OAK_WOOD, ACACIA_WOOD, BIRCH_WOOD, SPRUCE_WOOD,
JUNGLE_WOOD, CRIMSON_STEM, WARPED_STEM, CRIMSON_HYPHAE, WARPED_HYPHAE -> JUNGLE_WOOD, CRIMSON_STEM, WARPED_STEM, CRIMSON_HYPHAE, WARPED_HYPHAE ->
true; true;
default -> false; default -> false;
@ -1569,7 +1432,7 @@ public static boolean isToolApplicable(Material toolMaterial, Material targetMat
case YELLOW_DYE: case YELLOW_DYE:
case GLOW_INK_SAC: case GLOW_INK_SAC:
case INK_SAC: case INK_SAC:
return Tag.SIGNS.isTagged(targetMaterial); return SIGNS_TAG.isTagged(targetMaterial);
case HONEYCOMB: case HONEYCOMB:
return isUnwaxedCopper(targetMaterial); return isUnwaxedCopper(targetMaterial);
default: default:

2
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java
View File

@ -42,7 +42,7 @@ public ServerReport() {
onlineMode.append("BungeeCord support?", Bukkit.spigot().getConfig().getBoolean("settings.bungeecord", false)); onlineMode.append("BungeeCord support?", Bukkit.spigot().getConfig().getBoolean("settings.bungeecord", false));
} }
if (PaperLib.isPaper()) { if (PaperLib.isPaper()) {
onlineMode.append("Velocity support?", Bukkit.spigot().getPaperConfig().getBoolean("settings.velocity-support.enabled", false)); onlineMode.append("Velocity support?", Bukkit.spigot().getPaperConfig().getBoolean("proxies.velocity.enabled", false));
} }
append(onlineMode.getTitle(), onlineMode); append(onlineMode.getTitle(), onlineMode);

6
worldguard-core/build.gradle.kts
View File

@ -8,11 +8,11 @@
"api"(project(":worldguard-libs:core")) "api"(project(":worldguard-libs:core"))
"api"("com.sk89q.worldedit:worldedit-core:${Versions.WORLDEDIT}") "api"("com.sk89q.worldedit:worldedit-core:${Versions.WORLDEDIT}")
"implementation"("org.flywaydb:flyway-core:3.0") "implementation"("org.flywaydb:flyway-core:3.0")
"implementation"("org.yaml:snakeyaml:1.29") "implementation"("org.yaml:snakeyaml:1.33")
"implementation"("com.google.guava:guava:${Versions.GUAVA}") "implementation"("com.google.guava:guava:${Versions.GUAVA}")
"compileOnly"("com.google.code.findbugs:jsr305:1.3.9") "compileOnly"("com.google.code.findbugs:jsr305:${Versions.FINDBUGS}")
"testImplementation"("org.hamcrest:hamcrest-library:1.2.1") "testImplementation"("org.hamcrest:hamcrest-library:2.2")
} }
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {