Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restructure

Browse Source 
Now uses a single jar for bukkit
I'm going to seperate the injector so FAWE can be used (API wise)
without WorldEdit.
This commit is contained in:
Jesse Boyd 2016-11-24 17:36:44 +11:00
parent b1d5aeb2a9
commit 9c1bb58a09
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
61 changed files with 179 additions and 614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bukkit0/build.gradle → bukkit/build.gradle
View File

@ -17,4 +17,34 @@ dependencies {
compile 'com.sk89q.worldedit:worldedit-bukkit:6.1.4-SNAPSHOT'
compile 'com.sk89q.worldedit:worldedit-core:6.1.4-SNAPSHOT'
compile 'com.thevoxelbox.voxelsniper:voxelsniper:5.171.0'
}
compile 'org.bukkit.craftbukkit.v1_9R2:craftbukkitv1_9R2:1.9.4'
compile 'org.bukkit.craftbukkit:Craftbukkit:1.7.10'
compile 'org.bukkit.craftbukkit:CraftBukkit:1.8.8'
}
processResources {
from('src/main/resources') {
include 'plugin.yml'
expand(
name: project.parent.name,
version: project.parent.version
)
}
}
apply plugin: 'com.github.johnrengelman.shadow'
// We only want the shadow jar produced
jar.enabled = false
shadowJar {
dependencies {
include(dependency(':core'))
}
archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
destinationDir = file '../target'
}
shadowJar.doLast {
task ->
ant.checksum file: task.archivePath
}
build.dependsOn(shadowJar);

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java → bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java
View File

63
bukkit0/src/main/java/com/boydti/fawe/bukkit/ABukkitMain.java → bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitMain.java
View File

