From fbeb321d7961f27a92af88d40cbc5c304e3166ea Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 01:20:51 +0700 Subject: [PATCH 01/29] e --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 7ddd246..3bacaed 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -94,7 +94,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { @EventHandler - public void onChunkLoadend(ChunkEvent e) { + public void onChunkLoadend(ChunkLoadEvent e) { Chunk chunk = e.getChunk(); World world = chunk.getWorld(); if (world.getEnvironment() == World.Environment.THE_END) { From b9202a46564070855b7472d772c0f536e9bba638 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 10:52:29 +0700 Subject: [PATCH 02/29] scheduler idk do it work on folia ? --- .../java/xyz/hynse/foliaflow/FoliaFlow.java | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 3bacaed..83bd996 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -8,6 +8,7 @@ import org.bukkit.entity.FallingBlock; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityChangeBlockEvent; +import org.bukkit.event.entity.EntitySpawnEvent; import org.bukkit.event.world.ChunkEvent; import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.plugin.java.JavaPlugin; @@ -15,6 +16,7 @@ import org.bukkit.util.Vector; import java.util.HashSet; import java.util.Set; +import java.util.stream.Collectors; public class FoliaFlow extends JavaPlugin implements Listener { private final Vector velocity1 = new Vector(0, 0.5, -1); @@ -29,6 +31,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { @Override public void onEnable() { super.onEnable(); + Bukkit.getScheduler().runTaskTimer(this, this::tick, 0, 1); getServer().getPluginManager().registerEvents(this, this); getServer().getConsoleSender().sendMessage(""); getServer().getConsoleSender().sendMessage(ChatColor.GREEN + " ______________ "); @@ -93,34 +96,27 @@ public class FoliaFlow extends JavaPlugin implements Listener { } - @EventHandler - public void onChunkLoadend(ChunkLoadEvent e) { - Chunk chunk = e.getChunk(); - World world = chunk.getWorld(); - if (world.getEnvironment() == World.Environment.THE_END) { - // Iterate through all the entities in the chunk - for (Entity entity : chunk.getEntities()) { - if (entity.getType() == EntityType.FALLING_BLOCK) { - Location loc = entity.getLocation(); + private void tick() { + for (Entity entity : Bukkit.getWorlds().stream().flatMap(world -> world.getEntities().stream()) + .filter(entity -> entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) + .collect(Collectors.toList())) { + Location loc = entity.getLocation(); - debug("Falling block spawned at location " + loc); + debug("Falling block spawned at location " + loc); - // Set the initial velocity of the falling block - int index = counter % 4; - counter ++; - Vector velocity = velocities[index]; - entity.setVelocity(velocity); - - // Remove the block from the movingBlocks set after a delay, to prevent it from being immediately moved again - //getServer().getScheduler().runTaskLater(this, () -> movingBlocks.remove(loc.getBlock().getLocation()), 20L); - } - } + // Set the initial velocity of the falling block + int index = counter % 4; + counter ++; + Vector velocity = velocities[index]; + entity.setVelocity(velocity); } } + + Block getBlockMovingTo(Location loc, Vector vel) { double absMax = 0, max = 0; char dir = ' '; From 91bd89abe8e1a83ed76f0bd753ca99de35c5c6b0 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 11:16:48 +0700 Subject: [PATCH 03/29] AsyncScheduler --- .../java/xyz/hynse/foliaflow/FoliaFlow.java | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 83bd996..59a9e4b 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -1,5 +1,7 @@ package xyz.hynse.foliaflow; +import io.papermc.paper.threadedregions.scheduler.AsyncScheduler; +import io.papermc.paper.threadedregions.scheduler.ScheduledTask; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.entity.Entity; @@ -8,15 +10,10 @@ import org.bukkit.entity.FallingBlock; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityChangeBlockEvent; -import org.bukkit.event.entity.EntitySpawnEvent; -import org.bukkit.event.world.ChunkEvent; -import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.Collectors; +import java.util.concurrent.TimeUnit; public class FoliaFlow extends JavaPlugin implements Listener { private final Vector velocity1 = new Vector(0, 0.5, -1); @@ -26,12 +23,29 @@ public class FoliaFlow extends JavaPlugin implements Listener { private final Vector[] velocities = {velocity1, velocity2, velocity3, velocity4}; private int counter = 0; //private final Set movingBlocks = new HashSet<>(); + private ScheduledTask task; @Override public void onEnable() { super.onEnable(); - Bukkit.getScheduler().runTaskTimer(this, this::tick, 0, 1); + AsyncScheduler scheduler = this.getServer().getAsyncScheduler(); + task = scheduler.runAtFixedRate(this, (scheduledTask) -> { + for (World world : Bukkit.getWorlds()) { + for (Entity entity : world.getEntities()) { + if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { + Location loc = entity.getLocation(); + debug("Falling block spawned at location " + loc); + + // Set the initial velocity of the falling block + int index = counter % 4; + counter++; + Vector velocity = velocities[index]; + entity.setVelocity(velocity); + } + } + } + }, 0L, 1L, TimeUnit.MILLISECONDS); getServer().getPluginManager().registerEvents(this, this); getServer().getConsoleSender().sendMessage(""); getServer().getConsoleSender().sendMessage(ChatColor.GREEN + " ______________ "); @@ -48,6 +62,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { public void onDisable() { super.onDisable(); debug("Plugin stopped successfully!"); + task.cancel(); } /* @@ -96,23 +111,6 @@ public class FoliaFlow extends JavaPlugin implements Listener { } - private void tick() { - for (Entity entity : Bukkit.getWorlds().stream().flatMap(world -> world.getEntities().stream()) - .filter(entity -> entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) - .collect(Collectors.toList())) { - Location loc = entity.getLocation(); - - debug("Falling block spawned at location " + loc); - - // Set the initial velocity of the falling block - int index = counter % 4; - counter ++; - Vector velocity = velocities[index]; - entity.setVelocity(velocity); - } - } - - From c67cfcb020247d37ef95d89f523c2dfe2da8b9cb Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 11:22:01 +0700 Subject: [PATCH 04/29] FIX AsyncScheduler --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 59a9e4b..cb5c70f 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -29,7 +29,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { @Override public void onEnable() { super.onEnable(); - AsyncScheduler scheduler = this.getServer().getAsyncScheduler(); + AsyncScheduler scheduler = getServer().getAsyncScheduler(); task = scheduler.runAtFixedRate(this, (scheduledTask) -> { for (World world : Bukkit.getWorlds()) { for (Entity entity : world.getEntities()) { From 1e91e28d3d9e25565106090dce377a87171c0e1b Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 11:24:12 +0700 Subject: [PATCH 05/29] ok --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index cb5c70f..06c4646 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -30,7 +30,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { public void onEnable() { super.onEnable(); AsyncScheduler scheduler = getServer().getAsyncScheduler(); - task = scheduler.runAtFixedRate(this, (scheduledTask) -> { + task = scheduler.runAtFixedRate(this, (scheduledTask) -> Bukkit.getScheduler().runTask(this, () -> { for (World world : Bukkit.getWorlds()) { for (Entity entity : world.getEntities()) { if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { @@ -45,7 +45,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { } } } - }, 0L, 1L, TimeUnit.MILLISECONDS); + }), 0L, 1L, TimeUnit.MILLISECONDS); getServer().getPluginManager().registerEvents(this, this); getServer().getConsoleSender().sendMessage(""); getServer().getConsoleSender().sendMessage(ChatColor.GREEN + " ______________ "); From 4a2254c1fb6df9023e5c59a677c5c18fb64e7b3e Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 11:28:55 +0700 Subject: [PATCH 06/29] prevent it from being immediately --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 06c4646..5162083 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -13,6 +13,8 @@ import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; +import java.util.HashSet; +import java.util.Set; import java.util.concurrent.TimeUnit; public class FoliaFlow extends JavaPlugin implements Listener { @@ -22,10 +24,11 @@ public class FoliaFlow extends JavaPlugin implements Listener { private final Vector velocity4 = new Vector(1, 0.5, 0); private final Vector[] velocities = {velocity1, velocity2, velocity3, velocity4}; private int counter = 0; - //private final Set movingBlocks = new HashSet<>(); + private final Set movingBlocks = new HashSet<>(); private ScheduledTask task; + @Override public void onEnable() { super.onEnable(); @@ -42,6 +45,8 @@ public class FoliaFlow extends JavaPlugin implements Listener { counter++; Vector velocity = velocities[index]; entity.setVelocity(velocity); + // Remove the block from the movingBlocks set after a delay, to prevent it from being immediately moved again + getServer().getScheduler().runTaskLater(this, () -> movingBlocks.remove(loc.getBlock().getLocation()), 20L); } } } From 93495012fc6da9ee9b0e10326109aba7fd61c012 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 11:36:49 +0700 Subject: [PATCH 07/29] still moving --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 5162083..9b89141 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -37,16 +37,19 @@ public class FoliaFlow extends JavaPlugin implements Listener { for (World world : Bukkit.getWorlds()) { for (Entity entity : world.getEntities()) { if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { - Location loc = entity.getLocation(); + FallingBlock fallingBlock = (FallingBlock) entity; + Location loc = fallingBlock.getLocation(); debug("Falling block spawned at location " + loc); // Set the initial velocity of the falling block int index = counter % 4; counter++; Vector velocity = velocities[index]; - entity.setVelocity(velocity); - // Remove the block from the movingBlocks set after a delay, to prevent it from being immediately moved again - getServer().getScheduler().runTaskLater(this, () -> movingBlocks.remove(loc.getBlock().getLocation()), 20L); + fallingBlock.setVelocity(velocity); + + // Add the location to the set of moving blocks + movingBlocks.add(loc); + } } } From d7fd6451237ba90b1974e8782dc010b4688c123e Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 11:44:59 +0700 Subject: [PATCH 08/29] map --- .../java/xyz/hynse/foliaflow/FoliaFlow.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 9b89141..b43f7a8 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -13,7 +13,9 @@ import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -25,10 +27,9 @@ public class FoliaFlow extends JavaPlugin implements Listener { private final Vector[] velocities = {velocity1, velocity2, velocity3, velocity4}; private int counter = 0; private final Set movingBlocks = new HashSet<>(); + private final Map velocitiesMap = new HashMap<>(); // Create a map to store velocities private ScheduledTask task; - - @Override public void onEnable() { super.onEnable(); @@ -37,19 +38,18 @@ public class FoliaFlow extends JavaPlugin implements Listener { for (World world : Bukkit.getWorlds()) { for (Entity entity : world.getEntities()) { if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { - FallingBlock fallingBlock = (FallingBlock) entity; - Location loc = fallingBlock.getLocation(); + Location loc = entity.getLocation(); debug("Falling block spawned at location " + loc); - // Set the initial velocity of the falling block - int index = counter % 4; - counter++; - Vector velocity = velocities[index]; - fallingBlock.setVelocity(velocity); - - // Add the location to the set of moving blocks - movingBlocks.add(loc); - + // Set the initial velocity of the falling block only if it doesn't have a velocity stored + if (!velocitiesMap.containsKey(entity)) { + int index = counter % 4; + counter++; + Vector velocity = velocities[index]; + entity.setVelocity(velocity); + velocitiesMap.put(entity, velocity); // Store the velocity in the map + movingBlocks.add(entity.getLocation()); // Add the location to the set + } } } } @@ -73,6 +73,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { task.cancel(); } + /* @EventHandler public void onChunkLoad(ChunkLoadEvent event) { From 9b9c978b86ac93ba4d53b1edf95d044421de3172 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 11:48:48 +0700 Subject: [PATCH 09/29] no debug --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index b43f7a8..e8f48b8 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -38,8 +38,8 @@ public class FoliaFlow extends JavaPlugin implements Listener { for (World world : Bukkit.getWorlds()) { for (Entity entity : world.getEntities()) { if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { - Location loc = entity.getLocation(); - debug("Falling block spawned at location " + loc); + //Location loc = entity.getLocation(); + //debug("Falling block spawned at location " + loc); // Set the initial velocity of the falling block only if it doesn't have a velocity stored if (!velocitiesMap.containsKey(entity)) { From f17122ceb63465861785c861ec4dee605289db16 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 11:56:00 +0700 Subject: [PATCH 10/29] remove bloc at 100 48 0 --- .../java/xyz/hynse/foliaflow/FoliaFlow.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index e8f48b8..9801b32 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -36,11 +36,20 @@ public class FoliaFlow extends JavaPlugin implements Listener { AsyncScheduler scheduler = getServer().getAsyncScheduler(); task = scheduler.runAtFixedRate(this, (scheduledTask) -> Bukkit.getScheduler().runTask(this, () -> { for (World world : Bukkit.getWorlds()) { + // Check if the world is The End + if (world.getEnvironment() == World.Environment.THE_END) { + // Get the block at the specified location + Block block = world.getBlockAt(100, 48, 0); + + // If the block is obsidian, set it to air + if (block.getType() == Material.OBSIDIAN) { + block.setType(Material.AIR); + } + } + + // Spawn falling blocks as before for (Entity entity : world.getEntities()) { if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { - //Location loc = entity.getLocation(); - //debug("Falling block spawned at location " + loc); - // Set the initial velocity of the falling block only if it doesn't have a velocity stored if (!velocitiesMap.containsKey(entity)) { int index = counter % 4; @@ -147,7 +156,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { case 'y' -> relative = loc.getBlock().getRelative(0, (int) Math.signum(max), 0); case 'z' -> relative = loc.getBlock().getRelative(0, 0, (int) Math.signum(max)); } - debug("Moving falling block from location " + loc.toString() + " to location " + dir); + //debug("Moving falling block from location " + loc.toString() + " to location " + dir); return relative; } From 4eb2e83b23a5163f7b76594c6a1425ef3f92dfec Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:20:12 +0700 Subject: [PATCH 11/29] RegionScheduler --- .../java/xyz/hynse/foliaflow/FoliaFlow.java | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 9801b32..b951042 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -1,6 +1,7 @@ package xyz.hynse.foliaflow; import io.papermc.paper.threadedregions.scheduler.AsyncScheduler; +import io.papermc.paper.threadedregions.scheduler.RegionScheduler; import io.papermc.paper.threadedregions.scheduler.ScheduledTask; import org.bukkit.*; import org.bukkit.block.Block; @@ -10,14 +11,19 @@ import org.bukkit.entity.FallingBlock; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityChangeBlockEvent; +import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; +import org.jetbrains.annotations.NotNull; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; + +import static org.bukkit.Bukkit.getScheduler; public class FoliaFlow extends JavaPlugin implements Listener { private final Vector velocity1 = new Vector(0, 0.5, -1); @@ -30,26 +36,29 @@ public class FoliaFlow extends JavaPlugin implements Listener { private final Map velocitiesMap = new HashMap<>(); // Create a map to store velocities private ScheduledTask task; + private ScheduledTask blockktask; + @Override public void onEnable() { super.onEnable(); + // Get the region scheduler for the server + RegionScheduler schedulerblock = getServer().getRegionScheduler(); + + // Schedule a repeating task to run every tick using runAtFixedRate() method + blockktask = schedulerblock.runAtFixedRate(this, Bukkit.getWorld("world_the_end"), 1, 1, (schedulerTask) -> { + Block block = Bukkit.getWorld("world_the_end").getBlockAt(100, 48, 0); + if (block.getType() == Material.OBSIDIAN) { + block.setType(Material.AIR); + } + }, 0L, 1L); AsyncScheduler scheduler = getServer().getAsyncScheduler(); - task = scheduler.runAtFixedRate(this, (scheduledTask) -> Bukkit.getScheduler().runTask(this, () -> { + task = scheduler.runAtFixedRate(this, (scheduledTask) -> getScheduler().runTask(this, () -> { for (World world : Bukkit.getWorlds()) { - // Check if the world is The End - if (world.getEnvironment() == World.Environment.THE_END) { - // Get the block at the specified location - Block block = world.getBlockAt(100, 48, 0); - - // If the block is obsidian, set it to air - if (block.getType() == Material.OBSIDIAN) { - block.setType(Material.AIR); - } - } - - // Spawn falling blocks as before for (Entity entity : world.getEntities()) { if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { + //Location loc = entity.getLocation(); + //debug("Falling block spawned at location " + loc); + // Set the initial velocity of the falling block only if it doesn't have a velocity stored if (!velocitiesMap.containsKey(entity)) { int index = counter % 4; From abb43573395d1266405026cb37b665ecfb927277 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:21:07 +0700 Subject: [PATCH 12/29] cancelled task on stop --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index b951042..2b2cf85 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -86,9 +86,10 @@ public class FoliaFlow extends JavaPlugin implements Listener { @Override public void onDisable() { + task.isCancelled(); + blockktask.isCancelled(); super.onDisable(); debug("Plugin stopped successfully!"); - task.cancel(); } From 3b053c304f3626b9b92a1ae1fa908eb9fc72e68b Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:23:19 +0700 Subject: [PATCH 13/29] fix region --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 2b2cf85..efeb3b5 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -50,7 +50,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { if (block.getType() == Material.OBSIDIAN) { block.setType(Material.AIR); } - }, 0L, 1L); + }, 1L, 1L); AsyncScheduler scheduler = getServer().getAsyncScheduler(); task = scheduler.runAtFixedRate(this, (scheduledTask) -> getScheduler().runTask(this, () -> { for (World world : Bukkit.getWorlds()) { From 2fe665ea1a8c040b1fd526f97b5f4db51c45f136 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:33:18 +0700 Subject: [PATCH 14/29] air to half slab --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index efeb3b5..ea4a2e9 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -5,6 +5,7 @@ import io.papermc.paper.threadedregions.scheduler.RegionScheduler; import io.papermc.paper.threadedregions.scheduler.ScheduledTask; import org.bukkit.*; import org.bukkit.block.Block; +import org.bukkit.block.data.type.Slab; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.FallingBlock; @@ -48,7 +49,10 @@ public class FoliaFlow extends JavaPlugin implements Listener { blockktask = schedulerblock.runAtFixedRate(this, Bukkit.getWorld("world_the_end"), 1, 1, (schedulerTask) -> { Block block = Bukkit.getWorld("world_the_end").getBlockAt(100, 48, 0); if (block.getType() == Material.OBSIDIAN) { - block.setType(Material.AIR); + block.setType(Material.COBBLED_DEEPSLATE_SLAB); + Slab slab = (Slab) block.getBlockData(); + slab.setType(Slab.Type.BOTTOM); + block.setBlockData(slab); } }, 1L, 1L); AsyncScheduler scheduler = getServer().getAsyncScheduler(); From 0938dad4f324f7c6f90f576d9ba7d0b02e08d900 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:38:32 +0700 Subject: [PATCH 15/29] catch erorr --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index ea4a2e9..68ac6ba 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -43,6 +43,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { public void onEnable() { super.onEnable(); // Get the region scheduler for the server + try { RegionScheduler schedulerblock = getServer().getRegionScheduler(); // Schedule a repeating task to run every tick using runAtFixedRate() method @@ -55,6 +56,10 @@ public class FoliaFlow extends JavaPlugin implements Listener { block.setBlockData(slab); } }, 1L, 1L); + } catch (NullPointerException e) { + getServer().getLogger().info("Region Scheduler erorr (likly chunky it not load)"); + } + try { AsyncScheduler scheduler = getServer().getAsyncScheduler(); task = scheduler.runAtFixedRate(this, (scheduledTask) -> getScheduler().runTask(this, () -> { for (World world : Bukkit.getWorlds()) { @@ -76,6 +81,9 @@ public class FoliaFlow extends JavaPlugin implements Listener { } } }), 0L, 1L, TimeUnit.MILLISECONDS); + } catch (NullPointerException e) { + getServer().getLogger().info("AsyncScheduler erorr (likly chunky it not load)"); + } getServer().getPluginManager().registerEvents(this, this); getServer().getConsoleSender().sendMessage(""); getServer().getConsoleSender().sendMessage(ChatColor.GREEN + " ______________ "); From ed4b7c414beef517037aa0099d3da1806c639ff8 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:39:14 +0700 Subject: [PATCH 16/29] optimize --- .../java/xyz/hynse/foliaflow/FoliaFlow.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 68ac6ba..ba2763e 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -12,17 +12,14 @@ import org.bukkit.entity.FallingBlock; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityChangeBlockEvent; -import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; -import org.jetbrains.annotations.NotNull; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; import static org.bukkit.Bukkit.getScheduler; @@ -104,23 +101,6 @@ public class FoliaFlow extends JavaPlugin implements Listener { debug("Plugin stopped successfully!"); } - - /* - @EventHandler - public void onChunkLoad(ChunkLoadEvent event) { - Block obsidianBlock = obsidianLocation.getBlock(); - if (event.getWorld() == endWorld && obsidianBlock.getType() == Material.OBSIDIAN) { // check if the chunk is in the end and the block is obsidian - obsidianBlock.setType(Material.AIR); // set the block to air - } - } - - @EventHandler - public void onBlockChange(org.bukkit.event.block.BlockFromToEvent event) { - if (event.getBlock().getLocation().equals(obsidianLocation)) { // check if the block change event is for the obsidian block location - event.setCancelled(true); // cancel the event to prevent the obsidian block from changing - } - }*/ - @EventHandler public void onFallingBlockToBlock(EntityChangeBlockEvent e){ if(e.getEntityType() == EntityType.FALLING_BLOCK){ From 8292131670d208ac47d57b36a802f7b492d435c7 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:42:40 +0700 Subject: [PATCH 17/29] fix falling not drop item --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index ba2763e..013e519 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -116,8 +116,8 @@ public class FoliaFlow extends JavaPlugin implements Listener { spawnLoc.setZ(spawnLoc.getZ()+0.5); FallingBlock dummy = loc.getWorld().spawnFallingBlock(spawnLoc, ((FallingBlock) entity).getBlockData()); - dummy.setDropItem(false); - dummy.setHurtEntities(false); + dummy.setDropItem(true); + dummy.setHurtEntities(true); dummy.setGravity(true); Vector dummyVel = vel.clone(); dummyVel.setY(-dummyVel.getY()); From c77fd03b96967aed02abb03fc074a6966ecc2095 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:45:09 +0700 Subject: [PATCH 18/29] vanilla velocity 1 --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 013e519..50ce8bc 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -24,10 +24,12 @@ import java.util.concurrent.TimeUnit; import static org.bukkit.Bukkit.getScheduler; public class FoliaFlow extends JavaPlugin implements Listener { - private final Vector velocity1 = new Vector(0, 0.5, -1); - private final Vector velocity2 = new Vector(-1, 0.5, 0); - private final Vector velocity3 = new Vector(0, 0.5, 1); - private final Vector velocity4 = new Vector(1, 0.5, 0); + private int vh = (int) 0.1; + private int vt = (int) 0.3; + private final Vector velocity1 = new Vector(0, vh, vt); + private final Vector velocity2 = new Vector(vt, vh, 0); + private final Vector velocity3 = new Vector(0, vh, vt); + private final Vector velocity4 = new Vector(vt, vh, 0); private final Vector[] velocities = {velocity1, velocity2, velocity3, velocity4}; private int counter = 0; private final Set movingBlocks = new HashSet<>(); From 145f873989637ae759df4ed08845dc50de496326 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:49:30 +0700 Subject: [PATCH 19/29] fix everything --- .../java/xyz/hynse/foliaflow/FoliaFlow.java | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 50ce8bc..a064035 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -15,21 +15,19 @@ import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.TimeUnit; import static org.bukkit.Bukkit.getScheduler; public class FoliaFlow extends JavaPlugin implements Listener { - private int vh = (int) 0.1; - private int vt = (int) 0.3; + private final double vh = 0.1; + private final double vt = 0.3; private final Vector velocity1 = new Vector(0, vh, vt); private final Vector velocity2 = new Vector(vt, vh, 0); - private final Vector velocity3 = new Vector(0, vh, vt); - private final Vector velocity4 = new Vector(vt, vh, 0); + private final Vector velocity3 = new Vector(0, vh, -vt); + private final Vector velocity4 = new Vector(-vt, vh, 0); + private final Vector[] velocities = {velocity1, velocity2, velocity3, velocity4}; private int counter = 0; private final Set movingBlocks = new HashSet<>(); @@ -46,8 +44,8 @@ public class FoliaFlow extends JavaPlugin implements Listener { RegionScheduler schedulerblock = getServer().getRegionScheduler(); // Schedule a repeating task to run every tick using runAtFixedRate() method - blockktask = schedulerblock.runAtFixedRate(this, Bukkit.getWorld("world_the_end"), 1, 1, (schedulerTask) -> { - Block block = Bukkit.getWorld("world_the_end").getBlockAt(100, 48, 0); + blockktask = schedulerblock.runAtFixedRate(this, Objects.requireNonNull(Bukkit.getWorld("world_the_end")), 1, 1, (schedulerTask) -> { + Block block = Objects.requireNonNull(Bukkit.getWorld("world_the_end")).getBlockAt(100, 48, 0); if (block.getType() == Material.OBSIDIAN) { block.setType(Material.COBBLED_DEEPSLATE_SLAB); Slab slab = (Slab) block.getBlockData(); @@ -100,7 +98,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { task.isCancelled(); blockktask.isCancelled(); super.onDisable(); - debug("Plugin stopped successfully!"); + debug(); } @EventHandler @@ -164,7 +162,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { return relative; } - private void debug(String message) { - getServer().getConsoleSender().sendMessage(ChatColor.AQUA + "[FoliaFlow] " + message); + private void debug() { + getServer().getConsoleSender().sendMessage(ChatColor.AQUA + "[FoliaFlow] " + "Plugin stopped successfully!"); } } \ No newline at end of file From be40f3e42be48335e306e4522feac410c94a1997 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:51:36 +0700 Subject: [PATCH 20/29] vanilla velocity 2 --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index a064035..3ed188c 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit; import static org.bukkit.Bukkit.getScheduler; public class FoliaFlow extends JavaPlugin implements Listener { - private final double vh = 0.1; - private final double vt = 0.3; + private final double vh = 0.3; + private final double vt = 0.8; private final Vector velocity1 = new Vector(0, vh, vt); private final Vector velocity2 = new Vector(vt, vh, 0); private final Vector velocity3 = new Vector(0, vh, -vt); From 6c1ad6f3c4484ae299314ca8441ec510c53725c6 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:57:39 +0700 Subject: [PATCH 21/29] vanilla velocity 3 --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 3ed188c..3dcb284 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -22,7 +22,7 @@ import static org.bukkit.Bukkit.getScheduler; public class FoliaFlow extends JavaPlugin implements Listener { private final double vh = 0.3; - private final double vt = 0.8; + private final double vt = 0.6; private final Vector velocity1 = new Vector(0, vh, vt); private final Vector velocity2 = new Vector(vt, vh, 0); private final Vector velocity3 = new Vector(0, vh, -vt); From 9d7e9be5a98e9011de36ff0a183cba9ca8b5f4c8 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 12:59:59 +0700 Subject: [PATCH 22/29] wahat --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 3dcb284..820e82e 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -108,6 +108,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { Location loc = entity.getLocation(); Vector vel = entity.getVelocity(); Block movingTo = getBlockMovingTo(loc, vel); + try { if(movingTo != null && movingTo.getType() == Material.END_PORTAL){ Location spawnLoc = movingTo.getLocation(); @@ -127,14 +128,12 @@ public class FoliaFlow extends JavaPlugin implements Listener { dummy.setVelocity(dummyVel); } + } catch (NullPointerException e) { + getServer().getLogger().info("onFallingBlockToBlock erorr (likly chunky it not load)"); + } } } - - - - - Block getBlockMovingTo(Location loc, Vector vel) { double absMax = 0, max = 0; char dir = ' '; From 5a84f225690739feaab3e250f497c305e57a6826 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 13:02:03 +0700 Subject: [PATCH 23/29] vanilla velocity 3 --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 820e82e..9162eeb 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit; import static org.bukkit.Bukkit.getScheduler; public class FoliaFlow extends JavaPlugin implements Listener { - private final double vh = 0.3; - private final double vt = 0.6; + private final double vh = 0.8; + private final double vt = 0.2; private final Vector velocity1 = new Vector(0, vh, vt); private final Vector velocity2 = new Vector(vt, vh, 0); private final Vector velocity3 = new Vector(0, vh, -vt); From acae6bb89865a2878fe98ae82b85d39a6ec1e227 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 13:02:34 +0700 Subject: [PATCH 24/29] catch --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 9162eeb..e69a988 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -128,7 +128,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { dummy.setVelocity(dummyVel); } - } catch (NullPointerException e) { + } catch (NullPointerException expected) { getServer().getLogger().info("onFallingBlockToBlock erorr (likly chunky it not load)"); } } From abc933f0c32da2b96a56dc32e762d2e5f326eb2e Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 13:03:39 +0700 Subject: [PATCH 25/29] suppress --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index e69a988..8a9e1e6 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -53,7 +53,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { block.setBlockData(slab); } }, 1L, 1L); - } catch (NullPointerException e) { + } catch (NullPointerException RegionScheduler) { getServer().getLogger().info("Region Scheduler erorr (likly chunky it not load)"); } try { @@ -78,7 +78,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { } } }), 0L, 1L, TimeUnit.MILLISECONDS); - } catch (NullPointerException e) { + } catch (NullPointerException AsyncScheduler) { getServer().getLogger().info("AsyncScheduler erorr (likly chunky it not load)"); } getServer().getPluginManager().registerEvents(this, this); @@ -128,7 +128,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { dummy.setVelocity(dummyVel); } - } catch (NullPointerException expected) { + } catch (NullPointerException onFallingBlockToBlock) { getServer().getLogger().info("onFallingBlockToBlock erorr (likly chunky it not load)"); } } From 4c5594db7a809c7b6ccd1118a79326ad255deebd Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 13:04:35 +0700 Subject: [PATCH 26/29] wrong lol --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 8a9e1e6..9d98496 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit; import static org.bukkit.Bukkit.getScheduler; public class FoliaFlow extends JavaPlugin implements Listener { - private final double vh = 0.8; - private final double vt = 0.2; + private final double vh = 0.2; + private final double vt = 0.8; private final Vector velocity1 = new Vector(0, vh, vt); private final Vector velocity2 = new Vector(vt, vh, 0); private final Vector velocity3 = new Vector(0, vh, -vt); From fe569a25adb3c7ab4de679b090f1cb11668d73a0 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 13:14:59 +0700 Subject: [PATCH 27/29] fix catch --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 9d98496..edf3df1 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -53,7 +53,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { block.setBlockData(slab); } }, 1L, 1L); - } catch (NullPointerException RegionScheduler) { + } catch (NullPointerException block) { getServer().getLogger().info("Region Scheduler erorr (likly chunky it not load)"); } try { @@ -78,7 +78,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { } } }), 0L, 1L, TimeUnit.MILLISECONDS); - } catch (NullPointerException AsyncScheduler) { + } catch (NullPointerException e) { getServer().getLogger().info("AsyncScheduler erorr (likly chunky it not load)"); } getServer().getPluginManager().registerEvents(this, this); @@ -95,8 +95,8 @@ public class FoliaFlow extends JavaPlugin implements Listener { @Override public void onDisable() { - task.isCancelled(); - blockktask.isCancelled(); + task.cancel(); + blockktask.cancel(); super.onDisable(); debug(); } @@ -128,7 +128,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { dummy.setVelocity(dummyVel); } - } catch (NullPointerException onFallingBlockToBlock) { + } catch (NullPointerException dummy) { getServer().getLogger().info("onFallingBlockToBlock erorr (likly chunky it not load)"); } } From 18b9cffbbbb7d888592547293b0f8f511447807b Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 13:16:18 +0700 Subject: [PATCH 28/29] not snapshot anymore --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index adfeb39..a876b8a 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { group = 'xyz.hynse' -version = '1.1-SNAPSHOT' +version = '1.2' repositories { mavenCentral() From d891c725f34fb83e62db572028aeff8534b5f7df Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 13:24:03 +0700 Subject: [PATCH 29/29] server + loader --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a876b8a..4970ade 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,10 @@ plugins { id 'java' } - +def loader = 'folia' +def server = '1.19.4' group = 'xyz.hynse' -version = '1.2' +version = "1.2-${server}-${loader}" repositories { mavenCentral()