EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-02 20:45:28 +02:00
Code Issues Projects Releases Wiki Activity

Update code style

Browse Source
This commit is contained in:
nossr50
2019-04-24 22:52:53 -07:00
parent dc758a6dfc
commit 02a69cbb05
334 changed files with 4660 additions and 5158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java
View File

@@ -7,9 +7,9 @@ public interface ChunkletManager {
/**
* Loads a specific chunklet
*
* @param cx Chunklet X coordinate that needs to be loaded
* @param cy Chunklet Y coordinate that needs to be loaded
* @param cz Chunklet Z coordinate that needs to be loaded
* @param cx Chunklet X coordinate that needs to be loaded
* @param cy Chunklet Y coordinate that needs to be loaded
* @param cz Chunklet Z coordinate that needs to be loaded
* @param world World that the chunklet needs to be loaded in
*/
void loadChunklet(int cx, int cy, int cz, World world);
@@ -17,9 +17,9 @@ public interface ChunkletManager {
/**
* Unload a specific chunklet
*
* @param cx Chunklet X coordinate that needs to be unloaded
* @param cy Chunklet Y coordinate that needs to be unloaded
* @param cz Chunklet Z coordinate that needs to be unloaded
* @param cx Chunklet X coordinate that needs to be unloaded
* @param cy Chunklet Y coordinate that needs to be unloaded
* @param cz Chunklet Z coordinate that needs to be unloaded
* @param world World that the chunklet needs to be unloaded from
*/
void unloadChunklet(int cx, int cy, int cz, World world);
@@ -27,8 +27,8 @@ public interface ChunkletManager {
/**
* Load a given Chunk's Chunklet data
*
* @param cx Chunk X coordinate that is to be loaded
* @param cz Chunk Z coordinate that is to be loaded
* @param cx Chunk X coordinate that is to be loaded
* @param cz Chunk Z coordinate that is to be loaded
* @param world World that the Chunk is in
*/
void loadChunk(int cx, int cz, World world);
@@ -36,8 +36,8 @@ public interface ChunkletManager {
/**
* Unload a given Chunk's Chunklet data
*
* @param cx Chunk X coordinate that is to be unloaded
* @param cz Chunk Z coordinate that is to be unloaded
* @param cx Chunk X coordinate that is to be unloaded
* @param cz Chunk Z coordinate that is to be unloaded
* @param world World that the Chunk is in
*/
void unloadChunk(int cx, int cz, World world);
@@ -45,8 +45,8 @@ public interface ChunkletManager {
/**
* Informs the ChunkletManager a chunk is loaded
*
* @param cx Chunk X coordinate that is loaded
* @param cz Chunk Z coordinate that is loaded
* @param cx Chunk X coordinate that is loaded
* @param cz Chunk Z coordinate that is loaded
* @param world World that the chunk was loaded in
*/
void chunkLoaded(int cx, int cz, World world);
@@ -54,8 +54,8 @@ public interface ChunkletManager {
/**
* Informs the ChunkletManager a chunk is unloaded
*
* @param cx Chunk X coordinate that is unloaded
* @param cz Chunk Z coordinate that is unloaded
* @param cx Chunk X coordinate that is unloaded
* @param cz Chunk Z coordinate that is unloaded
* @param world World that the chunk was unloaded in
*/
void chunkUnloaded(int cx, int cz, World world);
@@ -94,9 +94,9 @@ public interface ChunkletManager {
/**
* Check to see if a given location is set to true
*
* @param x X coordinate to check
* @param y Y coordinate to check
* @param z Z coordinate to check
* @param x X coordinate to check
* @param y Y coordinate to check
* @param z Z coordinate to check
* @param world World to check in
* @return true if the given location is set to true, false if otherwise
*/
@@ -113,9 +113,9 @@ public interface ChunkletManager {
/**
* Set a given location to true, should create stores as necessary if the location does not exist
*
* @param x X coordinate to set
* @param y Y coordinate to set
* @param z Z coordinate to set
* @param x X coordinate to set
* @param y Y coordinate to set
* @param z Z coordinate to set
* @param world World to set in
*/
void setTrue(int x, int y, int z, World world);
@@ -130,9 +130,9 @@ public interface ChunkletManager {
/**
* Set a given location to false, should not create stores if one does not exist for the given location
*
* @param x X coordinate to set
* @param y Y coordinate to set
* @param z Z coordinate to set
* @param x X coordinate to set
* @param y Y coordinate to set
* @param z Z coordinate to set
* @param world World to set in
*/
void setFalse(int x, int y, int z, World world);

35
src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java
View File

@@ -295,7 +295,7 @@ public class HashChunkletManager implements ChunkletManager {
}
/**
* @param cStore ChunkletStore to save
* @param cStore ChunkletStore to save
* @param location Where on the disk to put it
*/
private void serializeChunkletStore(ChunkletStore cStore, File location) {
@@ -309,17 +309,14 @@ public class HashChunkletManager implements ChunkletManager {
fileOut = new FileOutputStream(location);
objOut = new ObjectOutputStream(fileOut);
objOut.writeObject(cStore);
}
catch (IOException ex) {
} catch (IOException ex) {
ex.printStackTrace();
}
finally {
} finally {
if (objOut != null) {
try {
objOut.flush();
objOut.close();
}
catch (IOException ex) {
} catch (IOException ex) {
ex.printStackTrace();
}
}
@@ -327,8 +324,7 @@ public class HashChunkletManager implements ChunkletManager {
if (fileOut != null) {
try {
fileOut.close();
}
catch (IOException ex) {
} catch (IOException ex) {
ex.printStackTrace();
}
}
@@ -348,35 +344,29 @@ public class HashChunkletManager implements ChunkletManager {
fileIn = new FileInputStream(location);
objIn = new ObjectInputStream(fileIn);
storeIn = (ChunkletStore) objIn.readObject();
}
catch (IOException ex) {
} catch (IOException ex) {
if (ex instanceof EOFException) {
// EOF should only happen on Chunklets that somehow have been corrupted.
//mcMMO.p.getLogger().severe("Chunklet data at " + location.toString() + " could not be read due to an EOFException, data in this area will be lost.");
return ChunkletStoreFactory.getChunkletStore();
}
else if (ex instanceof StreamCorruptedException) {
} else if (ex instanceof StreamCorruptedException) {
// StreamCorrupted happens when the Chunklet is no good.
//mcMMO.p.getLogger().severe("Chunklet data at " + location.toString() + " is corrupted, data in this area will be lost.");
return ChunkletStoreFactory.getChunkletStore();
}
else if (ex instanceof UTFDataFormatException) {
} else if (ex instanceof UTFDataFormatException) {
// UTF happens when the Chunklet cannot be read or is corrupted
//mcMMO.p.getLogger().severe("Chunklet data at " + location.toString() + " could not be read due to an UTFDataFormatException, data in this area will be lost.");
return ChunkletStoreFactory.getChunkletStore();
}
ex.printStackTrace();
}
catch (ClassNotFoundException ex) {
} catch (ClassNotFoundException ex) {
ex.printStackTrace();
}
finally {
} finally {
if (objIn != null) {
try {
objIn.close();
}
catch (IOException ex) {
} catch (IOException ex) {
ex.printStackTrace();
}
}
@@ -384,8 +374,7 @@ public class HashChunkletManager implements ChunkletManager {
if (fileIn != null) {
try {
fileIn.close();
}
catch (IOException ex) {
} catch (IOException ex) {
ex.printStackTrace();
}
}

2
src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java
View File

@@ -5,7 +5,7 @@ import org.bukkit.block.Block;
/**
* A ChunkletManager implementation that does nothing and returns false for all checks.
*
* <p>
* Useful for turning off Chunklets without actually doing much work
*/
public class NullChunkletManager implements ChunkletManager {

4
src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java
View File

@@ -3,7 +3,9 @@ package com.gmail.nossr50.util.blockmeta;
public class PrimitiveChunkletStore implements ChunkletStore {
private static final long serialVersionUID = -3453078050608607478L;
/** X, Z, Y */
/**
* X, Z, Y
*/
public boolean[][][] store = new boolean[16][16][64];
@Override

66
src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java
View File

@@ -8,9 +8,42 @@ import java.io.ObjectOutput;
public class PrimitiveExChunkletStore implements ChunkletStore, Externalizable {
private static final long serialVersionUID = 8603603827094383873L;
/** X, Z, Y */
/**
* X, Z, Y
*/
public boolean[][][] store = new boolean[16][16][64];
/*
* The address byte: A single byte which contains x and z values which correspond to the x and z Chunklet-coordinates
*
* In Chunklet-coordinates, the only valid values are 0-15, so we can fit both into a single byte.
*
* The top 4 bits of the address byte are for the x value
* The bottom 4 bits of the address byte are for the z value
*
* Examples:
* An address byte with a value 00000001 would be split like so:
* - x = 0000 = 0
* - z = 0001 = 1
* => Chunklet coordinates (0, 1)
*
* 01011111
* - x = 0101 = 5
* - z = 1111 = 15
* => Chunklet coordinates (5, 15)
*/
protected static byte makeAddressByte(int x, int z) {
return (byte) ((x << 4) + z);
}
protected static int addressByteX(byte address) {
return (address & 0xF0) >>> 4;
}
protected static int addressByteZ(byte address) {
return address & 0x0F;
}
@Override
public boolean isTrue(int x, int y, int z) {
return store[x][z][y];
@@ -146,35 +179,4 @@ public class PrimitiveExChunkletStore implements ChunkletStore, Externalizable {
return column;
}
/*
* The address byte: A single byte which contains x and z values which correspond to the x and z Chunklet-coordinates
*
* In Chunklet-coordinates, the only valid values are 0-15, so we can fit both into a single byte.
*
* The top 4 bits of the address byte are for the x value
* The bottom 4 bits of the address byte are for the z value
*
* Examples:
* An address byte with a value 00000001 would be split like so:
* - x = 0000 = 0
* - z = 0001 = 1
* => Chunklet coordinates (0, 1)
*
* 01011111
* - x = 0101 = 5
* - z = 1111 = 15
* => Chunklet coordinates (5, 15)
*/
protected static byte makeAddressByte(int x, int z) {
return (byte) ((x << 4) + z);
}
protected static int addressByteX(byte address) {
return (address & 0xF0) >>> 4;
}
protected static int addressByteZ(byte address) {
return address & 0x0F;
}
}

50
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java
View File

@@ -19,9 +19,9 @@ public interface ChunkManager {
/**
* Loads a specific chunklet
*
* @param cx Chunklet X coordinate that needs to be loaded
* @param cy Chunklet Y coordinate that needs to be loaded
* @param cz Chunklet Z coordinate that needs to be loaded
* @param cx Chunklet X coordinate that needs to be loaded
* @param cy Chunklet Y coordinate that needs to be loaded
* @param cz Chunklet Z coordinate that needs to be loaded
* @param world World that the chunklet needs to be loaded in
*/
void loadChunklet(int cx, int cy, int cz, World world);
@@ -29,9 +29,9 @@ public interface ChunkManager {
/**
* Unload a specific chunklet
*
* @param cx Chunklet X coordinate that needs to be unloaded
* @param cy Chunklet Y coordinate that needs to be unloaded
* @param cz Chunklet Z coordinate that needs to be unloaded
* @param cx Chunklet X coordinate that needs to be unloaded
* @param cy Chunklet Y coordinate that needs to be unloaded
* @param cz Chunklet Z coordinate that needs to be unloaded
* @param world World that the chunklet needs to be unloaded from
*/
void unloadChunklet(int cx, int cy, int cz, World world);
@@ -39,8 +39,8 @@ public interface ChunkManager {
/**
* Load a given Chunk's Chunklet data
*
* @param cx Chunk X coordinate that is to be loaded
* @param cz Chunk Z coordinate that is to be loaded
* @param cx Chunk X coordinate that is to be loaded
* @param cz Chunk Z coordinate that is to be loaded
* @param world World that the Chunk is in
*/
void loadChunk(int cx, int cz, World world, Entity[] entities);
@@ -48,8 +48,8 @@ public interface ChunkManager {
/**
* Unload a given Chunk's Chunklet data
*
* @param cx Chunk X coordinate that is to be unloaded
* @param cz Chunk Z coordinate that is to be unloaded
* @param cx Chunk X coordinate that is to be unloaded
* @param cz Chunk Z coordinate that is to be unloaded
* @param world World that the Chunk is in
*/
void unloadChunk(int cx, int cz, World world);
@@ -57,8 +57,8 @@ public interface ChunkManager {
/**
* Saves a given Chunk's Chunklet data
*
* @param cx Chunk X coordinate that is to be saved
* @param cz Chunk Z coordinate that is to be saved
* @param cx Chunk X coordinate that is to be saved
* @param cz Chunk Z coordinate that is to be saved
* @param world World that the Chunk is in
*/
void saveChunk(int cx, int cz, World world);
@@ -68,8 +68,8 @@ public interface ChunkManager {
/**
* Informs the ChunkletManager a chunk is loaded
*
* @param cx Chunk X coordinate that is loaded
* @param cz Chunk Z coordinate that is loaded
* @param cx Chunk X coordinate that is loaded
* @param cz Chunk Z coordinate that is loaded
* @param world World that the chunk was loaded in
*/
void chunkLoaded(int cx, int cz, World world);
@@ -77,8 +77,8 @@ public interface ChunkManager {
/**
* Informs the ChunkletManager a chunk is unloaded
*
* @param cx Chunk X coordinate that is unloaded
* @param cz Chunk Z coordinate that is unloaded
* @param cx Chunk X coordinate that is unloaded
* @param cz Chunk Z coordinate that is unloaded
* @param world World that the chunk was unloaded in
*/
void chunkUnloaded(int cx, int cz, World world);
@@ -117,9 +117,9 @@ public interface ChunkManager {
/**
* Check to see if a given location is set to true
*
* @param x X coordinate to check
* @param y Y coordinate to check
* @param z Z coordinate to check
* @param x X coordinate to check
* @param y Y coordinate to check
* @param z Z coordinate to check
* @param world World to check in
* @return true if the given location is set to true, false if otherwise
*/
@@ -144,9 +144,9 @@ public interface ChunkManager {
/**
* Set a given location to true, should create stores as necessary if the location does not exist
*
* @param x X coordinate to set
* @param y Y coordinate to set
* @param z Z coordinate to set
* @param x X coordinate to set
* @param y Y coordinate to set
* @param z Z coordinate to set
* @param world World to set in
*/
void setTrue(int x, int y, int z, World world);
@@ -168,9 +168,9 @@ public interface ChunkManager {
/**
* Set a given location to false, should not create stores if one does not exist for the given location
*
* @param x X coordinate to set
* @param y Y coordinate to set
* @param z Z coordinate to set
* @param x X coordinate to set
* @param y Y coordinate to set
* @param z Z coordinate to set
* @param world World to set in
*/
void setFalse(int x, int y, int z, World world);

26
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java
View File

@@ -11,9 +11,9 @@ import java.io.*;
import java.util.*;
public class HashChunkManager implements ChunkManager {
private HashMap<UUID, HashMap<Long, McMMOSimpleRegionFile>> regionFiles = new HashMap<>();
public HashMap<String, ChunkStore> store = new HashMap<>();
public ArrayList<BlockStoreConversionZDirectory> converters = new ArrayList<>();
private HashMap<UUID, HashMap<Long, McMMOSimpleRegionFile>> regionFiles = new HashMap<>();
private HashMap<UUID, Boolean> oldData = new HashMap<>();
@Override
@@ -65,8 +65,7 @@ public class HashChunkManager implements ChunkManager {
objectStream.flush();
objectStream.close();
data.setDirty(false);
}
catch (IOException e) {
} catch (IOException e) {
throw new RuntimeException("Unable to write chunk meta data for " + x + ", " + z, e);
}
}
@@ -129,8 +128,7 @@ public class HashChunkManager implements ChunkManager {
if (!oldData.containsKey(key)) {
oldData.put(key, (new File(world.getWorldFolder(), "mcmmo_data")).exists());
}
else if (oldData.get(key)) {
} else if (oldData.get(key)) {
if (convertChunk(new File(world.getWorldFolder(), "mcmmo_data"), cx, cz, world, true)) {
return;
}
@@ -140,8 +138,9 @@ public class HashChunkManager implements ChunkManager {
try {
chunkStore = readChunkStore(world, cx, cz);
} catch (Exception e) {
e.printStackTrace();
}
catch (Exception e) { e.printStackTrace(); }
if (chunkStore == null) {
return;
@@ -187,7 +186,8 @@ public class HashChunkManager implements ChunkManager {
}
@Override
public synchronized void chunkLoaded(int cx, int cz, World world) {}
public synchronized void chunkLoaded(int cx, int cz, World world) {
}
@Override
public synchronized void chunkUnloaded(int cx, int cz, World world) {
@@ -213,8 +213,7 @@ public class HashChunkManager implements ChunkManager {
if (worldName.equals(info[0])) {
try {
saveChunk(Integer.parseInt(info[1]), Integer.parseInt(info[2]), world);
}
catch (Exception e) {
} catch (Exception e) {
// Ignore
}
}
@@ -236,8 +235,7 @@ public class HashChunkManager implements ChunkManager {
if (worldName.equals(info[0])) {
try {
unloadChunk(Integer.parseInt(info[1]), Integer.parseInt(info[2]), world);
}
catch (Exception e) {
} catch (Exception e) {
// Ignore
}
}
@@ -245,7 +243,8 @@ public class HashChunkManager implements ChunkManager {
}
@Override
public synchronized void loadWorld(World world) {}
public synchronized void loadWorld(World world) {
}
@Override
public synchronized void saveAll() {
@@ -401,7 +400,8 @@ public class HashChunkManager implements ChunkManager {
}
@Override
public synchronized void cleanUp() {}
public synchronized void cleanUp() {
}
public synchronized void convertChunk(File dataDir, int cx, int cz, World world) {
convertChunk(dataDir, cx, cz, world, false);

26
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java
View File

@@ -25,21 +25,21 @@ import java.util.zip.DeflaterOutputStream;
import java.util.zip.InflaterInputStream;
public class McMMOSimpleRegionFile {
private RandomAccessFile file;
@SuppressWarnings("unused")
private static long TIMEOUT_TIME = 300000; // 5 min
private final int[] dataStart = new int[1024];
private final int[] dataActualLength = new int[1024];
private final int[] dataLength = new int[1024];
private final ArrayList<Boolean> inuse = new ArrayList<>();
private int segmentSize;
private int segmentMask;
private final int rx;
private final int rz;
private final int defaultSegmentSize;
private final File parent;
private RandomAccessFile file;
private int segmentSize;
private int segmentMask;
@SuppressWarnings("unused")
private long lastAccessTime = System.currentTimeMillis();
@SuppressWarnings("unused")
private static long TIMEOUT_TIME = 300000; // 5 min
public McMMOSimpleRegionFile(File f, int rx, int rz) {
this(f, rx, rz, 10);
@@ -91,8 +91,7 @@ public class McMMOSimpleRegionFile {
}
extendFile();
}
catch (IOException fnfe) {
} catch (IOException fnfe) {
throw new RuntimeException(fnfe);
}
}
@@ -139,16 +138,15 @@ public class McMMOSimpleRegionFile {
}
extendFile();
}
catch (IOException fnfe) {
} catch (IOException fnfe) {
throw new RuntimeException(fnfe);
}
}
return file;
}
/* public synchronized boolean testCloseTimeout() {
*//*
/* public synchronized boolean testCloseTimeout() {
*//*
if (System.currentTimeMillis() - TIMEOUT_TIME > lastAccessTime) {
close();
return true;
@@ -197,8 +195,7 @@ public class McMMOSimpleRegionFile {
}
file = null;
}
catch (IOException ioe) {
} catch (IOException ioe) {
throw new RuntimeException("Unable to close file", ioe);
}
}
@@ -261,8 +258,7 @@ public class McMMOSimpleRegionFile {
if (inuse.get(end)) {
end++;
start = end;
}
else {
} else {
end++;
}

66
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java
View File

@@ -8,7 +8,8 @@ import org.bukkit.entity.Entity;
public class NullChunkManager implements ChunkManager {
@Override
public void closeAll() {}
public void closeAll() {
}
@Override
public ChunkStore readChunkStore(World world, int x, int z) {
@@ -16,25 +17,32 @@ public class NullChunkManager implements ChunkManager {
}
@Override
public void writeChunkStore(World world, int x, int z, ChunkStore data) {}
public void writeChunkStore(World world, int x, int z, ChunkStore data) {
}
@Override
public void closeChunkStore(World world, int x, int z) {}
public void closeChunkStore(World world, int x, int z) {
}
@Override
public void loadChunklet(int cx, int cy, int cz, World world) {}
public void loadChunklet(int cx, int cy, int cz, World world) {
}
@Override
public void unloadChunklet(int cx, int cy, int cz, World world) {}
public void unloadChunklet(int cx, int cy, int cz, World world) {
}
@Override
public void loadChunk(int cx, int cz, World world, Entity[] entities) {}
public void loadChunk(int cx, int cz, World world, Entity[] entities) {
}
@Override
public void unloadChunk(int cx, int cz, World world) {}
public void unloadChunk(int cx, int cz, World world) {
}
@Override
public void saveChunk(int cx, int cz, World world) {}
public void saveChunk(int cx, int cz, World world) {
}
@Override
public boolean isChunkLoaded(int cx, int cz, World world) {
@@ -42,25 +50,32 @@ public class NullChunkManager implements ChunkManager {
}
@Override
public void chunkLoaded(int cx, int cz, World world) {}
public void chunkLoaded(int cx, int cz, World world) {
}
@Override
public void chunkUnloaded(int cx, int cz, World world) {}
public void chunkUnloaded(int cx, int cz, World world) {
}
@Override
public void saveWorld(World world) {}
public void saveWorld(World world) {
}
@Override
public void unloadWorld(World world) {}
public void unloadWorld(World world) {
}
@Override
public void loadWorld(World world) {}
public void loadWorld(World world) {
}
@Override
public void saveAll() {}
public void saveAll() {
}
@Override
public void unloadAll() {}
public void unloadAll() {
}
@Override
public boolean isTrue(int x, int y, int z, World world) {
@@ -78,23 +93,30 @@ public class NullChunkManager implements ChunkManager {
}
@Override
public void setTrue(int x, int y, int z, World world) {}
public void setTrue(int x, int y, int z, World world) {
}
@Override
public void setTrue(Block block) {}
public void setTrue(Block block) {
}
@Override
public void setTrue(BlockState blockState) {}
public void setTrue(BlockState blockState) {
}
@Override
public void setFalse(int x, int y, int z, World world) {}
public void setFalse(int x, int y, int z, World world) {
}
@Override
public void setFalse(Block block) {}
public void setFalse(Block block) {
}
@Override
public void setFalse(BlockState blockState) {}
public void setFalse(BlockState blockState) {
}
@Override
public void cleanUp() {}
public void cleanUp() {
}
}

11
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java
View File

@@ -11,11 +11,13 @@ import java.util.UUID;
public class PrimitiveChunkStore implements ChunkStore {
private static final long serialVersionUID = -1L;
transient private boolean dirty = false;
/** X, Z, Y */
public boolean[][][] store;
private static final int CURRENT_VERSION = 7;
private static final int MAGIC_NUMBER = 0xEA5EDEBB;
/**
* X, Z, Y
*/
public boolean[][][] store;
transient private boolean dirty = false;
private int cx;
private int cz;
private UUID worldUid;
@@ -138,8 +140,9 @@ public class PrimitiveChunkStore implements ChunkStore {
for (int y = 0; y < store[0][0].length; y++) {
try {
store[x][z][y] = temp[x][y][z];
} catch (Exception e) {
e.printStackTrace();
}
catch (Exception e) { e.printStackTrace(); }
}
}
}

4
src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java
View File

@@ -7,12 +7,12 @@ import org.bukkit.scheduler.BukkitScheduler;
import java.io.File;
public class BlockStoreConversionMain implements Runnable {
private int taskID;
private org.bukkit.World world;
BukkitScheduler scheduler;
File dataDir;
File[] xDirs;
BlockStoreConversionXDirectory[] converters;
private int taskID;
private org.bukkit.World world;
public BlockStoreConversionMain(org.bukkit.World world) {
this.taskID = -1;

4
src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java
View File

@@ -7,12 +7,12 @@ import org.bukkit.scheduler.BukkitScheduler;
import java.io.File;
public class BlockStoreConversionXDirectory implements Runnable {
private int taskID;
private org.bukkit.World world;
BukkitScheduler scheduler;
File dataDir;
File[] zDirs;
BlockStoreConversionZDirectory[] converters;
private int taskID;
private org.bukkit.World world;
public BlockStoreConversionXDirectory() {
this.taskID = -1;

15
src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java
View File

@@ -70,8 +70,7 @@ public class BlockStoreConversionZDirectory implements Runnable {
try {
this.cx = Integer.parseInt(this.cxs);
this.cz = Integer.parseInt(this.czs);
}
catch (Exception e) {
} catch (Exception e) {
this.dataDir.delete();
stop();
return;
@@ -85,8 +84,7 @@ public class BlockStoreConversionZDirectory implements Runnable {
if (this.tempChunklet instanceof PrimitiveChunkletStore) {
this.primitiveChunklet = (PrimitiveChunkletStore) this.tempChunklet;
}
else if (this.tempChunklet instanceof PrimitiveExChunkletStore) {
} else if (this.tempChunklet instanceof PrimitiveExChunkletStore) {
this.primitiveExChunklet = (PrimitiveExChunkletStore) this.tempChunklet;
}
@@ -113,8 +111,9 @@ public class BlockStoreConversionZDirectory implements Runnable {
}
this.newManager.setTrue(this.cxPos, this.y2, this.czPos, this.world);
} catch (Exception e) {
e.printStackTrace();
}
catch (Exception e) { e.printStackTrace(); }
}
}
}
@@ -132,8 +131,7 @@ public class BlockStoreConversionZDirectory implements Runnable {
if (this.primitiveExChunklet != null) {
oldArray = this.primitiveExChunklet.store[x][z];
}
else {
} else {
return;
}
@@ -141,8 +139,7 @@ public class BlockStoreConversionZDirectory implements Runnable {
if (oldArray.length < 64) {
return;
}
else if (newArray.length < ((this.y * 64) + 64)) {
} else if (newArray.length < ((this.y * 64) + 64)) {
return;
}