@ -1,6 +1,13 @@
package com.boydti.fawe.bukkit;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
import com.boydti.fawe.bukkit.v0.BukkitQueue_All;
import com.boydti.fawe.bukkit.v1_10.BukkitQueue_1_10;
import com.boydti.fawe.bukkit.v1_11.BukkitQueue_1_11;
import com.boydti.fawe.bukkit.v1_7.BukkitQueue17;
import com.boydti.fawe.bukkit.v1_8.BukkitQueue18R3;
import com.boydti.fawe.bukkit.v1_9.BukkitQueue_1_9_R1;
import com.boydti.fawe.object.FaweQueue;
import com.sk89q.worldedit.world.World;
import java.lang.reflect.Field;
@ -13,7 +20,7 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
public abstract class ABukkitMain extends JavaPlugin {
public class BukkitMain extends JavaPlugin {
static {
{ // Disable AWE as otherwise both fail to load
@ -49,12 +56,62 @@ public abstract class ABukkitMain extends JavaPlugin {
}
}
private Version version = Version.NONE;
@Override
public void onEnable() {
FaweBukkit imp = new FaweBukkit(this);
for (Version v : Version.values()) {
try {
BukkitQueue_0.checkVersion(v.name());
this.version = v;
break;
} catch (IllegalStateException e) {}
}
}
public abstract FaweQueue getQueue(World world);
private enum Version {
v1_7_R4,
v1_8_R3,
v1_9_R2,
v1_10_R1,
v1_11_R1,
NONE,
}
public abstract FaweQueue getQueue(String world);
public FaweQueue getQueue(World world) {
switch (version) {
case v1_7_R4:
return new BukkitQueue17(world);
case v1_8_R3:
return new BukkitQueue18R3(world);
case v1_9_R2:
return new BukkitQueue_1_9_R1(world);
case v1_10_R1:
return new BukkitQueue_1_10(world);
case v1_11_R1:
return new BukkitQueue_1_11(world);
default:
case NONE:
return new BukkitQueue_All(world);
}
}
public FaweQueue getQueue(String world) {
switch (version) {
case v1_7_R4:
return new BukkitQueue17(world);
case v1_8_R3:
return new BukkitQueue18R3(world);
case v1_9_R2:
return new BukkitQueue_1_9_R1(world);
case v1_10_R1:
return new BukkitQueue_1_10(world);
case v1_11_R1:
return new BukkitQueue_1_11(world);
default:
case NONE:
return new BukkitQueue_All(world);
}
}
}

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/BukkitPlayer.java → bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitPlayer.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/BukkitTaskMan.java → bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitTaskMan.java
View File

6
bukkit0/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java → bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
View File

@ -42,7 +42,7 @@ import org.primesoft.blockshub.BlocksHubBukkit;
public class FaweBukkit implements IFawe, Listener {
private final ABukkitMain plugin;
private final BukkitMain plugin;
private VaultUtil vault;
private WorldEditPlugin worldedit;
@ -57,7 +57,7 @@ public class FaweBukkit implements IFawe, Listener {
return this.worldedit;
}
public FaweBukkit(ABukkitMain plugin) {
public FaweBukkit(BukkitMain plugin) {
this.plugin = plugin;
try {
Fawe.set(this);
@ -248,7 +248,7 @@ public class FaweBukkit implements IFawe, Listener {
return new BukkitQueue_All(world);
}
public ABukkitMain getPlugin() {
public BukkitMain getPlugin() {
return plugin;
}

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/Metrics.java → bukkit/src/main/java/com/boydti/fawe/bukkit/Metrics.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/VaultUtil.java → bukkit/src/main/java/com/boydti/fawe/bukkit/VaultUtil.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMask.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMask.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMaskManager.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMaskManager.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/FactionsFeature.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsFeature.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/FactionsOneFeature.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsOneFeature.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/FactionsUUIDFeature.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsUUIDFeature.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/GriefPreventionFeature.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/GriefPreventionFeature.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/PlotMeFeature.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PlotMeFeature.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/PreciousStonesFeature.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PreciousStonesFeature.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/TownyFeature.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/TownyFeature.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java → bukkit/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java
View File

2
bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
View File

@ -73,7 +73,7 @@ public abstract class BukkitQueue_0<CHUNK, CHUNKSECTIONS, SECTION> extends NMSMa
return false;
}
public void checkVersion(String supported) {
public static void checkVersion(String supported) {
String version = Bukkit.getServer().getClass().getPackage().getName();
if (!version.contains(supported)) {
Fawe.debug("This version of FAWE is for: " + supported);

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java
View File

0
bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitChunk_1_10.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitChunk_1_10.java
View File

72
bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
View File

@ -24,33 +24,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ExecutorCompletionService;
import net.minecraft.server.v1_10_R1.Block;
import net.minecraft.server.v1_10_R1.BlockPosition;
import net.minecraft.server.v1_10_R1.ChunkSection;
import net.minecraft.server.v1_10_R1.DataBits;
import net.minecraft.server.v1_10_R1.DataPaletteBlock;
import net.minecraft.server.v1_10_R1.Entity;
import net.minecraft.server.v1_10_R1.EntityPlayer;
import net.minecraft.server.v1_10_R1.EntityTracker;
import net.minecraft.server.v1_10_R1.EntityTypes;
import net.minecraft.server.v1_10_R1.EnumDifficulty;
import net.minecraft.server.v1_10_R1.EnumGamemode;
import net.minecraft.server.v1_10_R1.EnumSkyBlock;
import net.minecraft.server.v1_10_R1.IBlockData;
import net.minecraft.server.v1_10_R1.IDataManager;
import net.minecraft.server.v1_10_R1.MinecraftServer;
import net.minecraft.server.v1_10_R1.NBTTagCompound;
import net.minecraft.server.v1_10_R1.NibbleArray;
import net.minecraft.server.v1_10_R1.PacketPlayOutMapChunk;
import net.minecraft.server.v1_10_R1.PlayerChunk;
import net.minecraft.server.v1_10_R1.PlayerChunkMap;
import net.minecraft.server.v1_10_R1.ServerNBTManager;
import net.minecraft.server.v1_10_R1.TileEntity;
import net.minecraft.server.v1_10_R1.WorldData;
import net.minecraft.server.v1_10_R1.WorldManager;
import net.minecraft.server.v1_10_R1.WorldServer;
import net.minecraft.server.v1_10_R1.WorldSettings;
import net.minecraft.server.v1_10_R1.WorldType;
import net.minecraft.server.v1_10_R1.*;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.World;
@ -276,32 +250,28 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
if (!chunk.isLoaded()) {
return;
}
try {
net.minecraft.server.v1_10_R1.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
WorldServer w = (WorldServer) nmsChunk.getWorld();
PlayerChunkMap chunkMap = w.getPlayerChunkMap();
PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
if (playerChunk == null) {
return;
}
if (playerChunk.c.isEmpty()) {
return;
}
// Send chunks
int mask = fc.getBitMask();
if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
for (EntityPlayer player : playerChunk.c) {
player.playerConnection.sendPacket(packet);
}
mask = 255;
}
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
net.minecraft.server.v1_10_R1.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
WorldServer w = (WorldServer) nmsChunk.getWorld();
PlayerChunkMap chunkMap = w.getPlayerChunkMap();
PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
if (playerChunk == null) {
return;
}
if (playerChunk.c.isEmpty()) {
return;
}
// Send chunks
int mask = fc.getBitMask();
if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
for (EntityPlayer player : playerChunk.c) {
player.playerConnection.sendPacket(packet);
}
} catch (Throwable e) {
e.printStackTrace();
mask = 255;
}
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
for (EntityPlayer player : playerChunk.c) {
player.playerConnection.sendPacket(packet);
}
}
@ -541,6 +511,6 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
@Override
public BukkitChunk_1_10 getFaweChunk(int x, int z) {
return new com.boydti.fawe.bukkit.v1_10.BukkitChunk_1_10(this, x, z);
return new BukkitChunk_1_10(this, x, z);
}
}

20
bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/FaweAdapter_1_10.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/FaweAdapter_1_10.java
View File

@ -30,25 +30,7 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.Nullable;
import net.minecraft.server.v1_10_R1.BiomeBase;
import net.minecraft.server.v1_10_R1.BlockPosition;
import net.minecraft.server.v1_10_R1.EntityTypes;
import net.minecraft.server.v1_10_R1.NBTBase;
import net.minecraft.server.v1_10_R1.NBTTagByte;
import net.minecraft.server.v1_10_R1.NBTTagByteArray;
import net.minecraft.server.v1_10_R1.NBTTagCompound;
import net.minecraft.server.v1_10_R1.NBTTagDouble;
import net.minecraft.server.v1_10_R1.NBTTagEnd;
import net.minecraft.server.v1_10_R1.NBTTagFloat;
import net.minecraft.server.v1_10_R1.NBTTagInt;
import net.minecraft.server.v1_10_R1.NBTTagIntArray;
import net.minecraft.server.v1_10_R1.NBTTagList;
import net.minecraft.server.v1_10_R1.NBTTagLong;
import net.minecraft.server.v1_10_R1.NBTTagShort;
import net.minecraft.server.v1_10_R1.NBTTagString;
import net.minecraft.server.v1_10_R1.TileEntity;
import net.minecraft.server.v1_10_R1.World;
import net.minecraft.server.v1_10_R1.WorldServer;
import net.minecraft.server.v1_10_R1.*;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;

0
bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java
View File

42
bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
View File

@ -250,32 +250,28 @@ public class BukkitQueue_1_11 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
if (!chunk.isLoaded()) {
return;
}
try {
net.minecraft.server.v1_11_R1.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
WorldServer w = (WorldServer) nmsChunk.getWorld();
PlayerChunkMap chunkMap = w.getPlayerChunkMap();
PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
if (playerChunk == null) {
return;
}
if (playerChunk.c.isEmpty()) {
return;
}
// Send chunks
int mask = fc.getBitMask();
if (mask == 0 || mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
for (EntityPlayer player : playerChunk.c) {
player.playerConnection.sendPacket(packet);
}
mask = 255;
}
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
net.minecraft.server.v1_11_R1.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
WorldServer w = (WorldServer) nmsChunk.getWorld();
PlayerChunkMap chunkMap = w.getPlayerChunkMap();
PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
if (playerChunk == null) {
return;
}
if (playerChunk.c.isEmpty()) {
return;
}
// Send chunks
int mask = fc.getBitMask();
if (mask == 0 || mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
for (EntityPlayer player : playerChunk.c) {
player.playerConnection.sendPacket(packet);
}
} catch (Throwable e) {
e.printStackTrace();
mask = 255;
}
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
for (EntityPlayer player : playerChunk.c) {
player.playerConnection.sendPacket(packet);
}
}

12
bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/FaweAdapter_1_11.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/FaweAdapter_1_11.java
View File

@ -71,23 +71,23 @@ public final class FaweAdapter_1_11 implements BukkitImplAdapter
}
@Nullable
private static String getEntityId(net.minecraft.server.v1_11_R1.Entity entity)
private static String getEntityId(Entity entity)
{
return EntityTypes.b(entity);
}
@Nullable
private static net.minecraft.server.v1_11_R1.Entity createEntityFromId(String id, World world)
private static Entity createEntityFromId(String id, World world)
{
return EntityTypes.a(new MinecraftKey(id), world);
}
private static void readTagIntoEntity(NBTTagCompound tag, net.minecraft.server.v1_11_R1.Entity entity)
private static void readTagIntoEntity(NBTTagCompound tag, Entity entity)
{
entity.f(tag);
}
private static void readEntityIntoTag(net.minecraft.server.v1_11_R1.Entity entity, NBTTagCompound tag)
private static void readEntityIntoTag(Entity entity, NBTTagCompound tag)
{
entity.e(tag);
}
@ -169,7 +169,7 @@ public final class FaweAdapter_1_11 implements BukkitImplAdapter
Preconditions.checkNotNull(entity);
CraftEntity craftEntity = (CraftEntity)entity;
net.minecraft.server.v1_11_R1.Entity mcEntity = craftEntity.getHandle();
Entity mcEntity = craftEntity.getHandle();
String id = getEntityId(mcEntity);
if (id != null) {
@ -190,7 +190,7 @@ public final class FaweAdapter_1_11 implements BukkitImplAdapter
CraftWorld craftWorld = (CraftWorld)location.getWorld();
WorldServer worldServer = craftWorld.getHandle();
net.minecraft.server.v1_11_R1.Entity createdEntity = createEntityFromId(state.getTypeId(), craftWorld.getHandle());
Entity createdEntity = createEntityFromId(state.getTypeId(), craftWorld.getHandle());
if (createdEntity != null)
{
CompoundTag nativeTag = state.getNbtData();

0
bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
View File

24
bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
View File

@ -22,29 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import net.minecraft.server.v1_7_R4.Block;
import net.minecraft.server.v1_7_R4.ChunkCoordIntPair;
import net.minecraft.server.v1_7_R4.ChunkPosition;
import net.minecraft.server.v1_7_R4.ChunkSection;
import net.minecraft.server.v1_7_R4.Entity;
import net.minecraft.server.v1_7_R4.EntityPlayer;
import net.minecraft.server.v1_7_R4.EntityTracker;
import net.minecraft.server.v1_7_R4.EntityTypes;
import net.minecraft.server.v1_7_R4.EnumDifficulty;
import net.minecraft.server.v1_7_R4.EnumGamemode;
import net.minecraft.server.v1_7_R4.EnumSkyBlock;
import net.minecraft.server.v1_7_R4.LongHashMap;
import net.minecraft.server.v1_7_R4.MinecraftServer;
import net.minecraft.server.v1_7_R4.NBTTagCompound;
import net.minecraft.server.v1_7_R4.NibbleArray;
import net.minecraft.server.v1_7_R4.PacketPlayOutMapChunk;
import net.minecraft.server.v1_7_R4.PlayerChunkMap;
import net.minecraft.server.v1_7_R4.ServerNBTManager;
import net.minecraft.server.v1_7_R4.TileEntity;
import net.minecraft.server.v1_7_R4.WorldManager;
import net.minecraft.server.v1_7_R4.WorldServer;
import net.minecraft.server.v1_7_R4.WorldSettings;
import net.minecraft.server.v1_7_R4.WorldType;
import net.minecraft.server.v1_7_R4.*;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.World;

0
bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java
View File

30
bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
View File

@ -23,29 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import net.minecraft.server.v1_8_R3.Block;
import net.minecraft.server.v1_8_R3.BlockPosition;
import net.minecraft.server.v1_8_R3.ChunkSection;
import net.minecraft.server.v1_8_R3.Entity;
import net.minecraft.server.v1_8_R3.EntityPlayer;
import net.minecraft.server.v1_8_R3.EntityTracker;
import net.minecraft.server.v1_8_R3.EntityTypes;
import net.minecraft.server.v1_8_R3.EnumDifficulty;
import net.minecraft.server.v1_8_R3.EnumSkyBlock;
import net.minecraft.server.v1_8_R3.LongHashMap;
import net.minecraft.server.v1_8_R3.MinecraftServer;
import net.minecraft.server.v1_8_R3.NBTTagCompound;
import net.minecraft.server.v1_8_R3.NibbleArray;
import net.minecraft.server.v1_8_R3.Packet;
import net.minecraft.server.v1_8_R3.PacketPlayOutMapChunk;
import net.minecraft.server.v1_8_R3.PlayerChunkMap;
import net.minecraft.server.v1_8_R3.ServerNBTManager;
import net.minecraft.server.v1_8_R3.TileEntity;
import net.minecraft.server.v1_8_R3.WorldData;
import net.minecraft.server.v1_8_R3.WorldManager;
import net.minecraft.server.v1_8_R3.WorldServer;
import net.minecraft.server.v1_8_R3.WorldSettings;
import net.minecraft.server.v1_8_R3.WorldType;
import net.minecraft.server.v1_8_R3.*;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.World;
@ -305,8 +283,10 @@ public class BukkitQueue18R3 extends BukkitQueue_0<Chunk, ChunkSection[], ChunkS
player.playerConnection.sendPacket(tilePacket);
}
}
} catch (Throwable e) {
MainUtil.handleError(e);
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}

0
bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java
View File

69
bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
View File

@ -23,32 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import net.minecraft.server.v1_9_R2.Block;
import net.minecraft.server.v1_9_R2.BlockPosition;
import net.minecraft.server.v1_9_R2.ChunkSection;
import net.minecraft.server.v1_9_R2.DataBits;
import net.minecraft.server.v1_9_R2.DataPaletteBlock;
import net.minecraft.server.v1_9_R2.Entity;
import net.minecraft.server.v1_9_R2.EntityPlayer;
import net.minecraft.server.v1_9_R2.EntityTracker;
import net.minecraft.server.v1_9_R2.EntityTypes;
import net.minecraft.server.v1_9_R2.EnumDifficulty;
import net.minecraft.server.v1_9_R2.EnumSkyBlock;
import net.minecraft.server.v1_9_R2.IBlockData;
import net.minecraft.server.v1_9_R2.IDataManager;
import net.minecraft.server.v1_9_R2.MinecraftServer;
import net.minecraft.server.v1_9_R2.NBTTagCompound;
import net.minecraft.server.v1_9_R2.NibbleArray;
import net.minecraft.server.v1_9_R2.PacketPlayOutMapChunk;
import net.minecraft.server.v1_9_R2.PlayerChunk;
import net.minecraft.server.v1_9_R2.PlayerChunkMap;
import net.minecraft.server.v1_9_R2.ServerNBTManager;
import net.minecraft.server.v1_9_R2.TileEntity;
import net.minecraft.server.v1_9_R2.WorldData;
import net.minecraft.server.v1_9_R2.WorldManager;
import net.minecraft.server.v1_9_R2.WorldServer;
import net.minecraft.server.v1_9_R2.WorldSettings;
import net.minecraft.server.v1_9_R2.WorldType;
import net.minecraft.server.v1_9_R2.*;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.World;
@ -142,32 +117,28 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<Chunk, ChunkSection[], Chu
if (!chunk.isLoaded()) {
return;
}
try {
net.minecraft.server.v1_9_R2.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
WorldServer w = (WorldServer) nmsChunk.getWorld();
PlayerChunkMap chunkMap = w.getPlayerChunkMap();
PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
if (playerChunk == null) {
return;
}
if (playerChunk.c.isEmpty()) {
return;
}
// Send chunks
int mask = fc.getBitMask();
if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
for (EntityPlayer player : playerChunk.c) {
player.playerConnection.sendPacket(packet);
}
mask = 255;
}
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
net.minecraft.server.v1_9_R2.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
WorldServer w = (WorldServer) nmsChunk.getWorld();
PlayerChunkMap chunkMap = w.getPlayerChunkMap();
PlayerChunk playerChunk = chunkMap.getChunk(nmsChunk.locX, nmsChunk.locZ);
if (playerChunk == null) {
return;
}
if (playerChunk.c.isEmpty()) {
return;
}
// Send chunks
int mask = fc.getBitMask();
if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
for (EntityPlayer player : playerChunk.c) {
player.playerConnection.sendPacket(packet);
}
} catch (Throwable e) {
e.printStackTrace();
mask = 255;
}
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
for (EntityPlayer player : playerChunk.c) {
player.playerConnection.sendPacket(packet);
}
}

20
bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/FaweAdapter_1_9.java → bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/FaweAdapter_1_9.java
View File

@ -30,25 +30,7 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.Nullable;
import net.minecraft.server.v1_9_R2.BiomeBase;
import net.minecraft.server.v1_9_R2.BlockPosition;
import net.minecraft.server.v1_9_R2.EntityTypes;
import net.minecraft.server.v1_9_R2.NBTBase;
import net.minecraft.server.v1_9_R2.NBTTagByte;
import net.minecraft.server.v1_9_R2.NBTTagByteArray;
import net.minecraft.server.v1_9_R2.NBTTagCompound;
import net.minecraft.server.v1_9_R2.NBTTagDouble;
import net.minecraft.server.v1_9_R2.NBTTagEnd;
import net.minecraft.server.v1_9_R2.NBTTagFloat;
import net.minecraft.server.v1_9_R2.NBTTagInt;
import net.minecraft.server.v1_9_R2.NBTTagIntArray;
import net.minecraft.server.v1_9_R2.NBTTagList;
import net.minecraft.server.v1_9_R2.NBTTagLong;
import net.minecraft.server.v1_9_R2.NBTTagShort;
import net.minecraft.server.v1_9_R2.NBTTagString;
import net.minecraft.server.v1_9_R2.TileEntity;
import net.minecraft.server.v1_9_R2.World;
import net.minecraft.server.v1_9_R2.WorldServer;
import net.minecraft.server.v1_9_R2.*;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java → bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlockState.java → bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlockState.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncChunk.java → bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncChunk.java
View File

0
bukkit0/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java → bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
View File

0
bukkit0/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender_unused_for_now.java → bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender_unused_for_now.java
View File

0
bukkit0/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java → bukkit/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java
View File

0
bukkit0/src/main/resources/config.yml → bukkit/src/main/resources/config.yml
View File

2
bukkit1710/src/main/resources/plugin.yml → bukkit/src/main/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: FastAsyncWorldEdit
main: com.boydti.fawe.bukkit.v1_7.BukkitMain_17
main: com.boydti.fawe.bukkit.BukkitMain
version: ${version}
description: Fast Async WorldEdit plugin
authors: [Empire92]

31
bukkit110/build.gradle
View File

@ -1,31 +0,0 @@
dependencies {
compile project(':bukkit0')
}
processResources {
from('src/main/resources') {
include 'plugin.yml'
expand(
name: project.parent.name,
version: project.parent.version
)
}
}
apply plugin: 'com.github.johnrengelman.shadow'
// We only want the shadow jar produced
jar.enabled = false
shadowJar {
dependencies {
include(dependency(':bukkit0'))
include(dependency(':core'))
}
archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
destinationDir = file '../target'
}
shadowJar.doLast {
task ->
ant.checksum file: task.archivePath
}
build.dependsOn(shadowJar);

23
bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitMain_110.java
View File

@ -1,23 +0,0 @@
package com.boydti.fawe.bukkit.v1_10;
import com.boydti.fawe.bukkit.ABukkitMain;
import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
import com.boydti.fawe.object.FaweQueue;
import com.sk89q.worldedit.world.World;
public class BukkitMain_110 extends ABukkitMain {
@Override
public BukkitQueue_0 getQueue(World world) {
return new BukkitQueue_1_10(world);
}
@Override
public FaweQueue getQueue(String world) {
return new BukkitQueue_1_10(world);
}
@Override
public void onEnable() {
super.onEnable();
}
}

30
bukkit110/src/main/resources/plugin.yml
View File

@ -1,30 +0,0 @@
name: ${name}
main: com.boydti.fawe.bukkit.v1_10.BukkitMain_110
version: ${version}
description: Fast Async WorldEdit plugin
authors: [Empire92]
loadbefore: [WorldEdit,AsyncWorldEdit,AsyncWorldEditInjector]
load: STARTUP
database: false
#softdepend: [WorldGuard, PlotSquared, MCore, Factions, GriefPrevention, Residence, Towny, PlotMe, PreciousStones]
commands:
wea:
description: (FAWE) Bypass WorldEdit processing and area restrictions
aliases: [weanywhere,worldeditanywhere,/wea,/weanywhere,/worldeditanywhere]
usage: "Vault is required for the toggle. Optionally, you can set the permission fawe.bypass"
fawe:
description: (FAWE) Reload the plugin
aliases: [/fawe,/fawereload]
select:
description: (FAWE) Select your current WorldEdit Region.
aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region]
fcancel:
description: (FAWE) Cancel your edit
aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
permissions:
fawe.bypass:
default: false
fawe.admin:
default: op
fawe.reload:
default: false

31
bukkit111/build.gradle
View File

@ -1,31 +0,0 @@
dependencies {
compile project(':bukkit0')
}
processResources {
from('src/main/resources') {
include 'plugin.yml'
expand(
name: project.parent.name,
version: project.parent.version
)
}
}
apply plugin: 'com.github.johnrengelman.shadow'
// We only want the shadow jar produced
jar.enabled = false
shadowJar {
dependencies {
include(dependency(':bukkit0'))
include(dependency(':core'))
}
archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
destinationDir = file '../target'
}
shadowJar.doLast {
task ->
ant.checksum file: task.archivePath
}
build.dependsOn(shadowJar);

23
bukkit111/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitMain_111.java
View File

@ -1,23 +0,0 @@
package com.boydti.fawe.bukkit.v1_11;
import com.boydti.fawe.bukkit.ABukkitMain;
import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
import com.boydti.fawe.object.FaweQueue;
import com.sk89q.worldedit.world.World;
public class BukkitMain_111 extends ABukkitMain {
@Override
public BukkitQueue_0 getQueue(World world) {
return new com.boydti.fawe.bukkit.v1_11.BukkitQueue_1_11(world);
}
@Override
public FaweQueue getQueue(String world) {
return new com.boydti.fawe.bukkit.v1_11.BukkitQueue_1_11(world);
}
@Override
public void onEnable() {
super.onEnable();
}
}

30
bukkit111/src/main/resources/plugin.yml
View File

@ -1,30 +0,0 @@
name: ${name}
main: com.boydti.fawe.bukkit.v1_11.BukkitMain_111
version: ${version}
description: Fast Async WorldEdit plugin
authors: [Empire92]
loadbefore: [WorldEdit,AsyncWorldEdit,AsyncWorldEditInjector]
load: STARTUP
database: false
#softdepend: [WorldGuard, PlotSquared, MCore, Factions, GriefPrevention, Residence, Towny, PlotMe, PreciousStones]
commands:
wea:
description: (FAWE) Bypass WorldEdit processing and area restrictions
aliases: [weanywhere,worldeditanywhere,/wea,/weanywhere,/worldeditanywhere]
usage: "Vault is required for the toggle. Optionally, you can set the permission fawe.bypass"
fawe:
description: (FAWE) Reload the plugin
aliases: [/fawe,/fawereload]
select:
description: (FAWE) Select your current WorldEdit Region.
aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region]
fcancel:
description: (FAWE) Cancel your edit
aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
permissions:
fawe.bypass:
default: false
fawe.admin:
default: op
fawe.reload:
default: false

