diff --git a/React/build.gradle b/React/build.gradle index c7c841d0..b0f6db78 100644 --- a/React/build.gradle +++ b/React/build.gradle @@ -23,7 +23,7 @@ plugins { version '1.0.3' // Needs to be version specific -def apiVersion = '1.19' +def apiVersion = '1.20' def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.react.React' @@ -36,6 +36,7 @@ registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.19/plugins') registerCustomOutputTask('Nowhere', 'E://Desktop/server/plugins') registerCustomOutputTask('Pixel', 'C://Users//repix//Iris Dimension Engine//1.20.4 - Development/plugins') registerCustomOutputTask('CrazyDev22', 'C:\\Users\\Julian\\Desktop\\server\\plugins') +registerCustomOutputTask('NeroBuddy1313', 'E:\\Data\\Server\\1.21.8\\plugins') // ========================== UNIX ============================== registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins') registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins') @@ -83,7 +84,10 @@ shadowJar { minimize() append("plugin.yml") dependencies { - include(dependency('com.github.VolmitDev:')) + include(dependency('com.github.VolmitDev:Curse:.*')) + include(dependency('com.github.VolmitDev:MultiBurst:.*')) + include(dependency('com.github.VolmitDev:Chrono:.*')) + include(dependency('com.github.VolmitDev:Spatial:.*')) } archiveClassifier = null @@ -100,7 +104,7 @@ dependencies { // Provided or Classpath compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' - compileOnly 'org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot-api:1.20.3-R0.1-SNAPSHOT' compileOnly "io.papermc:paperlib:1.0.7" // Shaded diff --git a/React/src/main/java/com/volmit/react/content/feature/FeatureFastExplosions.java b/React/src/main/java/com/volmit/react/content/feature/FeatureFastExplosions.java index 6f8dc1f2..1ff3dd47 100644 --- a/React/src/main/java/com/volmit/react/content/feature/FeatureFastExplosions.java +++ b/React/src/main/java/com/volmit/react/content/feature/FeatureFastExplosions.java @@ -28,6 +28,7 @@ import org.bukkit.block.Block; import org.bukkit.block.Container; import org.bukkit.entity.TNTPrimed; +import org.bukkit.entity.WindCharge; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -77,6 +78,10 @@ public void on(EntitySpawnEvent e) { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void on(BlockExplodeEvent e) { + if (e.getBlock().getType() == Material.AIR) { + return; + } + var b = new ArrayList<>(e.blockList()); if (disableEntityChainReactions) { @@ -129,6 +134,10 @@ public void on(BlockExplodeEvent e) { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void on(EntityExplodeEvent e) { + if(e.getEntity() instanceof WindCharge){ + return; + } + var b = new ArrayList<>(e.blockList()); if (disableEntityChainReactions) { diff --git a/React/src/main/java/com/volmit/react/util/data/B.java b/React/src/main/java/com/volmit/react/util/data/B.java index 2e0dcc86..cc137345 100644 --- a/React/src/main/java/com/volmit/react/util/data/B.java +++ b/React/src/main/java/com/volmit/react/util/data/B.java @@ -82,7 +82,7 @@ private static IntSet buildFoliageCache() { WHITE_TULIP, FERN, LARGE_FERN, - GRASS, + SHORT_GRASS, TALL_GRASS }).forEach((i) -> b.add(i.ordinal())); @@ -140,7 +140,7 @@ private static Int2IntMap buildDeepslate2NormalCache() { private static IntSet buildDecorantCache() { IntSet b = new IntOpenHashSet(); Arrays.stream(new Material[]{ - GRASS, + SHORT_GRASS, TALL_GRASS, FERN, LARGE_FERN,