Ho ho hotfix

src/main/java/com/paneedah/mwc/skins/CustomSkin.java

@@ -1,32 +1,34 @@
 package com.paneedah.mwc.skins;
 
-import com.paneedah.mwc.utils.ModReference;
 import net.minecraft.client.renderer.texture.DynamicTexture;
-import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.util.ResourceLocation;
 
 import javax.imageio.ImageIO;
 import java.io.File;
 
 import static com.paneedah.mwc.proxies.ClientProxy.mc;
+import static com.paneedah.mwc.utils.ModReference.ID;
+import static com.paneedah.mwc.utils.ModReference.RED_LOG;
 
 public class CustomSkin {
+
     protected ResourceLocation resourceLocation;
 
     public CustomSkin(String name, File file) {
         try {
-            resourceLocation = new ResourceLocation(ModReference.ID, "customskin_"+name.toLowerCase());
-            final TextureManager textureManager = mc.getTextureManager();
-            file = new File(file.getPath(), name.toLowerCase()+".png.mcmeta");
-            textureManager.loadTexture(resourceLocation, new DynamicTexture(ImageIO.read(file)));
-            textureManager.bindTexture(resourceLocation);
-        } catch (Exception e) { e.printStackTrace(); }
+            resourceLocation = new ResourceLocation(ID, "customskin_" + name);
+            mc.getTextureManager().loadTexture(resourceLocation, new DynamicTexture(ImageIO.read(file)));
+            mc.getTextureManager().bindTexture(resourceLocation);
+        } catch (Exception e) {
+            RED_LOG.printFramedError("Load Custom Skin", "Failed to load custom skin: " + name + " from file: " + file.getAbsolutePath(), "Skin will not be loaded.");
+        }
     }
 
-    public static ResourceLocation getCustomSkinResource(String skinName) {
-        File image = new File("./config/mwc/skins/"+skinName+".png");
+    public static ResourceLocation getCustomSkinResource(final String skinName) {
+        final File image = new File("./config/mwc/skins/" + skinName.replace("customskin_", "") + ".png");
+
         if (!image.exists())
-            return new ResourceLocation(ModReference.ID +":textures/models/"+GunSkins.WoodlandCamo.getTextureName()+".png");
+            return new ResourceLocation(ID + ":textures/models/" + GunSkins.WoodlandCamo.getTextureName() + ".png");
 
         if (!GunSkins.customSkins.containsKey(skinName))
             GunSkins.customSkins.put(skinName, new CustomSkin(skinName, image));

src/main/java/com/paneedah/weaponlib/StaticModelSourceRenderer.java

@@ -434,7 +434,7 @@ protected void renderModelSource(RenderContext<RenderableState> renderContext, I
 
 		for(Tuple<ModelBase, String> texturedModel: modelSource.getTexturedModels()) {
 			if (texturedModel.getV().startsWith("customskin_")) {
-				mc.renderEngine.bindTexture(CustomSkin.getCustomSkinResource(texturedModel.getV().toLowerCase().replace("customskin_", "").replace(".png", "")));
+				mc.renderEngine.bindTexture(CustomSkin.getCustomSkinResource(texturedModel.getV()));
 			} else {
 				mc.renderEngine.bindTexture(new ResourceLocation(ModReference.ID + ":textures/models/" + texturedModel.getV()));
 			}

src/main/java/com/paneedah/weaponlib/WeaponRenderer.java

@@ -3315,7 +3315,7 @@ public void renderItem(ItemStack weaponItemStack, RenderContext<RenderableState>
 				GlStateManager.setActiveTexture(GL13.GL_TEXTURE0 + 3);
 
 				if (itemSkin.getTextureName().startsWith("customskin_")) {
-					mc.getTextureManager().bindTexture(CustomSkin.getCustomSkinResource(itemSkin.getTextureName().toLowerCase().replace("customskin_", "")));
+					mc.getTextureManager().bindTexture(CustomSkin.getCustomSkinResource(itemSkin.getTextureName()));
 				} else {
 					mc.getTextureManager().bindTexture(new ResourceLocation(ModReference.ID +":textures/models/"+itemSkin.getTextureName()+".png"));
 				}

src/main/java/com/paneedah/weaponlib/command/WeaponDebugCommand.java

@@ -4,7 +4,8 @@
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.Vec3d;
-import scala.actors.threadpool.Arrays;
+
+import java.util.Arrays;
 
 public class WeaponDebugCommand extends TidyCompatibleCommand {
 

src/main/java/com/paneedah/weaponlib/compatibility/graph/CompatibilityClassGenerator.java

@@ -5,11 +5,11 @@
 import com.google.common.reflect.ClassPath;
 import com.google.common.reflect.ClassPath.ClassInfo;
 import org.lwjgl.opengl.GLContext;
-import scala.actors.threadpool.Arrays;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 
 /**

src/main/resources/assets/mwc/shaders/postflat.frag

@@ -287,7 +287,7 @@ vec4 raindrop(vec4 color, vec2 c) {
 			// d.r -> only x% of drops are kept on, with x depending on the size of drops
 			if (d.r < (5.-r)*.08 && t > .5) {
 					// Drop normal
-					vec3 v = normalize(-vec3(cos(p), mix(.2, 1., t-.5)));
+					// vec3 v = normalize(-vec3(cos(p), mix(.2, 1., t-.5)));
 					// fragColor = vec4(v * 0.5 + 0.5, 1.0);  // show normals
 
 					// Poor man's refraction (no visual need to do more)