35
bukkit1710/build.gradle
View File

@ -1,35 +0,0 @@
dependencies {
compile project(':bukkit0')
compile 'org.bukkit.craftbukkit:Craftbukkit:1.7.10'
}
processResources {
from('src/main/resources') {
include 'plugin.yml'
expand(
name: project.parent.name,
version: project.parent.version
)
}
}
apply plugin: 'com.github.johnrengelman.shadow'
// We only want the shadow jar produced
jar.enabled = false
shadowJar {
dependencies {
include(dependency(':bukkit0'))
include(dependency(':core'))
include(dependency('com.google.code.gson:gson:2.2.4'))
}
archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
destinationDir = file '../target'
relocate('com.google.gson', 'com.sk89q.worldedit.internal.gson')
}
shadowJar.doLast {
task ->
ant.checksum file: task.archivePath
}
build.dependsOn(shadowJar);

19
bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitMain_17.java
View File

@ -1,19 +0,0 @@
package com.boydti.fawe.bukkit.v1_7;
import com.boydti.fawe.bukkit.ABukkitMain;
import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
import com.boydti.fawe.object.FaweQueue;
import com.sk89q.worldedit.world.World;
public class BukkitMain_17 extends ABukkitMain {
@Override
public BukkitQueue_0 getQueue(World world) {
return new BukkitQueue17(world);
}
@Override
public FaweQueue getQueue(String world) {
return new BukkitQueue17(world);
}
}

