mirror of
https://github.com/boy0001/FastAsyncWorldedit.git
synced 2024-11-28 13:45:36 +01:00
parent
3d81e98a2a
commit
b9fdfb8b01
@ -314,7 +314,7 @@ public class BukkitChunk_1_7 extends CharFaweChunk<Chunk, BukkitQueue17> {
|
|||||||
byte[] currentIdArray = (byte[]) BukkitQueue17.fieldIds.get(section);
|
byte[] currentIdArray = (byte[]) BukkitQueue17.fieldIds.get(section);
|
||||||
NibbleArray currentDataArray = (NibbleArray) BukkitQueue17.fieldData.get(section);
|
NibbleArray currentDataArray = (NibbleArray) BukkitQueue17.fieldData.get(section);
|
||||||
boolean data = currentDataArray != null && newDataArray != null;
|
boolean data = currentDataArray != null && newDataArray != null;
|
||||||
if (!data) {
|
if (currentDataArray == null && newDataArray != null) {
|
||||||
section.setDataArray(newDataArray);
|
section.setDataArray(newDataArray);
|
||||||
}
|
}
|
||||||
if (currentIdArray == null) {
|
if (currentIdArray == null) {
|
||||||
|
@ -374,14 +374,17 @@ public class MainUtil {
|
|||||||
|
|
||||||
public static File getJarFile() {
|
public static File getJarFile() {
|
||||||
try {
|
try {
|
||||||
URL url = Fawe.class.getProtectionDomain().getCodeSource().getLocation();
|
return getJarFile(Fawe.class);
|
||||||
return new File(new URL(url.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file")).toURI().getPath());
|
|
||||||
} catch (MalformedURLException | URISyntaxException | SecurityException e) {
|
} catch (MalformedURLException | URISyntaxException | SecurityException e) {
|
||||||
MainUtil.handleError(e);
|
|
||||||
return new File(Fawe.imp().getDirectory().getParentFile(), "FastAsyncWorldEdit.jar");
|
return new File(Fawe.imp().getDirectory().getParentFile(), "FastAsyncWorldEdit.jar");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static File getJarFile(Class<?> clazz) throws URISyntaxException, MalformedURLException {
|
||||||
|
URL url = clazz.getProtectionDomain().getCodeSource().getLocation();
|
||||||
|
return new File(new URL(url.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file")).toURI().getPath());
|
||||||
|
}
|
||||||
|
|
||||||
public static void sendCompressedMessage(FaweStreamChangeSet set, FawePlayer actor)
|
public static void sendCompressedMessage(FaweStreamChangeSet set, FawePlayer actor)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
@ -215,10 +215,11 @@ public class BundledBlockData {
|
|||||||
new Vector(0, -1, 0)};
|
new Vector(0, -1, 0)};
|
||||||
int len = dir.values.size();
|
int len = dir.values.size();
|
||||||
int index = 0;
|
int index = 0;
|
||||||
|
int amount = (dir.values.size() + 7)/ 8;
|
||||||
for (Map.Entry<String, FaweStateValue> valuesEntry : dir.values.entrySet()) {
|
for (Map.Entry<String, FaweStateValue> valuesEntry : dir.values.entrySet()) {
|
||||||
FaweStateValue state = valuesEntry.getValue();
|
FaweStateValue state = valuesEntry.getValue();
|
||||||
if (state != null) {
|
if (state != null) {
|
||||||
state.setDirection(dirs[index]);
|
state.setDirection(dirs[index / amount]);
|
||||||
}
|
}
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
|||||||
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
|
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.5.1", acceptableRemoteVersions = "*")
|
@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.5.1", acceptableRemoteVersions = "*", dependencies = "before:worldedit")
|
||||||
public class ForgeMain {
|
public class ForgeMain {
|
||||||
private static com.boydti.fawe.forge.FaweForge IMP;
|
private static com.boydti.fawe.forge.FaweForge IMP;
|
||||||
private Logger logger;
|
private Logger logger;
|
||||||
|
@ -17,7 +17,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
|||||||
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
|
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.5.1", acceptableRemoteVersions = "*")
|
@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.5.1", acceptableRemoteVersions = "*", dependencies = "before:worldedit")
|
||||||
public class ForgeMain {
|
public class ForgeMain {
|
||||||
private static com.boydti.fawe.forge.FaweForge IMP;
|
private static com.boydti.fawe.forge.FaweForge IMP;
|
||||||
private Logger logger;
|
private Logger logger;
|
||||||
|
@ -19,7 +19,7 @@ import net.minecraftforge.common.MinecraftForge;
|
|||||||
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
|
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.5.1", acceptableRemoteVersions = "*")
|
@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.5.1", acceptableRemoteVersions = "*", dependencies = "before:worldedit")
|
||||||
public class ForgeMain {
|
public class ForgeMain {
|
||||||
private static FaweForge IMP;
|
private static FaweForge IMP;
|
||||||
private Logger logger;
|
private Logger logger;
|
||||||
|
@ -263,7 +263,7 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
|
|||||||
byte[] currentIdArray = section.getBlockLSBArray();
|
byte[] currentIdArray = section.getBlockLSBArray();
|
||||||
NibbleArray currentDataArray = section.getMetadataArray();
|
NibbleArray currentDataArray = section.getMetadataArray();
|
||||||
boolean data = currentDataArray != null && newDataArray != null;
|
boolean data = currentDataArray != null && newDataArray != null;
|
||||||
if (!data) {
|
if (currentDataArray == null && newDataArray != null) {
|
||||||
section.setBlockMetadataArray(newDataArray);
|
section.setBlockMetadataArray(newDataArray);
|
||||||
}
|
}
|
||||||
int solid = 0;
|
int solid = 0;
|
||||||
|
@ -19,7 +19,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
|||||||
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
|
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.5.1", acceptableRemoteVersions = "*")
|
@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.5.1", acceptableRemoteVersions = "*", dependencies = "before:worldedit")
|
||||||
public class ForgeMain {
|
public class ForgeMain {
|
||||||
private static com.boydti.fawe.forge.FaweForge IMP;
|
private static com.boydti.fawe.forge.FaweForge IMP;
|
||||||
private Logger logger;
|
private Logger logger;
|
||||||
|
@ -18,7 +18,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
|||||||
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
|
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.5.1", acceptableRemoteVersions = "*")
|
@Mod(modid = "com.boydti.fawe", name = "FastAsyncWorldEdit", version = "3.5.1", acceptableRemoteVersions = "*", dependencies = "before:worldedit")
|
||||||
public class ForgeMain {
|
public class ForgeMain {
|
||||||
private static com.boydti.fawe.forge.FaweForge IMP;
|
private static com.boydti.fawe.forge.FaweForge IMP;
|
||||||
private Logger logger;
|
private Logger logger;
|
||||||
|
Loading…
Reference in New Issue
Block a user