Ho ho hotfix

Changelog.md

@@ -20,7 +20,6 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
   - penetratesGlass
   - explosionBreak
   - penetrableBlocks
-  - knockbackOnHi
   - hipFireSpread
   - ammoCounterX 
   - ammoCounterY
@@ -37,6 +36,8 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
 - GitHub URL in `mcmod.info`
 - Proning in single player mode (**Note: Currently unanimated; player will appear standing**)
 - Shells life got increased to 1606 with no performance impact in extreme cases
+- Added new fancy rain splash to go with the fancy rain
+- Added remaining time for the craft in the ammunition press
 
 ### Changed
 
@@ -74,6 +75,11 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
 - Magazines are created empty
 - The position of the bullet when shooting is now centered when aiming
 - Explosive projectiles are now linked to the player who launched them meaning that the kill message will say who killed whom
+- Crafting stations (Workbench, Ammunition Press etc...) now display the remaining time with millisecond precision
+- Changed default `filmGrain` config from `0.025` to `0.03`
+- Changed default `onScreenRainAndSnow` config from `false` to `true`
+- Changed default `enableFancyRainAndSnow` config from `false` to `true`
+- Changed base fog density from `0.6` to `0.2`
 
 ### Fixed
 
@@ -103,6 +109,25 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
   - Dumpster
   - Sandbag
   - Duel Floodlight
+- Fixed unused variable in shader `postflat.frag` causing a crash
+- Fixed `20rnd 6.5mm Magazine` using the wrong bullet
+- Fixed unused variable in shader `postflat.frag` causing a crash
+- Fixed `20rnd 6.5mm Magazine` using the wrong bullet
+- Fixed custom skin system not using the Minecraft missing texture
+- Fixed multiple `ResourceLocation`  in the `PostProcessPipeline` being incorrect leading to missing textures
+- Fixed fog rendering ignoring if fog should render
+- Fixed depth testing being disabled in the world post processing causing issue with first person hand rendering
+- Fixed the issue where fog was hardcoded to be disabled
+- Fixed world post processing never rendering due to bandage fix
+- Fixed world post processing causing a white screen
+- Fixed `onScreenRainAndSnow` missing lang entries
+- Fixed `enableFancyRainAndSnow` missing lang entries
+- Fixed `enableFancyRainAndSnow` having the lang entries for `onScreenRainAndSnow`
+- Fixed fancy rain and snow never replacing vanilla rain and snow
+- Fixed entities not having a prefix causing collisions with other mods
+- Fixed ammunition press animating even when it wasn't actively crafting
+- Fixed ammunition press setting the ammunition of the magazines after they where crafted when this isn't necessary anymore
+- Fixed tooltip formatting in the ammunition press
 
 ### Removed
 

build.gradle

@@ -32,7 +32,7 @@ minecraft {
 
     username = 'Desoroxxx'
 
-    extraRunJvmArguments.addAll('-Xmx4G', '-Xms4G', '-Dforge.logging.console.level=debug', '-Dmixin.hotSwap=true', '-Dmixin.checks.interfaces=true', '-Dmixin.debug.export=true')
+    extraRunJvmArguments.addAll('-Xmx4G', '-Xms4G', '-Dforge.logging.console.level=debug', '-Dfml.coreMods.load=com.paneedah.weaponlib.core.WeaponlibCorePlugin', '-Dmixin.hotSwap=true', '-Dmixin.checks.interfaces=true', '-Dmixin.debug.export=true')
 
     injectedTags.put('ID', project.id)
     injectedTags.put('VERSION', project.version)

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

@@ -1,35 +1,32 @@
 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");
-        if (!image.exists())
-            return new ResourceLocation(ModReference.ID +":textures/models/"+GunSkins.WoodlandCamo.getTextureName()+".png");
-
+    public static ResourceLocation getCustomSkinResource(final String skinName) {
         if (!GunSkins.customSkins.containsKey(skinName))
-            GunSkins.customSkins.put(skinName, new CustomSkin(skinName, image));
+            GunSkins.customSkins.put(skinName, new CustomSkin(skinName, new File("./config/mwc/skins/" + skinName.replace("customskin_", ""))));
 
         return GunSkins.customSkins.get(skinName).resourceLocation;
     }

src/main/java/com/paneedah/mwc/weapons/Magazines.java

@@ -335,7 +335,7 @@ public static void init(Object mod) {
 
         Magazines.NGSWRMag = new ItemMagazine.Builder()
         		.withCapacity(20)
-        		.withCompatibleBullet(Bullets.Bullet556x45)
+        		.withCompatibleBullet(Bullets.Bullet65)
         		.withName("NGSWR_Mag")
         		.withRotationPoint(-0.16000000476837162, -0.44000001311302195, -1.4800000441074375)
 

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

@@ -382,8 +382,7 @@ public void onRenderWorldLastEvent(RenderWorldLastEvent renderWorldLastEvent) {
 			PostProcessPipeline.captureMatricesIntoBuffers();
 
 		// Replaces the weather renderer.
-		if (!ModernConfigManager.enableFancyRainAndSnow)
-			PostProcessPipeline.setWorldElements();
+		PostProcessPipeline.setWorldElements();
 
 		// Marks the frame-timer
 		frametimer.markFrame();
@@ -444,7 +443,8 @@ public void onRenderWorldLastEvent(RenderWorldLastEvent renderWorldLastEvent) {
 		}
 
 		if (ModernConfigManager.enableAllShaders && ModernConfigManager.enableWorldShaders) {
-			PostProcessPipeline.blitDepth();
+			if (PostProcessPipeline.shouldDoFog())
+				PostProcessPipeline.blitDepth();
 			// PostProcessPipeline.setupDistortionBufferEffects();
 			PostProcessPipeline.doWorldProcessing();
 		}

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() + ".png"));
 				} else {
 					mc.getTextureManager().bindTexture(new ResourceLocation(ModReference.ID +":textures/models/"+itemSkin.getTextureName()+".png"));
 				}

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