32
bukkit18/build.gradle
View File

@ -1,32 +0,0 @@
dependencies {
compile project(':bukkit0')
compile 'org.bukkit.craftbukkit:CraftBukkit:1.8.8'
}
processResources {
from('src/main/resources') {
include 'plugin.yml'
expand(
name: project.parent.name,
version: project.parent.version
)
}
}
apply plugin: 'com.github.johnrengelman.shadow'
// We only want the shadow jar produced
jar.enabled = false
shadowJar {
dependencies {
include(dependency(':bukkit0'))
include(dependency(':core'))
}
archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
destinationDir = file '../target'
}
shadowJar.doLast {
task ->
ant.checksum file: task.archivePath
}
build.dependsOn(shadowJar);

19
bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitMain_18.java
View File

@ -1,19 +0,0 @@
package com.boydti.fawe.bukkit.v1_8;
import com.boydti.fawe.bukkit.ABukkitMain;
import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
import com.boydti.fawe.object.FaweQueue;
import com.sk89q.worldedit.world.World;
public class BukkitMain_18 extends ABukkitMain {
@Override
public BukkitQueue_0 getQueue(World world) {
return new BukkitQueue18R3(world);
}
@Override
public FaweQueue getQueue(String world) {
return new BukkitQueue18R3(world);
}
}

