Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

CFI changeset

Browse Source
This commit is contained in:
Jesse Boyd
2019-11-08 05:27:04 +00:00
parent 82f5c4ebed
commit faa63b0c35
11 changed files with 88 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
View File

@ -8,6 +8,7 @@ import com.boydti.fawe.beta.implementation.cache.preloader.Preloader;
import com.boydti.fawe.bukkit.adapter.BukkitQueueHandler;
import com.boydti.fawe.bukkit.listener.BrushListener;
import com.boydti.fawe.bukkit.listener.BukkitImageListener;
import com.boydti.fawe.bukkit.listener.CFIPacketListener;
import com.boydti.fawe.bukkit.listener.ChunkListener_8;
import com.boydti.fawe.bukkit.listener.ChunkListener_9;
import com.boydti.fawe.bukkit.listener.RenderListener;
@ -62,8 +63,7 @@ public class FaweBukkit implements IFawe, Listener {
private boolean listeningImages;
private BukkitImageListener imageListener;
public static boolean PAPER;
private CFIPacketListener packetListener;
public VaultUtil getVault() {
return this.vault;
@ -71,13 +71,6 @@ public class FaweBukkit implements IFawe, Listener {
public FaweBukkit(Plugin plugin) {
this.plugin = plugin;
try {
Class.forName("com.destroystokyo.paper.Namespaced");
PAPER = true;
} catch (Throwable e) {
e.printStackTrace();
// TODO no paper
}
try {
Settings.IMP.TICK_LIMITER.ENABLED = !Bukkit.hasWhitelist();
Fawe.set(this);
@ -115,13 +108,13 @@ public class FaweBukkit implements IFawe, Listener {
});
}
// @Override // Please don't delete this again, it's WIP
// public void registerPacketListener() {
// PluginManager manager = Bukkit.getPluginManager();
// if (packetListener == null && manager.getPlugin("ProtocolLib") != null) {
// packetListener = new CFIPacketListener(plugin);
// }
// }
@Override // Please don't delete this again, it's WIP
public void registerPacketListener() {
PluginManager manager = Bukkit.getPluginManager();
if (packetListener == null && manager.getPlugin("ProtocolLib") != null) {
packetListener = new CFIPacketListener(plugin);
}
}
@Override
public QueueHandler getQueueHandler() {
@ -133,7 +126,7 @@ public class FaweBukkit implements IFawe, Listener {
if (listeningImages && imageListener == null) return null;
try {
listeningImages = true;
//registerPacketListener();
registerPacketListener();
PluginManager manager = Bukkit.getPluginManager();
if (manager.getPlugin("PacketListenerApi") == null) {
@ -408,7 +401,7 @@ public class FaweBukkit implements IFawe, Listener {
@Override
public Preloader getPreloader() {
if (PAPER) {
if (PaperLib.isPaper()) {
return new AsyncPreloader();
}
return null;

3
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/BukkitAdapter_1_14.java
View File

@ -12,6 +12,7 @@ import com.sk89q.worldedit.world.block.BlockID;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.block.BlockTypesCache;
import io.papermc.lib.PaperLib;
import net.jpountz.util.UnsafeUtils;
import net.minecraft.server.v1_14_R1.Block;
import net.minecraft.server.v1_14_R1.Chunk;
@ -145,7 +146,7 @@ public final class BukkitAdapter_1_14 {
if (Fawe.isMainThread()) {
return nmsWorld.getChunkAt(X, Z);
}
if (FaweBukkit.PAPER) {
if (PaperLib.isPaper()) {
CraftWorld craftWorld = nmsWorld.getWorld();
CompletableFuture<org.bukkit.Chunk> future = craftWorld.getChunkAtAsync(X, Z, true);
try {

3
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
View File

@ -57,6 +57,7 @@ import java.util.Locale;
import java.util.Map;
import javax.annotation.Nullable;
import io.papermc.lib.PaperLib;
import org.bukkit.Effect;
import org.bukkit.TreeType;
import org.bukkit.World;
@ -328,7 +329,7 @@ public class BukkitWorld extends AbstractWorld {
if (Fawe.isMainThread()) {
world.getChunkAt(X, Z);
} else if (!world.isChunkLoaded(X, Z)) {
if (FaweBukkit.PAPER) {
if (PaperLib.isPaper()) {
world.getChunkAtAsync(X, Z, true);
} else {
Fawe.get().getQueueHandler().sync(() -> {