diff --git a/build.gradle b/build.gradle index cafa929..31b1844 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ dependencies { compileOnly "org.spigotmc:spigot-api:${project.mc_version}-R0.1-SNAPSHOT" } -def targetJavaVersion = 16 +def targetJavaVersion = 21 java { def javaVersion = JavaVersion.toVersion(targetJavaVersion) sourceCompatibility = javaVersion diff --git a/build/resources/main/plugin.yml b/build/resources/main/plugin.yml index 4a11314..b716ca2 100644 --- a/build/resources/main/plugin.yml +++ b/build/resources/main/plugin.yml @@ -1,5 +1,5 @@ name: ExplosionsControl -version: '1.19.4' +version: '1.21.4' main: io.github.itzispyder.explosionscontrol.ExplosionsControl api-version: 1.19 authors: [ ImproperIssues ] diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 95e946c..39432d2 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/gradle.properties b/gradle.properties index adadd1b..63c7027 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,4 +3,4 @@ group= 'io.github.itzispyder' # Minecraft -mc_version= 1.19.4 \ No newline at end of file +mc_version= 1.21.4 \ No newline at end of file diff --git a/src/main/java/io/github/itzispyder/explosionscontrol/events/ExplosionListener.java b/src/main/java/io/github/itzispyder/explosionscontrol/events/ExplosionListener.java index fd37bfd..ac62307 100644 --- a/src/main/java/io/github/itzispyder/explosionscontrol/events/ExplosionListener.java +++ b/src/main/java/io/github/itzispyder/explosionscontrol/events/ExplosionListener.java @@ -77,11 +77,11 @@ public class ExplosionListener implements Listener { switch (damager.getType()) { case CREEPER -> e.setCancelled(config.getCreeperMode() == Mode.NONE); - case MINECART_TNT -> e.setCancelled(config.getMinecartMode() == Mode.NONE); + case TNT_MINECART -> e.setCancelled(config.getMinecartMode() == Mode.NONE); case FIREBALL -> e.setCancelled(config.getFireballMode() == Mode.NONE); case WITHER_SKULL -> e.setCancelled(config.getWitherMode() == Mode.NONE); - case PRIMED_TNT -> e.setCancelled(config.getTntMode() == Mode.NONE); - case ENDER_CRYSTAL -> e.setCancelled(config.getCrystalMode() == Mode.NONE); + case TNT -> e.setCancelled(config.getTntMode() == Mode.NONE); + case END_CRYSTAL -> e.setCancelled(config.getCrystalMode() == Mode.NONE); } } } @@ -97,11 +97,11 @@ public class ExplosionListener implements Listener { switch (ent.getType()) { case CREEPER -> determineOutcome(config.getCreeperMode(), e); - case MINECART_TNT -> determineOutcome(config.getMinecartMode(), e); + case TNT_MINECART -> determineOutcome(config.getMinecartMode(), e); case FIREBALL -> determineOutcome(config.getFireballMode(), e); case WITHER_SKULL -> determineOutcome(config.getWitherMode(), e); - case PRIMED_TNT -> determineOutcome(config.getTntMode(), e); - case ENDER_CRYSTAL -> determineOutcome(config.getCrystalMode(), e); + case TNT -> determineOutcome(config.getTntMode(), e); + case END_CRYSTAL -> determineOutcome(config.getCrystalMode(), e); } } @@ -145,6 +145,6 @@ public class ExplosionListener implements Listener { private void fakeExplode(Location center) { SoundPlayer sound = new SoundPlayer(center, Sound.ENTITY_GENERIC_EXPLODE, 10.0F, 0.7F); sound.playWithin(100.0); - center.getWorld().spawnParticle(Particle.EXPLOSION_HUGE, center, 1, 0, 0, 0, 0); + center.getWorld().spawnParticle(Particle.EXPLOSION_EMITTER, center, 1, 0, 0, 0, 0); } }