Refactoring / Optimize project
This commit is contained in:
Sofiane H. Djerbi
parent
792c0c5f1d
commit
758b5dc8fc
3 changed files with 70 additions and 173 deletions
|
|
@ -1,182 +1,15 @@
|
|||
package xyz.hynse.foliaflow;
|
||||
|
||||
import io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler;
|
||||
import io.papermc.paper.threadedregions.scheduler.RegionScheduler;
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.data.type.Slab;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.entity.BlockDisplay;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.EntityType;
|
||||
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.java.JavaPlugin;
|
||||
import org.bukkit.util.Vector;
|
||||
import xyz.hynse.foliaflow.watcher.PortalWatcher;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
public class FoliaFlow extends JavaPlugin implements Listener {
|
||||
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);
|
||||
private final Vector velocity4 = new Vector(-vt, vh, 0);
|
||||
public class FoliaFlow extends JavaPlugin {
|
||||
|
||||
private final Vector[] velocities = {velocity1, velocity2, velocity3, velocity4};
|
||||
private int counter = 0;
|
||||
private final Set<Location> movingBlocks = new HashSet<>();
|
||||
private final Map<Entity, Vector> velocitiesMap = new HashMap<>();
|
||||
public static FoliaFlow instance;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
super.onEnable();
|
||||
RegionScheduler schedulerblock = getServer().getRegionScheduler();
|
||||
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();
|
||||
slab.setType(Slab.Type.BOTTOM);
|
||||
block.setBlockData(slab);
|
||||
|
||||
}
|
||||
|
||||
}, 1L, 1L);
|
||||
|
||||
GlobalRegionScheduler schedulervelocity = this.getServer().getGlobalRegionScheduler();
|
||||
|
||||
schedulervelocity.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 centerLoc = new Location(entity.getWorld(), 100, 48.5, 0);
|
||||
Location loc = entity.getLocation();
|
||||
if (loc.distance(centerLoc) <= 1) {
|
||||
if (!velocitiesMap.containsKey(entity)) {
|
||||
int index = counter % 4;
|
||||
counter++;
|
||||
Vector velocity = velocities[index];
|
||||
entity.setVelocity(velocity);
|
||||
velocitiesMap.put(entity, velocity);
|
||||
movingBlocks.add(entity.getLocation());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}, 20L, 1L);
|
||||
|
||||
|
||||
File dataFile = new File(getDataFolder(), "data.yml");
|
||||
YamlConfiguration config = YamlConfiguration.loadConfiguration(dataFile);
|
||||
|
||||
boolean entitySpawned = config.getBoolean("entity_spawned", false);
|
||||
|
||||
if (!entitySpawned) {
|
||||
RegionScheduler schedulerdisplay = getServer().getRegionScheduler();
|
||||
String tag = "FoliaFlow_Display";
|
||||
|
||||
schedulerdisplay.run(this, Objects.requireNonNull(Bukkit.getWorld("world_the_end")), 1, 1, (schedulerTask) -> {
|
||||
World endWorld = getServer().getWorld("world_the_end");
|
||||
assert endWorld != null;
|
||||
Chunk chunk = endWorld.getChunkAt(0, 0);
|
||||
if (!chunk.isLoaded()) {
|
||||
chunk.load();
|
||||
getLogger().info("Loaded Chunk");
|
||||
}
|
||||
|
||||
boolean displayExists = endWorld.getEntitiesByClass(BlockDisplay.class).stream()
|
||||
.anyMatch(entity -> entity.getScoreboardTags().contains(tag));
|
||||
getLogger().info("Exist BlockDisplay" + "(" + tag + ")");
|
||||
|
||||
if (!displayExists) {
|
||||
BlockDisplay display = (BlockDisplay) endWorld.spawnEntity(new Location(endWorld, 100.0005, 48, -0.0005), EntityType.BLOCK_DISPLAY);
|
||||
display.setBlock(Bukkit.createBlockData(Material.OBSIDIAN));
|
||||
display.addScoreboardTag(tag);
|
||||
getLogger().info("Setup BlockDisplay" + "(" + tag + ") " + display);
|
||||
|
||||
config.set("entity_spawned", true);
|
||||
try {
|
||||
config.save(dataFile);
|
||||
} catch (IOException e) {
|
||||
getLogger().warning("Failed to save plugin data file");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
getServer().getPluginManager().registerEvents(this, this);
|
||||
instance = this;
|
||||
getServer().getPluginManager().registerEvents(new PortalWatcher(), this);
|
||||
}
|
||||
@Override
|
||||
public void onDisable() {
|
||||
super.onDisable();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void onFallingBlockToBlock(EntityChangeBlockEvent e){
|
||||
if(e.getEntityType() == EntityType.FALLING_BLOCK){
|
||||
Entity entity = e.getEntity();
|
||||
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();
|
||||
spawnLoc.setX(spawnLoc.getX()+0.5);
|
||||
spawnLoc.setY(spawnLoc.getY()-0.25);
|
||||
spawnLoc.setZ(spawnLoc.getZ()+0.5);
|
||||
|
||||
FallingBlock dummy = loc.getWorld().spawnFallingBlock(spawnLoc, ((FallingBlock) entity).getBlockData());
|
||||
dummy.setDropItem(true);
|
||||
dummy.setHurtEntities(true);
|
||||
dummy.setGravity(true);
|
||||
Vector dummyVel = vel.clone();
|
||||
dummyVel.setY(-dummyVel.getY());
|
||||
dummyVel.multiply(new Vector(2, 1, 2));
|
||||
|
||||
dummyVel.add(new Vector(0, 1, 0));
|
||||
|
||||
dummy.setVelocity(dummyVel);
|
||||
}
|
||||
} catch (NullPointerException dummy) {
|
||||
getServer().getLogger().info("onFallingBlockToBlock error (likely chunky it not load)");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Block getBlockMovingTo(Location loc, Vector vel) {
|
||||
double absMax = 0, max = 0;
|
||||
char dir = ' ';
|
||||
Block relative = null;
|
||||
if (Math.abs(vel.getX()) > absMax) {
|
||||
max = vel.getX();
|
||||
absMax = Math.abs(vel.getX());
|
||||
dir = 'x';
|
||||
}
|
||||
if (Math.abs(vel.getY()) > absMax) {
|
||||
max = vel.getY();
|
||||
absMax = Math.abs(vel.getY());
|
||||
dir = 'y';
|
||||
}
|
||||
if (Math.abs(vel.getZ()) > absMax) {
|
||||
max = vel.getZ();
|
||||
dir = 'z';
|
||||
}
|
||||
switch (dir) {
|
||||
case 'x' -> relative = loc.getBlock().getRelative((int) Math.signum(max), 0, 0);
|
||||
case 'y' -> relative = loc.getBlock().getRelative(0, (int) Math.signum(max), 0);
|
||||
case 'z' -> relative = loc.getBlock().getRelative(0, 0, (int) Math.signum(max));
|
||||
}
|
||||
return relative;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
19
src/main/java/xyz/hynse/foliaflow/util/VelocityUtil.java
Normal file
19
src/main/java/xyz/hynse/foliaflow/util/VelocityUtil.java
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
package xyz.hynse.foliaflow.util;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
public class VelocityUtil {
|
||||
public static Block getBlockMovingTo(Location loc, Vector vel) {
|
||||
double absX = Math.abs(vel.getX());
|
||||
double absY = Math.abs(vel.getY());
|
||||
double absZ = Math.abs(vel.getZ());
|
||||
if (absX > absY && absX > absZ) {
|
||||
return loc.getBlock().getRelative((int) Math.signum(vel.getX()), 0, 0);
|
||||
} else if (absY > absZ) {
|
||||
return loc.getBlock().getRelative(0, (int) Math.signum(vel.getY()), 0);
|
||||
}
|
||||
return loc.getBlock().getRelative(0, 0, (int) Math.signum(vel.getZ()));
|
||||
}
|
||||
}
|
||||
45
src/main/java/xyz/hynse/foliaflow/watcher/PortalWatcher.java
Normal file
45
src/main/java/xyz/hynse/foliaflow/watcher/PortalWatcher.java
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
package xyz.hynse.foliaflow.watcher;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.FallingBlock;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.EntityChangeBlockEvent;
|
||||
import org.bukkit.util.Vector;
|
||||
import xyz.hynse.foliaflow.FoliaFlow;
|
||||
|
||||
import static xyz.hynse.foliaflow.util.VelocityUtil.getBlockMovingTo;
|
||||
|
||||
public class PortalWatcher implements Listener {
|
||||
@EventHandler
|
||||
public void onFallingBlockToBlock(EntityChangeBlockEvent e){
|
||||
if(e.getEntityType() != EntityType.FALLING_BLOCK) return;
|
||||
Entity entity = e.getEntity();
|
||||
Location loc = entity.getLocation();
|
||||
Vector vel = entity.getVelocity();
|
||||
Block movingTo = getBlockMovingTo(loc, vel);
|
||||
|
||||
if(movingTo != null && movingTo.getType() == Material.END_PORTAL){
|
||||
Location spawnLoc = movingTo.getLocation();
|
||||
spawnLoc.add(0.5, 0.5, 0.5);
|
||||
|
||||
FallingBlock dummy = loc.getWorld().spawnFallingBlock(spawnLoc, ((FallingBlock) entity).getBlockData());
|
||||
Vector dummyVel = vel.clone();
|
||||
dummyVel.setY(-dummyVel.getY());
|
||||
dummyVel.multiply(1.3); // This seems vanilla.
|
||||
dummyVel.add(new Vector(0, -0.2, 0));
|
||||
dummy.setVelocity(dummyVel);
|
||||
|
||||
// Add vector seems vanilla.
|
||||
dummy.getScheduler().runDelayed(FoliaFlow.instance,
|
||||
task -> dummy.setVelocity(dummyVel.add(new Vector(0, 0.45, 0))),
|
||||
null,
|
||||
2
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue