From 081cd1d0a1dc95267c8343356fba957ef58a0fb5 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Thu, 11 Dec 2014 20:58:20 +0800 Subject: [PATCH] #1335 Dimensional Transceivers not saving channels after server restart --- ReleaseNotes.txt | 2 + .../transceiver/ServerChannelRegister.java | 82 +++++++++++++++++-- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index bd85938d..30c8423c 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -31,6 +31,7 @@ Bugs - #1297 EnderLiquidConduit writing excessive warning messages - #1333 Sound locator sometimes creates thousands of entities per frame - Sound locator entities not being rendered in some cases +- #1335 Dimensional Transceivers not saving channels after server restart - #1336 Soul Binder - Ghost Block - #1339 SAG Mill grinding balls reducing return rate for bonus outputs - #1347 Capacitor Bank energy duplication bug @@ -41,6 +42,7 @@ Bugs - #1366 Powered Spawner doesn't remain active when chunk loaded - #1373 Fluid Tank accepts fluid regardless of configuration - #1383 Travel Anchor crash + - RF Tools not charging in Killer Joe until he has attacked something diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java index a423b858..d71c00f1 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java @@ -5,9 +5,15 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; +import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import net.minecraft.item.ItemStack; import net.minecraftforge.common.DimensionManager; @@ -31,6 +37,8 @@ public class ServerChannelRegister extends ChannelRegister { public static ServerChannelRegister instance = new ServerChannelRegister(); + private static final ExecutorService saveExecutor = Executors.newSingleThreadExecutor(); + public static void load() { instance.reset(); File dataFile = getDataFile(); @@ -71,12 +79,27 @@ public class ServerChannelRegister extends ChannelRegister { } public static void store() { + Future future = saveExecutor.submit(new SaveRunnable(copyChannels())); + try { + //wait up to 5 seconds for it to finish + future.get(5, TimeUnit.SECONDS); + } catch (Exception e) { + Log.warn("Failed to write Transciever Channels on exit: " + e); + future.cancel(false); + } + } + + private static void queueStore() { + saveExecutor.execute(new SaveRunnable(copyChannels())); + } + + private static void doStore(EnumMap> channels) { File dataFile = getDataFile(); - if(!createFolderAndWriteFile(dataFile)) { + if(!createFolderAndWriteFile(channels, dataFile)) { dataFile = getFallbackDataFile(); Log.error("ServerChannelRegister: Attempting to write Dimensional Trasciever data to fallback location: " + dataFile.getAbsolutePath()); try { - writeFile(dataFile); + writeFile(copyChannels(), dataFile); } catch (Exception e) { Log.error("ServerChannelRegister: Could not write Dimensional Trasciever data fallback location " + dataFile.getAbsolutePath() + " channles not saved: " + e.getMessage()); @@ -86,11 +109,13 @@ public class ServerChannelRegister extends ChannelRegister { Log.info("ServerChannelRegister: Dimensional Trasciever data saved to " + dataFile.getAbsolutePath()); } - protected static boolean createFolderAndWriteFile(File dataFile) { + + + private static boolean createFolderAndWriteFile(EnumMap> data, File dataFile) { try { File parentFolder = dataFile.getParentFile(); FileUtils.forceMkdir(parentFolder); - writeFile(dataFile); + writeFile(data, dataFile); return true; } catch (Exception e) { Log.error("ServerChannelRegister: Could not write Dimensional Trasciever channels to " + dataFile.getAbsolutePath() + " : " + e); @@ -98,11 +123,25 @@ public class ServerChannelRegister extends ChannelRegister { } } - protected static void writeFile(File dataFile) throws IOException { + protected static void writeFile(EnumMap> chans, File dataFile) throws IOException { + if(dataFile.exists()) { + File tmpFile = new File(dataFile.getAbsolutePath() + ".tmp"); + doWriteFile(chans, tmpFile); + if(FileUtils.deleteQuietly(dataFile)) { + tmpFile.renameTo(dataFile); + } + + } else { + doWriteFile(chans, dataFile); + } + + } + + protected static void doWriteFile(EnumMap> chans, File dataFile) throws IOException { JsonWriter writer = new JsonWriter(new FileWriter(dataFile, false)); writer.setIndent(" "); writer.beginArray(); - for (List chanList : instance.channels.values()) { + for (List chanList : chans.values()) { for (Channel chan : chanList) { writer.beginObject(); writer.name("name").value(chan.getName()); @@ -125,6 +164,15 @@ public class ServerChannelRegister extends ChannelRegister { return new File(DimensionManager.getCurrentSaveRootDirectory(), "dimensionalTransceiver.json"); } + private static EnumMap> copyChannels() { + //NB: deep copy not needed as all types are immuatble + EnumMap> copy = new EnumMap>(ChannelType.class); + for (Entry> entry : instance.channels.entrySet()) { + copy.put(entry.getKey(), new ArrayList(entry.getValue())); + } + return copy; + } + //----------------------------------------------------------------------------------------------- private final List transceivers = new ArrayList(); @@ -156,6 +204,13 @@ public class ServerChannelRegister extends ChannelRegister { trans.removeSendChanel(channel); } iterators.remove(channel); + queueStore(); + } + + @Override + public void addChannel(Channel channel) { + super.addChannel(channel); + queueStore(); } public RoundRobinIterator getIterator(Channel channel) { @@ -297,4 +352,19 @@ public class ServerChannelRegister extends ChannelRegister { return contents; } + private static class SaveRunnable implements Runnable { + + private EnumMap> chans; + + public SaveRunnable(EnumMap> chans) { + this.chans = chans; + } + + @Override + public void run() { + doStore(chans); + } + + } + }