30
bukkit18/src/main/resources/plugin.yml
View File

@ -1,30 +0,0 @@
name: FastAsyncWorldEdit
main: com.boydti.fawe.bukkit.v1_8.BukkitMain_18
version: ${version}
description: Fast Async WorldEdit plugin
authors: [Empire92]
loadbefore: [WorldEdit,AsyncWorldEdit,AsyncWorldEditInjector]
load: STARTUP
database: false
#softdepend: [WorldGuard, PlotSquared, MCore, Factions, GriefPrevention, Residence, Towny, PlotMe, PreciousStones]
commands:
wea:
description: (FAWE) Bypass WorldEdit processing and area restrictions
aliases: [weanywhere,worldeditanywhere,/wea,/weanywhere,/worldeditanywhere]
usage: "Vault is required for the toggle. Optionally, you can set the permission fawe.bypass"
fawe:
description: (FAWE) Reload the plugin
aliases: [/fawe,/fawereload]
select:
description: (FAWE) Select your current WorldEdit Region.
aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region]
fcancel:
description: (FAWE) Cancel your edit
aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
permissions:
fawe.bypass:
default: false
fawe.admin:
default: op
fawe.reload:
default: false

32
bukkit19/build.gradle
View File

@ -1,32 +0,0 @@
dependencies {
compile project(':bukkit0')
compile 'org.bukkit.craftbukkit.v1_9R2:craftbukkitv1_9R2:1.9.4'
}
processResources {
from('src/main/resources') {
include 'plugin.yml'
expand(
name: project.parent.name,
version: project.parent.version
)
}
}
apply plugin: 'com.github.johnrengelman.shadow'
// We only want the shadow jar produced
jar.enabled = false
shadowJar {
dependencies {
include(dependency(':bukkit0'))
include(dependency(':core'))
}
archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
destinationDir = file '../target'
}
shadowJar.doLast {
task ->
ant.checksum file: task.archivePath
}
build.dependsOn(shadowJar);

