Merge branch 'master' into 1.7.10

src/main/java/mods/betterfoliage/common/config/BetterFoliageConfig.java

@@ -20,6 +20,9 @@ public class BetterFoliageConfig extends ConfigBase {
 	@CfgElement(category="reed", key="enabled")
 	public boolean reedEnabled = true;
 	
+	@CfgElement(category="algae", key="enabled")
+	public boolean algaeEnabled = true;
+	
 	@CfgElement(category="leaves", key="horizontalOffset")
 	public OptionDouble leavesHOffset = new OptionDouble(0.0, 0.4, 0.025, 0.2);
 	
@@ -61,4 +64,19 @@ public class BetterFoliageConfig extends ConfigBase {
 	@CfgElement(category="reed", key="chance")
 	public OptionInteger reedChance = new OptionInteger(0, 64, 1, 32);
 	
+	@CfgElement(category="algae", key="horizontalOffset")
+	public OptionDouble algaeHOffset = new OptionDouble(0.0, 0.25, 0.025, 0.1);
+	
+	@CfgElement(category="algae", key="size")
+	public OptionDouble algaeSize = new OptionDouble(0.5, 1.5, 0.05, 1.0);
+	
+	@CfgElement(category="algae", key="heightMin")
+	@Limit(max="algaeHeightMax")
+	public OptionDouble algaeHeightMin = new OptionDouble(0.1, 1.5, 0.05, 0.5);
+	
+	@CfgElement(category="algae", key="heightMax")
+	public OptionDouble algaeHeightMax = new OptionDouble(0.1, 1.5, 0.05, 1.0);
+	
+	@CfgElement(category="algae", key="chance")
+	public OptionInteger algaeChance = new OptionInteger(0, 64, 1, 48);
 }

src/main/java/mods/betterfoliage/common/util/Utils.java

@@ -1,16 +1,19 @@
 package mods.betterfoliage.common.util;
 
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Map;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IResource;
 import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 
-public class ReflectionUtil {
+public class Utils {
 
-	private ReflectionUtil() {}
+	private Utils() {}
 	
 	@SuppressWarnings("unchecked")
 	public static Map<String, IResourceManager> getDomainResourceManagers() {
@@ -55,4 +58,13 @@ public class ReflectionUtil {
 			return null;
 		}
 	}
+	
+	public static boolean resourceExists(ResourceLocation resourceLocation) {
+		try {
+			IResource resource = Minecraft.getMinecraft().getResourceManager().getResource(resourceLocation);
+			if (resource != null) return true;
+		} catch (IOException e) {
+		}
+		return false;
+	}
 }