From 9384d661c15493372bded71b80db6ccdfb446987 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 18 Mar 2021 16:14:53 -0400 Subject: [PATCH] Removed unnecessary dispose() --- .../mindustry/annotations/impl/AssetsProcess.java | 4 ---- core/src/mindustry/core/Control.java | 4 ---- core/src/mindustry/core/Renderer.java | 11 ----------- core/src/mindustry/game/Schematics.java | 9 --------- core/src/mindustry/graphics/BlockRenderer.java | 9 +-------- core/src/mindustry/graphics/MinimapRenderer.java | 12 +----------- core/src/mindustry/ui/dialogs/ModsDialog.java | 9 --------- core/src/mindustry/ui/fragments/MenuFragment.java | 6 ------ 8 files changed, 2 insertions(+), 62 deletions(-) diff --git a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java index c38570a4d4..0b5620c11d 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java +++ b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java @@ -117,7 +117,6 @@ public class AssetsProcess extends BaseProcessor{ void processSounds(String classname, String path, String rtype) throws Exception{ TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC); - MethodSpec.Builder dispose = MethodSpec.methodBuilder("dispose").addModifiers(Modifier.PUBLIC, Modifier.STATIC); MethodSpec.Builder loadBegin = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC); HashSet names = new HashSet<>(); @@ -137,8 +136,6 @@ public class AssetsProcess extends BaseProcessor{ String filename = "\"" + filepath + "\""; loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3")); - dispose.addStatement("arc.Core.assets.unload(" + filename + ")"); - dispose.addStatement(name + " = null"); type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build()); }); @@ -147,7 +144,6 @@ public class AssetsProcess extends BaseProcessor{ } type.addMethod(loadBegin.build()); - type.addMethod(dispose.build()); JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer); } diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 1b1e2b6a5c..1799d7674c 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -431,11 +431,7 @@ public class Control implements ApplicationListener, Loadable{ music.stop(); } - content.dispose(); net.dispose(); - Musics.dispose(); - Sounds.dispose(); - if(ui != null && ui.editor != null) ui.editor.dispose(); } @Override diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index cdf6bfb7ed..37953f0f9c 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -115,17 +115,6 @@ public class Renderer implements ApplicationListener{ @Override public void dispose(){ - minimap.dispose(); - effectBuffer.dispose(); - blocks.dispose(); - if(planets != null){ - planets.dispose(); - planets = null; - } - if(bloom != null){ - bloom.dispose(); - bloom = null; - } Events.fire(new DisposeEvent()); } diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index 1895857e43..5eac74edd7 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -63,15 +63,6 @@ public class Schematics implements Loadable{ private long lastClearTime; public Schematics(){ - Events.on(DisposeEvent.class, e -> { - previews.each((schem, m) -> m.dispose()); - previews.clear(); - shadowBuffer.dispose(); - if(errorTexture != null){ - errorTexture.dispose(); - errorTexture = null; - } - }); Events.on(ClientLoadEvent.class, event -> { errorTexture = new Texture("sprites/error.png"); diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java index 072b6e1a98..8eb2a38f32 100644 --- a/core/src/mindustry/graphics/BlockRenderer.java +++ b/core/src/mindustry/graphics/BlockRenderer.java @@ -19,7 +19,7 @@ import mindustry.world.blocks.power.*; import static arc.Core.*; import static mindustry.Vars.*; -public class BlockRenderer implements Disposable{ +public class BlockRenderer{ public static final int crackRegions = 8, maxCrackSize = 9; private static final int initialRequests = 32 * 32; @@ -300,11 +300,4 @@ public class BlockRenderer implements Disposable{ } - @Override - public void dispose(){ - shadows.dispose(); - dark.dispose(); - shadows = dark = null; - floor.dispose(); - } } diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index c3831a0d6a..4cc044753e 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -19,7 +19,7 @@ import mindustry.world.*; import static mindustry.Vars.*; -public class MinimapRenderer implements Disposable{ +public class MinimapRenderer{ private static final float baseSize = 16f; private final Seq units = new Seq<>(); private Pixmap pixmap; @@ -170,16 +170,6 @@ public class MinimapRenderer implements Disposable{ return color.rgba(); } - @Override - public void dispose(){ - if(pixmap != null && texture != null){ - pixmap.dispose(); - texture.dispose(); - texture = null; - pixmap = null; - } - } - public void drawLabel(float x, float y, String text, Color color){ Font font = Fonts.outline; GlyphLayout l = Pools.obtain(GlyphLayout.class, GlyphLayout::new); diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index bf84e34ce3..0328422bb0 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -48,15 +48,6 @@ public class ModsDialog extends BaseDialog{ super("@mods"); addCloseButton(); - Events.on(DisposeEvent.class, e -> { - textureCache.each((key, val) -> { - if(val.texture.width == val.width){ - val.texture.dispose(); - } - }); - textureCache.clear(); - }); - browser = new BaseDialog("@mods.browser"); browser.cont.table(table -> { diff --git a/core/src/mindustry/ui/fragments/MenuFragment.java b/core/src/mindustry/ui/fragments/MenuFragment.java index cef8b0108e..da51d18ede 100644 --- a/core/src/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/mindustry/ui/fragments/MenuFragment.java @@ -24,12 +24,6 @@ public class MenuFragment extends Fragment{ private Button currentMenu; private MenuRenderer renderer; - public MenuFragment(){ - Events.on(DisposeEvent.class, event -> { - renderer.dispose(); - }); - } - @Override public void build(Group parent){ renderer = new MenuRenderer();