Shaders can now be zipped

src/asmloader.mod.json

@@ -1,6 +1,6 @@
 {
  "modid": "shaders",
- "version": "1.0.1",
+ "version": "1.0.2",
  "transformers": [
  "b100.shaders.asm.Transformers"
  ]

src/b100/shaders/Shader.java

@@ -3,9 +3,6 @@
 import static org.lwjgl.opengl.GL11.*;
 import static org.lwjgl.opengl.GL20.*;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -95,40 +92,11 @@ private void deleteShaders() {
  }
 
  public String getShaderSource(String name) {
- File shaderpackFile = ShaderMod.getCurrentShaderPackFile();
- if(shaderpackFile == null) {
+ ShaderProvider shaderProvider = ShaderMod.getCurrentShaderPack();
+ if(shaderProvider == null) {
  return null;
  }
-
- File shaderFile = new File(shaderpackFile, name);
- if(!shaderFile.exists()) {
- return null;
- }
-
- BufferedReader br = null;
- StringBuilder string = new StringBuilder();
-
- try {
- br = new BufferedReader(new FileReader(shaderFile));
-
- while(true) {
- String line = br.readLine();
- if(line == null) {
- break;
- }
- string.append(line).append("\n");
- }
-
- return string.toString();
- }catch (Exception e) {
- System.err.println("Error reading shader file '" + shaderFile.getAbsolutePath() + "'!");
- e.printStackTrace();
- return null;
- }finally {
- try {
- br.close();
- }catch (Exception e) {}
- }
+ return shaderProvider.getFileContentAsString(name);
  }
 
  public boolean bind() {

src/b100/shaders/ShaderMod.java

@@ -19,7 +19,6 @@ public class ShaderMod {
  public static ShaderModConfig config;
 
  private static File minecraftDirectory;
- private static File shaderDirectory;
  private static File shaderPackDirectory;
  private static File configFile;
 
@@ -31,6 +30,8 @@ public class ShaderMod {
  public static boolean enableNormals = false;
  public static boolean enableSpecular = false;
 
+ private static ShaderProvider currentShaderPack;
+
  static {
  grabInstanceAndDirectory();
  }
@@ -49,15 +50,10 @@ private static void grabInstanceAndDirectory() {
  configFile = new File(configDirectory, "shaders.cfg");
 
  config = new ShaderModConfig(mc);
- config.load();
- }
-
- public static File getShaderDirectory() {
- return shaderDirectory;
  }
 
- public static File getCurrentShaderPackFile() {
- return shaderDirectory;
+ public static ShaderProvider getCurrentShaderPack() {
+ return currentShaderPack;
  }
 
  public static File getShaderPackDirectory() {
@@ -68,32 +64,10 @@ public static File getConfigFile() {
  return configFile;
  }
 
- public static boolean isShaderPack(File file) {
- if(file.isDirectory()) {
- File shaderJson = new File(file, "shader.json");
- return shaderJson.exists();
- }
-// if(file.isFile() && file.getName().toLowerCase().endsWith(".zip")) {
-// ZipFile zipFile = null;
-// try {
-// zipFile = new ZipFile(file);
-// 
-// return zipFile.getEntry("/shader.json") != null;
-// }catch (Exception e) {
-// e.printStackTrace();
-// }finally {
-// try {
-// zipFile.close();
-// }catch (Exception e) {}
-// }
-// }
- return false;
- }
-
- public static boolean isShaderPackSelected(File file) {
- if(file == null && shaderDirectory == null) return true;
- if(file == null || shaderDirectory == null) return false;
- return file.equals(shaderDirectory);
+ public static boolean isShaderPackSelected(ShaderProvider shaderProvider) {
+ if(shaderProvider == null && currentShaderPack == null) return true;
+ if(shaderProvider == null || currentShaderPack == null) return false;
+ return shaderProvider.equals(currentShaderPack);
  }
 
  public static void log(String string) {
@@ -107,9 +81,15 @@ public static void logAndDisplay(String string) {
  }
  }
 
- public static void setShaderpack(File file) {
- log("Set Shaderpack: " + (file != null ? file.getName() : "(None)"));
- shaderDirectory = file;
+ public static void setShaderpack(ShaderProvider shaderProvider) {
+ Thread.dumpStack();
+
+ if(currentShaderPack != null) {
+ currentShaderPack.close();
+ }
+
+ log("Set Shaderpack: " + (shaderProvider != null ? shaderProvider.getName() : "(None)"));
+ currentShaderPack = shaderProvider;
 
  if(mc.renderer != null) {
  ShaderRenderer shaderRenderer = (ShaderRenderer) mc.renderer;

src/b100/shaders/ShaderProvider.java

@@ -0,0 +1,34 @@
+package b100.shaders;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.zip.ZipFile;
+
+public interface ShaderProvider {
+
+ public String getName();
+
+ public String getFileContentAsString(String path);
+
+ public BufferedImage getImage(String path);
+
+ public void open();
+
+ public void close();
+
+ public boolean equals(ShaderProvider shaderProvider);
+
+ public static ShaderProvider getShaderProvider(File file) {
+ if(file.isDirectory() && new File(file, "shader.json").exists()) {
+ return new ShaderProviderFolder(file);
+ }
+ ZipFile zipFile = null;
+ try {
+ zipFile = new ZipFile(file);
+ zipFile.close();
+ return new ShaderProviderZip(file);
+ }catch (Exception e) {}
+ return null;
+ }
+
+}

src/b100/shaders/ShaderProviderFolder.java

@@ -0,0 +1,58 @@
+package b100.shaders;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+
+import b100.utils.ImageUtils;
+import b100.utils.StringUtils;
+
+public class ShaderProviderFolder implements ShaderProvider {
+
+ public File directory;
+
+ public ShaderProviderFolder(File directory) {
+ if(!directory.isDirectory()) {
+ throw new RuntimeException("Not a directory: '" + directory + "'!");
+ }
+ this.directory = directory;
+ }
+
+ @Override
+ public String getName() {
+ return directory.getName();
+ }
+
+ @Override
+ public String getFileContentAsString(String path) {
+ File file = new File(directory, path);
+ if(!file.exists()) {
+ return null;
+ }
+ return StringUtils.getFileContentAsString(file);
+ }
+
+ @Override
+ public BufferedImage getImage(String path) {
+ return ImageUtils.loadExternalImage(new File(directory, path));
+ }
+
+ @Override
+ public void open() {
+
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+ @Override
+ public boolean equals(ShaderProvider shaderProvider) {
+ if(shaderProvider instanceof ShaderProviderFolder) {
+ ShaderProviderFolder spf = (ShaderProviderFolder) shaderProvider;
+ return spf.directory.equals(directory);
+ }
+ return false;
+ }
+
+}

src/b100/shaders/ShaderProviderZip.java

@@ -0,0 +1,83 @@
+package b100.shaders;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import javax.imageio.ImageIO;
+
+import b100.utils.StringUtils;
+
+public class ShaderProviderZip implements ShaderProvider {
+
+ public File file;
+ public ZipFile zipFile;
+
+ public ShaderProviderZip(File file) {
+ this.file = file;
+ }
+
+ @Override
+ public String getName() {
+ return file.getName();
+ }
+
+ @Override
+ public String getFileContentAsString(String path) {
+ try {
+ ZipEntry entry = zipFile.getEntry(path);
+ if(entry == null) {
+ return null;
+ }
+ return StringUtils.readInputString(zipFile.getInputStream(entry));
+ }catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public BufferedImage getImage(String path) {
+ try {
+ ZipEntry entry = zipFile.getEntry(path);
+ if(entry == null) {
+ return null;
+ }
+ return ImageIO.read(zipFile.getInputStream(entry));
+ }catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void open() {
+ if(zipFile == null) {
+ try {
+ zipFile = new ZipFile(file);
+ }catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ @Override
+ public void close() {
+ if(zipFile != null) {
+ try {
+ zipFile.close();
+ }catch (Exception e) {}
+ zipFile = null;
+ }
+ }
+
+ @Override
+ public boolean equals(ShaderProvider shaderProvider) {
+ if(shaderProvider instanceof ShaderProviderZip) {
+ ShaderProviderZip spz = (ShaderProviderZip) shaderProvider;
+ return spz.file.equals(file);
+ }
+ return false;
+ }
+
+}