Revert "Revert "Temporary fix for Forge version below 2855""

This reverts commit b7f90df.

Author: Protoxy22

build.gradle

@@ -158,4 +158,20 @@ jar {
     }
 }
 
+/* Dev build */
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'dev'
+}
+
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allJava
+    classifier = 'sources'
+}
+
+artifacts {
+    archives deobfJar
+    archives sourcesJar
+}
+
 jar.finalizedBy('reobfJar')

src/main/java/com/modularwarfare/client/ClientProxy.java

@@ -75,7 +75,6 @@
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.client.resource.IResourceType;
-import net.minecraftforge.client.resource.ISelectiveResourceReloadListener;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.client.FMLClientHandler;
@@ -103,7 +102,7 @@
 
 import static com.modularwarfare.ModularWarfare.contentPacks;
 
-public class ClientProxy extends CommonProxy implements ISelectiveResourceReloadListener {
+public class ClientProxy extends CommonProxy {
 
     public static String modelDir = "com.modularwarfare.client.model.";
 
@@ -277,7 +276,8 @@ public void load() {
     public void setupLayers(RenderPlayer renderer) {
         renderer.addLayer(new RenderLayerBackpack(renderer, renderer.getMainModel().bipedBodyWear));
         renderer.addLayer(new RenderLayerBody(renderer, renderer.getMainModel().bipedBodyWear));
-        renderer.addLayer(new RenderLayerHeldGun(renderer));
+        // Disabled for animation third person test
+        // renderer.addLayer(new RenderLayerHeldGun(renderer));
     }
 
     @Override
@@ -286,28 +286,9 @@ public void init() {
         if(ModUtil.isMac()){
             ModConfig.INSTANCE.model_optimization = false;
         }
-
-        ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new ISelectiveResourceReloadListener() {
-
-            @Override
-            public void onResourceManagerReload(IResourceManager resourceManager,
-                                                Predicate<IResourceType> resourcePredicate) {
-                loadTextures();
-            }
-
-        });
-
         if(!Minecraft.getMinecraft().getFramebuffer().isStencilEnabled()) {
             Minecraft.getMinecraft().getFramebuffer().enableStencil();
         }
-
-        ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new ISelectiveResourceReloadListener() {
-            @Override
-            public void onResourceManagerReload(IResourceManager resourceManager, Predicate<IResourceType> resourcePredicate) {
-                loadTextures();
-            }
-        });
-        loadTextures();
     }
 
     public void loadTextures() {
@@ -980,9 +961,4 @@ public void playFlashSound(EntityPlayer entityPlayer) {
         Minecraft.getMinecraft().getSoundHandler().playSound(new PositionedSoundRecord(ModSounds.FLASHED, SoundCategory.PLAYERS, 5.0f, 0.2f, (float) entityPlayer.posX, (float) entityPlayer.posY, (float) entityPlayer.posZ));
         Minecraft.getMinecraft().getSoundHandler().playSound(new PositionedSoundRecord(ModSounds.FLASHED, SoundCategory.PLAYERS, 5.0f, 0.1f, (float) entityPlayer.posX, (float) entityPlayer.posY, (float) entityPlayer.posZ));
     }
-
-    @Override
-    public void onResourceManagerReload(IResourceManager resourceManager, Predicate<IResourceType> resourcePredicate) {
-
-    }
 }