quick fix on dispose

Author: kevlahnota

forge-gui-mobile/src/forge/Forge.java

@@ -19,6 +19,7 @@
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.Clipboard;
+import com.badlogic.gdx.utils.Disposable;
 import forge.adventure.scene.DeckSelectScene;
 import forge.adventure.scene.DuelScene;
 import forge.adventure.scene.ForgeScene;
@@ -1018,25 +1019,46 @@ public void dispose() {
             currentScreen.onClose(null);
             currentScreen = null;
         }
-        FOverlay.hideAll();
+        // TODO: Implement disposable to applicable classes
+        try {
+            FOverlay.hideAll();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         Dscreens.clear();
-        graphics.dispose();
-        SoundSystem.instance.dispose();
-        MapStage.getInstance().disposeWorld();
-        getAssets().dispose();
-
-        AdventureScreen.dispose();
-        Adventure.getInstance().dispose();
-        ScreenUtil.getInstance().dispose();
-        ShaderUtil.getInstance().dispose();
+        safeDispose(MapStage.getInstance(), Adventure.getInstance(), ScreenUtil.getInstance(), ShaderUtil.getInstance(),
+            graphics, getAssets());
+        try {
+            SoundSystem.instance.dispose();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        try {
+            AdventureScreen.dispose();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         try {
             ExceptionHandler.unregisterErrorHandling();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        try {
             if (lastPreview != null)
                 lastPreview.dispose();
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
+    public static void safeDispose(Disposable... disposables) {
+        for (Disposable d : disposables) {
+            if (d != null) {
+                try {
+                    d.dispose();
+                } catch (Exception ignored) {}
+            }
+        }
+    }
     /** Retrieve assets.
      */
     public static Assets getAssets() {

forge-gui-mobile/src/forge/Graphics.java

@@ -31,7 +31,7 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 
-public class Graphics {
+public class Graphics implements Disposable {
     private static final int GL_BLEND = GL20.GL_BLEND;
     private static final int GL_LINE_SMOOTH = 2848; //create constant here since not in GL20
 
@@ -69,20 +69,11 @@ public void end() {
         }
     }
 
+    @Override
     public void dispose() {
         if (invokeShapeRenderer)
-            safeDispose(shapeRenderer.get());
-        safeDispose(batch);
-    }
-
-    public void safeDispose(Disposable... disposables) {
-        for (Disposable d : disposables) {
-            if (d != null) {
-                try {
-                    d.dispose();
-                } catch (Exception ignored) {}
-            }
-        }
+            Forge.safeDispose(shapeRenderer.get());
+        Forge.safeDispose(batch);
     }
 
     public SpriteBatch getBatch() {

forge-gui-mobile/src/forge/adventure/stage/MapStage.java

@@ -112,7 +112,7 @@ public PointOfInterestChanges getChanges() {
 
     protected MapStage() {
         disposeWorld();
-        gdxWorld = new World(new Vector2(0, 0),false);
+        createNewWorld();
         eventTouchDown = new InputEvent();
         eventTouchDown.setPointer(-1);
         eventTouchDown.setType(InputEvent.Type.touchDown);
@@ -125,6 +125,11 @@ public static MapStage getInstance() {
         return instance == null ? instance = new MapStage() : instance;
     }
 
+    @Override
+    public void dispose() {
+        disposeWorld();
+    }
+
     public void disposeWorld() {
         if (gdxWorld != null) {
             try {
@@ -194,13 +199,20 @@ public void debugCollision(boolean b) {
     Array<EntryActor> spawnClassified = new Array<>();
     Array<EntryActor> sourceMapMatch = new Array<>();
 
+    private void createNewWorld() {
+        try {
+            gdxWorld = new World(new Vector2(0, 0),false);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
     public void loadMap(TiledMap map, String sourceMap, String targetMap) {
         loadMap(map, sourceMap, targetMap, 0);
     }
 
     public void loadMap(TiledMap map, String sourceMap, String targetMap, int spawnTargetId) {
         disposeWorld();
-        gdxWorld = new World(new Vector2(0, 0),false);
+        createNewWorld();
         isLoadingMatch = false;
         isInMap = true;
         GameHUD.getInstance().showHideMap(false);

forge-gui-mobile/src/forge/assets/Assets.java

@@ -124,25 +124,25 @@ private Assets() {
     public void dispose() {
         if (counterFonts != null) {
             for (BitmapFont bitmapFont : counterFonts.values())
-                safeDispose(bitmapFont);
+                Forge.safeDispose(bitmapFont);
             counterFonts.clear();
         }
         if (fallback_skins != null) {
             for (Texture texture : fallback_skins.values())
-                safeDispose(texture);
+                Forge.safeDispose(texture);
             fallback_skins.clear();
         }
         if (tmxMap != null) {
             for (Texture texture : tmxMap.values())
-                safeDispose(texture);
+                Forge.safeDispose(texture);
             tmxMap.clear();
         }
         if (textrafonts != null) {
             for (Font f : textrafonts.values())
-                safeDispose(f);
+                Forge.safeDispose(f);
             textrafonts.clear();
         }
-        safeDispose(defaultImage, blackTexture, whiteTexture, backdropTexture, grayTexture);
+        Forge.safeDispose(defaultImage, blackTexture, whiteTexture, backdropTexture, grayTexture);
         if (cardArtCache != null)
             cardArtCache.clear();
         if (avatarImages != null)
@@ -167,16 +167,7 @@ public void dispose() {
             cursor.clear();
         if (fonts != null)
             fonts.clear();
-        safeDispose(manager);
-    }
-    private void safeDispose(Disposable... disposables) {
-        for (Disposable d : disposables) {
-            if (d != null) {
-                try {
-                    d.dispose();
-                } catch (Exception ignored) {}
-            }
-        }
+        Forge.safeDispose(manager);
     }
 
     public MemoryTrackingAssetManager manager() {

forge-gui-mobile/src/forge/util/ShaderUtil.java

@@ -2,6 +2,7 @@
 
 import com.badlogic.gdx.graphics.glutils.ShaderProgram;
 import com.badlogic.gdx.utils.Disposable;
+import forge.Forge;
 
 public class ShaderUtil implements Disposable {
     private static ShaderUtil instance;
@@ -99,18 +100,8 @@ public ShaderProgram getShaderNightDay() {
 
     @Override
     public void dispose() {
-        safeDispose(shaderOutline, shaderGrayscale, shaderWarp, shaderUnderwater, shaderNightDay, shaderPixelate,
+        Forge.safeDispose(shaderOutline, shaderGrayscale, shaderWarp, shaderUnderwater, shaderNightDay, shaderPixelate,
             shaderRipple, shaderPixelateWarp, shaderChromaticAberration, shaderHueShift, shaderRoundedRect,
             shaderRoundedRect2, shaderNoiseFade, shaderPortal);
     }
-
-    private void safeDispose(Disposable... disposables) {
-        for (Disposable d : disposables) {
-            if (d != null) {
-                try {
-                    d.dispose();
-                } catch (Exception ignored) {}
-            }
-        }
-    }
 }