lishid
/
Orebfuscator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disabled ChunkReloader and implemented 'Issue #66: Limit Cache Size'

master
Aleksey-Terzi 2016-09-21 16:01:39 +03:00
parent 9234949476
commit 63be95ee87
6 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugin/pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com.lishid</groupId>
<artifactId>orebfuscator</artifactId>
<version>4.1.9-SNAPSHOT</version>
<version>4.1.10-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Orebfuscator4</name>

5
Plugin/src/main/java/com/lishid/orebfuscator/Orebfuscator.java
View File

@ -24,6 +24,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
import com.lishid.orebfuscator.cache.CacheCleaner;
import com.lishid.orebfuscator.cache.ObfuscatedDataCache;
import com.lishid.orebfuscator.commands.OrebfuscatorCommandExecutor;
import com.lishid.orebfuscator.hithack.BlockHitManager;
@ -51,7 +52,7 @@ public class Orebfuscator extends JavaPlugin {
return this.isProtocolLibFound;
}
//\\@SuppressWarnings("deprecation")
@SuppressWarnings("deprecation")
@Override
public void onEnable() {
// Get plugin manager
@ -79,7 +80,7 @@ public class Orebfuscator extends JavaPlugin {
(new ProtocolLibHook()).register(this);
// Run CacheCleaner
//\\getServer().getScheduler().scheduleAsyncRepeatingTask(this, new CacheCleaner(), 0, OrebfuscatorConfig.CacheCleanRate);
getServer().getScheduler().scheduleAsyncRepeatingTask(this, new CacheCleaner(), 0, OrebfuscatorConfig.CacheCleanRate);
}
private static INmsManager createNmsManager() {

7
Plugin/src/main/java/com/lishid/orebfuscator/OrebfuscatorConfig.java
View File

@ -108,11 +108,10 @@ public class OrebfuscatorConfig {
// ChunkReloader
public static int ChunkReloaderRate = 500;
public static boolean UseChunkReloader = true;
public static boolean UseChunkReloader = false;
// CacheCleaner
//\\public static long CacheCleanRate = 60 * 60 * 20;//once per hour
public static long CacheCleanRate = 60 * 20;
public static long CacheCleanRate = 60 * 60 * 20;//once per hour
public static File getCacheFolder() {
// Try to make the folder
@ -458,7 +457,7 @@ public class OrebfuscatorConfig {
NoObfuscationForMetadata = getBoolean("Booleans.NoObfuscationForMetadata", NoObfuscationForMetadata);
NoObfuscationForMetadataTagName = getString("Strings.NoObfuscationForMetadataTagName", NoObfuscationForMetadataTagName);
DeleteCacheFilesAfterDays = getInt("Integers.DeleteCacheFilesAfterDays", DeleteCacheFilesAfterDays);
UseChunkReloader = getBoolean("Booleans.UseChunkReloader", UseChunkReloader);
//UseChunkReloader = getBoolean("Booleans.UseChunkReloader", UseChunkReloader);
generateTransparentBlocks();

6
Plugin/src/main/java/com/lishid/orebfuscator/cache/CacheCleaner.java vendored
View File

@ -12,13 +12,13 @@ public class CacheCleaner implements Runnable {
public void run() {
if(!OrebfuscatorConfig.Enabled || OrebfuscatorConfig.DeleteCacheFilesAfterDays <= 0) return;
Orebfuscator.log("Started checking old cache files to delete...");
int count = 0;
for(World world : Bukkit.getWorlds()) {
File cacheFolder = new File(OrebfuscatorConfig.getCacheFolder(), world.getName());
ObfuscatedDataCache.deleteFiles(cacheFolder, OrebfuscatorConfig.DeleteCacheFilesAfterDays);
count += ObfuscatedDataCache.deleteFiles(cacheFolder, OrebfuscatorConfig.DeleteCacheFilesAfterDays);
}
Orebfuscator.log("Compleetd checking old cache files to delete...");
Orebfuscator.log("Cache cleaner completed, deleted files: " + count);
}
}

10
Plugin/src/main/java/com/lishid/orebfuscator/cache/ObfuscatedDataCache.java vendored
View File

@ -80,11 +80,13 @@ public class ObfuscatedDataCache {
return getInternalCache().getOutputStream(folder, x, z);
}
public static void deleteFiles(File folder, int deleteAfterDays) {
public static int deleteFiles(File folder, int deleteAfterDays) {
int count = 0;
try {
File regionFolder = new File(folder, "data/region");
if(!regionFolder.exists()) return;
if(!regionFolder.exists()) return count;
long deleteAfterDaysMs = (long)deleteAfterDays * 24L * 60L * 60L * 1000L;
@ -93,11 +95,13 @@ public class ObfuscatedDataCache {
if (diff > deleteAfterDaysMs) {
file.delete();
Orebfuscator.log("File " + file.getName() + " is deleted.");
count++;
}
}
} catch(Exception ex) {
ex.printStackTrace();
}
return count;
}
}

6
Plugin/src/main/java/com/lishid/orebfuscator/obfuscation/ChunkReloader.java
View File

@ -193,7 +193,8 @@ public class ChunkReloader extends Thread implements Runnable {
public static void addLoadedChunk(World world, int chunkX, int chunkZ) {
if (!OrebfuscatorConfig.Enabled // Plugin enabled
|| OrebfuscatorConfig.isWorldDisabled(world.getName())) // World not enabled
|| OrebfuscatorConfig.isWorldDisabled(world.getName()) // World not enabled
|| !OrebfuscatorConfig.UseChunkReloader)
{
return;
}
@ -213,7 +214,8 @@ public class ChunkReloader extends Thread implements Runnable {
public static void addUnloadedChunk(World world, int chunkX, int chunkZ) {
if (!OrebfuscatorConfig.Enabled // Plugin enabled
|| OrebfuscatorConfig.isWorldDisabled(world.getName())) // World not enabled
|| OrebfuscatorConfig.isWorldDisabled(world.getName()) // World not enabled
|| !OrebfuscatorConfig.UseChunkReloader)
{
return;
}