@@ -86,18 +86,6 @@ protected void onImpact(final RayTraceResult position) {
             else
                 position.entityHit.attackEntityFrom(new DamageSource("thrown"), damage);
 
-            // Todo: Actually fix this, currently we are reproducing the effect of not apply knockback.
-            //  If you are standing still it's not a big deal everything seems fine.
-            //  But if you are moving you will basically freeze/slowdown greatly (see CS:GO for example).
-            //  The correct fix to this would be to actually not apply knockback instead of "canceling it".
-            //  But I (Desoroxxx) was not able in time to find where is the knockback applied, so bandage fix it is.
-            if (!ModernConfigManager.knockbackOnHit) {
-                position.entityHit.motionX = motionX / 1500;
-                position.entityHit.motionY = motionY / 1500;
-                position.entityHit.motionZ = motionZ / 1500;
-                position.entityHit.isAirBorne = true;
-            }
-
             position.entityHit.hurtResistantTime = 0;
             position.entityHit.prevRotationYaw -= 0.3;
 

src/main/java/com/paneedah/weaponlib/ai/EntityConfiguration.java

@@ -536,7 +536,7 @@ public void register(ModContext context) {
 
             SecondaryEntityRegistry.map.put(name, entityClass);
 
-            net.minecraftforge.fml.common.registry.EntityRegistry.registerModEntity(new ResourceLocation(ModReference.ID, entityName), entityClass, entityName, modEntityId, context.getMod(), trackingRange, updateFrequency, sendVelocityUpdates);
+            net.minecraftforge.fml.common.registry.EntityRegistry.registerModEntity(new ResourceLocation(ModReference.ID, entityName), entityClass, ModReference.ID + "_" + entityName, modEntityId, context.getMod(), trackingRange, updateFrequency, sendVelocityUpdates);
 
             if(spawnEgg)
                EntityRegistry.registerEgg(EntityList.getKey(entityClass), primaryEggColor, secondaryEggColor);

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/ServerInterceptors.java

@@ -0,0 +1,19 @@
+package com.paneedah.weaponlib.compatibility;
+
+import com.paneedah.weaponlib.WeaponSpawnEntity;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EntityDamageSourceIndirect;
+
+public class ServerInterceptors {
+
+    public static float getKnockback(DamageSource source) {
+        float strength = 0.4f;
+        if(source instanceof EntityDamageSourceIndirect) {
+            EntityDamageSourceIndirect indirectSource = (EntityDamageSourceIndirect) source;
+            if(indirectSource.getImmediateSource() instanceof WeaponSpawnEntity) {
+                strength = 0.05f;
+            }
+        }
+        return strength;
+    }
+}

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/java/com/paneedah/weaponlib/config/ModernConfigManager.java

@@ -69,7 +69,7 @@ public class ModernConfigManager {
 
 	@RangeDouble(min = 0.0, max = 1.0)
 	@ConfigSync(category = CATEGORY_RENDERING_SCREENSHADERS, comment = "Configures the intensity of the film grain effect")
-	public static double filmGrainIntensity = 0.025;
+	public static double filmGrainIntensity = 0.03;
 
 	@ConfigSync(category = CATEGORY_RENDERING_SCREENSHADERS, comment = "Enables glow around bright objects (bloom)")
 	public static boolean bloomEffect = true;
@@ -80,14 +80,14 @@ public class ModernConfigManager {
 	public static int bloomLayers = 3;
 
 	@ConfigSync(category = CATEGORY_RENDERING_SCREENSHADERS, comment = "Enable on-screen rain/snow VFX")
-	public static boolean onScreenRainAndSnow = false;
+	public static boolean onScreenRainAndSnow = true;
 
 	@RequiresMcRestart
 	@ConfigSync(category = CATEGORY_RENDERING, comment = "Enables the HDR framebuffer, requires restart. The HDR is the cause of a lot of shader incompat")
 	public static boolean enableHDRFramebuffer = true;
 
 	@ConfigSync(category = CATEGORY_RENDERING, comment = "Enables the fancy MWC snow/rain")
-	public static boolean enableFancyRainAndSnow = false;
+	public static boolean enableFancyRainAndSnow = true;
 
 
 //	 Fixing Method
@@ -126,9 +126,6 @@ public class ModernConfigManager {
 	@ConfigSync(category = CATEGORY_GAMEPLAY, comment = "A list of blocks that should be penetrable by bullets ")
 	public static String penetrableBlocks = "minecraft:glass, minecraft:glass_pane, minecraft:stained_glass, minecraft:stained_glass_pane";
 
-	@ConfigSync(category = CATEGORY_GAMEPLAY, comment = "Whether entities should have knockback applied to them when shot.")
-	public static boolean knockbackOnHit = true;
-
 	@ConfigSync(category = CATEGORY_GAMEPLAY, comment = "Enables muzzle effects.")
 	public static boolean enableMuzzleEffects = true;