18
bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitMain_19.java
View File

@ -1,18 +0,0 @@
package com.boydti.fawe.bukkit.v1_9;
import com.boydti.fawe.bukkit.ABukkitMain;
import com.boydti.fawe.bukkit.v0.BukkitQueue_0;
import com.boydti.fawe.object.FaweQueue;
import com.sk89q.worldedit.world.World;
public class BukkitMain_19 extends ABukkitMain {
@Override
public BukkitQueue_0 getQueue(World world) {
return new BukkitQueue_1_9_R1(world);
}
@Override
public FaweQueue getQueue(String world) {
return new BukkitQueue_1_9_R1(world);
}
}

33
bukkit19/src/main/resources/plugin.yml
View File

@ -1,33 +0,0 @@
name: ${name}
main: com.boydti.fawe.bukkit.v1_9.BukkitMain_19
version: ${version}
description: Fast Async WorldEdit plugin
authors: [Empire92]
loadbefore: [WorldEdit,AsyncWorldEdit,AsyncWorldEditInjector]
load: STARTUP
database: false
#softdepend: [WorldGuard, PlotSquared, MCore, Factions, GriefPrevention, Residence, Towny, PlotMe, PreciousStones]
commands:
wea:
description: (FAWE) Bypass WorldEdit processing and area restrictions
aliases: [weanywhere,worldeditanywhere,/wea,/weanywhere,/worldeditanywhere]
usage: "Vault is required for the toggle. Optionally, you can set the permission fawe.bypass"
fixlighting:
description: (FAWE) Fix the lighting in your current chunk
aliases: [/fixlighting]
fawe:
description: (FAWE) Reload the plugin
aliases: [/fawe,/fawereload]
select:
description: (FAWE) Select your current WorldEdit Region.
aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region]
fcancel:
description: (FAWE) Cancel your edit
aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
permissions:
fawe.bypass:
default: false
fawe.admin:
default: op
fawe.reload:
default: false

