Fix java 1.6 compatibility

This commit is contained in:
johni0702
2015-06-03 23:30:48 +02:00
parent d171ff4346
commit dd46027a3a
4 changed files with 16 additions and 15 deletions

View File

@@ -14,14 +14,11 @@ import eu.crushedpixel.replaymod.online.authentication.AuthenticationHash;
import eu.crushedpixel.replaymod.utils.StreamTools; import eu.crushedpixel.replaymod.utils.StreamTools;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import java.io.File; import java.io.*;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@@ -138,7 +135,12 @@ public class ApiClient {
InputStream is = con.getInputStream(); InputStream is = con.getInputStream();
if(con.getResponseCode() == 200) { if(con.getResponseCode() == 200) {
Files.copy(is, target.toPath(), StandardCopyOption.REPLACE_EXISTING); OutputStream out = new FileOutputStream(target);
try {
IOUtils.copy(is, out);
} finally {
out.close();
}
} else { } else {
JsonElement element = jsonParser.parse(StreamTools.readStreamtoString(is)); JsonElement element = jsonParser.parse(StreamTools.readStreamtoString(is));
try { try {

View File

@@ -15,7 +15,6 @@ import org.spacehq.mc.protocol.packet.ingame.server.entity.spawn.ServerSpawnPlay
import org.spacehq.packetlib.packet.Packet; import org.spacehq.packetlib.packet.Packet;
import java.io.*; import java.io.*;
import java.nio.file.Files;
import java.util.*; import java.util.*;
// TODO Reset resourcepack when changing from a resourcepack replay to a normal replay // TODO Reset resourcepack when changing from a resourcepack replay to a normal replay
@@ -74,7 +73,7 @@ public class ConnectMetadataFilter implements StreamFilter {
Optional<InputStream> in = replayFile.getResourcePack(hash); Optional<InputStream> in = replayFile.getResourcePack(hash);
if (in.isPresent()) { if (in.isPresent()) {
try { try {
file = Files.createTempFile("replaymod", "resourcepack").toFile(); file = File.createTempFile("replaymod", "resourcepack");
OutputStream out = new FileOutputStream(file); OutputStream out = new FileOutputStream(file);
try { try {
IOUtils.copy(in.get(), out); IOUtils.copy(in.get(), out);

View File

@@ -15,11 +15,11 @@ import net.minecraft.network.Packet;
import net.minecraft.network.PacketBuffer; import net.minecraft.network.PacketBuffer;
import net.minecraft.network.play.server.S01PacketJoinGame; import net.minecraft.network.play.server.S01PacketJoinGame;
import net.minecraft.network.play.server.S08PacketPlayerPosLook; import net.minecraft.network.play.server.S08PacketPlayerPosLook;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import java.io.*; import java.io.*;
import java.nio.file.Files;
import java.util.*; import java.util.*;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
@@ -303,7 +303,7 @@ public class ReplayFileIO {
file.createNewFile(); file.createNewFile();
String json = gson.toJson(keyframeRegistry); String json = gson.toJson(keyframeRegistry);
Files.write(file.toPath(), json.getBytes()); FileUtils.write(file, json);
} }
public static void writePlayerVisibilityToFile(PlayerVisibility visibility, File file) throws IOException { public static void writePlayerVisibilityToFile(PlayerVisibility visibility, File file) throws IOException {
@@ -311,7 +311,7 @@ public class ReplayFileIO {
file.createNewFile(); file.createNewFile();
String json = gson.toJson(visibility); String json = gson.toJson(visibility);
Files.write(file.toPath(), json.getBytes()); FileUtils.write(file, json);
} }
public static void writeReplayMetaDataToFile(ReplayMetaData metaData, File file) throws IOException { public static void writeReplayMetaDataToFile(ReplayMetaData metaData, File file) throws IOException {
@@ -319,7 +319,7 @@ public class ReplayFileIO {
file.createNewFile(); file.createNewFile();
String json = gson.toJson(metaData); String json = gson.toJson(metaData);
Files.write(file.toPath(), json.getBytes()); FileUtils.write(file, json);
} }
/** /**

View File

@@ -3,6 +3,7 @@ package eu.crushedpixel.replaymod.video;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import eu.crushedpixel.replaymod.settings.RenderOptions; import eu.crushedpixel.replaymod.settings.RenderOptions;
import eu.crushedpixel.replaymod.utils.ReplayFileIO; import eu.crushedpixel.replaymod.utils.ReplayFileIO;
import org.apache.commons.io.FileUtils;
import org.monte.media.*; import org.monte.media.*;
import org.monte.media.FormatKeys.MediaType; import org.monte.media.FormatKeys.MediaType;
import org.monte.media.math.Rational; import org.monte.media.math.Rational;
@@ -10,7 +11,6 @@ import org.monte.media.math.Rational;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.LinkedList; import java.util.LinkedList;
@@ -50,7 +50,7 @@ public class VideoWriter {
File folder = ReplayFileIO.getRenderFolder(); File folder = ReplayFileIO.getRenderFolder();
String fileName = FILE_FORMAT.format(Calendar.getInstance().getTime()); String fileName = FILE_FORMAT.format(Calendar.getInstance().getTime());
file = new File(folder, fileName + VIDEO_EXTENSION); file = new File(folder, fileName + VIDEO_EXTENSION);
Files.createFile(file.toPath()); FileUtils.touch(file);
out = Registry.getInstance().getWriter(file); out = Registry.getInstance().getWriter(file);
Format format = new Format(FormatKeys.MediaTypeKey, MediaType.VIDEO, Format format = new Format(FormatKeys.MediaTypeKey, MediaType.VIDEO,
@@ -101,7 +101,7 @@ public class VideoWriter {
toWrite.clear(); toWrite.clear();
out.close(); out.close();
if (cancelled) { if (cancelled) {
Files.delete(file.toPath()); FileUtils.forceDelete(file);
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();