From 610b87f462487a2b003f4797b4dd559cb72c3254 Mon Sep 17 00:00:00 2001 From: "U-YUE\\Sean" Date: Wed, 30 Jan 2013 12:25:48 -0800 Subject: [PATCH] Fixing a permissions loop and reverting a package change to prevent Serialization errors. --- .../com/gmail/nossr50/listeners/WorldListener.java | 2 +- src/main/java/com/gmail/nossr50/mcMMO.java | 4 ++-- .../old => util/blockmeta}/ChunkletManager.java | 2 +- .../blockmeta}/ChunkletManagerFactory.java | 2 +- .../old => util/blockmeta}/ChunkletStore.java | 2 +- .../blockmeta}/ChunkletStoreFactory.java | 2 +- .../blockmeta}/HashChunkletManager.java | 2 +- .../blockmeta}/NullChunkletManager.java | 2 +- .../blockmeta}/PrimitiveChunkletStore.java | 2 +- .../blockmeta}/PrimitiveExChunkletStore.java | 2 +- .../blockmeta}/chunkmeta/ChunkManager.java | 2 +- .../blockmeta}/chunkmeta/ChunkManagerFactory.java | 2 +- .../blockmeta}/chunkmeta/ChunkStore.java | 4 ++-- .../blockmeta}/chunkmeta/ChunkStoreFactory.java | 2 +- .../blockmeta}/chunkmeta/HashChunkManager.java | 4 ++-- .../blockmeta}/chunkmeta/NullChunkManager.java | 2 +- .../blockmeta}/chunkmeta/PrimitiveChunkStore.java | 4 ++-- .../conversion/BlockStoreConversionMain.java | 2 +- .../conversion/BlockStoreConversionXDirectory.java | 2 +- .../conversion/BlockStoreConversionZDirectory.java | 14 +++++++------- src/main/resources/plugin.yml | 1 - .../old/PrimitiveExChunkletStoreTest.java | 4 ++-- 22 files changed, 32 insertions(+), 33 deletions(-) rename src/main/java/com/gmail/nossr50/{blockstore/old => util/blockmeta}/ChunkletManager.java (99%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore/old => util/blockmeta}/ChunkletManagerFactory.java (89%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore/old => util/blockmeta}/ChunkletStore.java (97%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore/old => util/blockmeta}/ChunkletStoreFactory.java (83%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore/old => util/blockmeta}/HashChunkletManager.java (99%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore/old => util/blockmeta}/NullChunkletManager.java (97%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore/old => util/blockmeta}/PrimitiveChunkletStore.java (96%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore/old => util/blockmeta}/PrimitiveExChunkletStore.java (99%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore => util/blockmeta}/chunkmeta/ChunkManager.java (99%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore => util/blockmeta}/chunkmeta/ChunkManagerFactory.java (86%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore => util/blockmeta}/chunkmeta/ChunkStore.java (95%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore => util/blockmeta}/chunkmeta/ChunkStoreFactory.java (83%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore => util/blockmeta}/chunkmeta/HashChunkManager.java (99%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore => util/blockmeta}/chunkmeta/NullChunkManager.java (97%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore => util/blockmeta}/chunkmeta/PrimitiveChunkStore.java (98%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore => util/blockmeta}/conversion/BlockStoreConversionMain.java (97%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore => util/blockmeta}/conversion/BlockStoreConversionXDirectory.java (97%) mode change 100644 => 100755 rename src/main/java/com/gmail/nossr50/{blockstore => util/blockmeta}/conversion/BlockStoreConversionZDirectory.java (93%) mode change 100644 => 100755 diff --git a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java b/src/main/java/com/gmail/nossr50/listeners/WorldListener.java index cae3d1fab..508ff7b5f 100644 --- a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/WorldListener.java @@ -20,7 +20,7 @@ import org.bukkit.event.world.WorldInitEvent; import org.bukkit.event.world.WorldUnloadEvent; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.blockstore.conversion.BlockStoreConversionMain; +import com.gmail.nossr50.util.blockmeta.conversion.BlockStoreConversionMain; public class WorldListener implements Listener { private ArrayList converters = new ArrayList(); diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 2da82446e..660bbdfa8 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -16,8 +16,8 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitScheduler; -import com.gmail.nossr50.blockstore.chunkmeta.ChunkManager; -import com.gmail.nossr50.blockstore.chunkmeta.ChunkManagerFactory; +import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager; +import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory; import com.gmail.nossr50.commands.general.AddlevelsCommand; import com.gmail.nossr50.commands.general.AddxpCommand; import com.gmail.nossr50.commands.general.InspectCommand; diff --git a/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManager.java b/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java old mode 100644 new mode 100755 similarity index 99% rename from src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManager.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java index 1f441354e..7a1d2b7cf --- a/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManager.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.old; +package com.gmail.nossr50.util.blockmeta; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManagerFactory.java b/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java old mode 100644 new mode 100755 similarity index 89% rename from src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManagerFactory.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java index 1ad7ec50a..39f8732d3 --- a/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManagerFactory.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.old; +package com.gmail.nossr50.util.blockmeta; import com.gmail.nossr50.config.HiddenConfig; diff --git a/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStore.java b/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java old mode 100644 new mode 100755 similarity index 97% rename from src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStore.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java index ce42c171e..5514df13c --- a/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStore.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.old; +package com.gmail.nossr50.util.blockmeta; import java.io.Serializable; diff --git a/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStoreFactory.java b/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java old mode 100644 new mode 100755 similarity index 83% rename from src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStoreFactory.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java index 825b70bb5..1fb4a315a --- a/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStoreFactory.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.old; +package com.gmail.nossr50.util.blockmeta; public class ChunkletStoreFactory { protected static ChunkletStore getChunkletStore() { diff --git a/src/main/java/com/gmail/nossr50/blockstore/old/HashChunkletManager.java b/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java old mode 100644 new mode 100755 similarity index 99% rename from src/main/java/com/gmail/nossr50/blockstore/old/HashChunkletManager.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java index 0aea915f6..c97af7c02 --- a/src/main/java/com/gmail/nossr50/blockstore/old/HashChunkletManager.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.old; +package com.gmail.nossr50.util.blockmeta; import java.io.EOFException; import java.io.File; diff --git a/src/main/java/com/gmail/nossr50/blockstore/old/NullChunkletManager.java b/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java old mode 100644 new mode 100755 similarity index 97% rename from src/main/java/com/gmail/nossr50/blockstore/old/NullChunkletManager.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java index e4e92e894..89bd46967 --- a/src/main/java/com/gmail/nossr50/blockstore/old/NullChunkletManager.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.old; +package com.gmail.nossr50.util.blockmeta; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveChunkletStore.java b/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java old mode 100644 new mode 100755 similarity index 96% rename from src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveChunkletStore.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java index bf668fd1e..64a149049 --- a/src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveChunkletStore.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.old; +package com.gmail.nossr50.util.blockmeta; public class PrimitiveChunkletStore implements ChunkletStore { private static final long serialVersionUID = -3453078050608607478L; diff --git a/src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStore.java b/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java old mode 100644 new mode 100755 similarity index 99% rename from src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStore.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java index 2fffccde2..6644fdd9a --- a/src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStore.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.old; +package com.gmail.nossr50.util.blockmeta; import java.io.Externalizable; import java.io.IOException; diff --git a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManager.java b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java old mode 100644 new mode 100755 similarity index 99% rename from src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManager.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java index 7155f3feb..9fee57617 --- a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManager.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.chunkmeta; +package com.gmail.nossr50.util.blockmeta.chunkmeta; import java.io.IOException; diff --git a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManagerFactory.java b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java old mode 100644 new mode 100755 similarity index 86% rename from src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManagerFactory.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java index c3d26fb56..efb3847ed --- a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManagerFactory.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.chunkmeta; +package com.gmail.nossr50.util.blockmeta.chunkmeta; import com.gmail.nossr50.config.HiddenConfig; diff --git a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStore.java b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java old mode 100644 new mode 100755 similarity index 95% rename from src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStore.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java index 147376700..69ed58485 --- a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStore.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java @@ -1,10 +1,10 @@ -package com.gmail.nossr50.blockstore.chunkmeta; +package com.gmail.nossr50.util.blockmeta.chunkmeta; import java.io.Serializable; import java.util.List; import java.util.UUID; -import com.gmail.nossr50.blockstore.old.ChunkletStore; +import com.gmail.nossr50.util.blockmeta.ChunkletStore; /** * A ChunkStore should be responsible for a 16x16xWorldHeight area of data diff --git a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStoreFactory.java b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java old mode 100644 new mode 100755 similarity index 83% rename from src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStoreFactory.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java index 0c661090a..2ca5d5032 --- a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStoreFactory.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.chunkmeta; +package com.gmail.nossr50.util.blockmeta.chunkmeta; import org.bukkit.World; diff --git a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/HashChunkManager.java b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java old mode 100644 new mode 100755 similarity index 99% rename from src/main/java/com/gmail/nossr50/blockstore/chunkmeta/HashChunkManager.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java index e95e426f9..554d811fa --- a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/HashChunkManager.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.chunkmeta; +package com.gmail.nossr50.util.blockmeta.chunkmeta; import java.io.File; import java.io.IOException; @@ -18,7 +18,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.getspout.spoutapi.chunkstore.mcMMOSimpleRegionFile; -import com.gmail.nossr50.blockstore.conversion.BlockStoreConversionZDirectory; +import com.gmail.nossr50.util.blockmeta.conversion.BlockStoreConversionZDirectory; public class HashChunkManager implements ChunkManager { private HashMap> regionFiles = new HashMap>(); diff --git a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/NullChunkManager.java b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java old mode 100644 new mode 100755 similarity index 97% rename from src/main/java/com/gmail/nossr50/blockstore/chunkmeta/NullChunkManager.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java index b5a0a1039..e3e3b776e --- a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/NullChunkManager.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.chunkmeta; +package com.gmail.nossr50.util.blockmeta.chunkmeta; import java.io.IOException; diff --git a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java old mode 100644 new mode 100755 similarity index 98% rename from src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java index bf4110db1..d12362353 --- a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.chunkmeta; +package com.gmail.nossr50.util.blockmeta.chunkmeta; import java.io.IOException; import java.io.ObjectInputStream; @@ -10,7 +10,7 @@ import java.util.UUID; import org.bukkit.World; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.blockstore.old.ChunkletStore; +import com.gmail.nossr50.util.blockmeta.ChunkletStore; public class PrimitiveChunkStore implements ChunkStore { private static final long serialVersionUID = -1L; diff --git a/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionMain.java b/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java old mode 100644 new mode 100755 similarity index 97% rename from src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionMain.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java index eb1225e71..77a298e49 --- a/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionMain.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.conversion; +package com.gmail.nossr50.util.blockmeta.conversion; import java.io.File; diff --git a/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionXDirectory.java b/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java old mode 100644 new mode 100755 similarity index 97% rename from src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionXDirectory.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java index 91b2c089b..061724f1b --- a/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionXDirectory.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.blockstore.conversion; +package com.gmail.nossr50.util.blockmeta.conversion; import java.io.File; diff --git a/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionZDirectory.java b/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java old mode 100644 new mode 100755 similarity index 93% rename from src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionZDirectory.java rename to src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java index 9a62f35ff..91f018246 --- a/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionZDirectory.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java @@ -1,16 +1,16 @@ -package com.gmail.nossr50.blockstore.conversion; +package com.gmail.nossr50.util.blockmeta.conversion; import java.io.File; import org.bukkit.scheduler.BukkitScheduler; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.blockstore.chunkmeta.HashChunkManager; -import com.gmail.nossr50.blockstore.chunkmeta.PrimitiveChunkStore; -import com.gmail.nossr50.blockstore.old.ChunkletStore; -import com.gmail.nossr50.blockstore.old.HashChunkletManager; -import com.gmail.nossr50.blockstore.old.PrimitiveChunkletStore; -import com.gmail.nossr50.blockstore.old.PrimitiveExChunkletStore; +import com.gmail.nossr50.util.blockmeta.chunkmeta.HashChunkManager; +import com.gmail.nossr50.util.blockmeta.chunkmeta.PrimitiveChunkStore; +import com.gmail.nossr50.util.blockmeta.ChunkletStore; +import com.gmail.nossr50.util.blockmeta.HashChunkletManager; +import com.gmail.nossr50.util.blockmeta.PrimitiveChunkletStore; +import com.gmail.nossr50.util.blockmeta.PrimitiveExChunkletStore; public class BlockStoreConversionZDirectory implements Runnable { public int taskID, cx, cz, x, y, z, y2, xPos, zPos, cxPos, czPos; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 5e1367435..04d9044c3 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -157,7 +157,6 @@ permissions: description: mcmmo permissions that default to op children: mcmmo.chat.adminchat: true - mcmmo.admin: true mcmmo.tools.all: true mcmmo.admin: default: false diff --git a/src/test/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStoreTest.java b/src/test/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStoreTest.java index eb8b8487b..7ebf4e47e 100644 --- a/src/test/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStoreTest.java +++ b/src/test/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStoreTest.java @@ -1,11 +1,11 @@ -package com.gmail.nossr50.blockstore.old; +package com.gmail.nossr50.util.blockmeta; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import com.gmail.nossr50.blockstore.old.PrimitiveExChunkletStore; +import com.gmail.nossr50.util.blockmeta.PrimitiveExChunkletStore; public class PrimitiveExChunkletStoreTest { byte addresses[][] = new byte[16][16];