7
core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java
View File

@ -4,6 +4,7 @@ import com.boydti.fawe.FaweCache;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.object.FaweChunk;
import com.boydti.fawe.object.exception.FaweException;
import com.boydti.fawe.util.MainUtil;
import com.boydti.fawe.util.TaskManager;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.world.World;
@ -88,7 +89,11 @@ public abstract class NMSMappedFaweQueue<WORLD, CHUNK, CHUNKSECTION, SECTION> ex
@Override
public void sendChunk(final FaweChunk fc) {
refreshChunk(fc);
try {
refreshChunk(fc);
} catch (Throwable e) {
MainUtil.handleError(e);
}
}
public abstract void setHeightMap(FaweChunk chunk, byte[] heightMap);

4
favs/build.gradle
View File

@ -1,6 +1,6 @@
dependencies {
compile project(':bukkit0')
compile 'org.bukkit.craftbukkit:CraftBukkit:1.8.8'
compile project(':bukkit')
compile 'org.bukkit.craftbukkit:CraftBukkit:1.8.8'
}
processResources {

2
settings.gradle
View File

@ -1,3 +1,3 @@
rootProject.name = 'FastAsyncWorldEdit'
include 'core', 'bukkit0', 'bukkit1710', 'bukkit18', 'bukkit19', 'bukkit110', 'bukkit111', 'forge1710', 'forge189', 'forge194', 'forge110', 'favs', 'nukkit'
include 'core', 'bukkit', 'forge1710', 'forge189', 'forge194', 'forge110', 'favs', 'nukkit'