From fe3ea6228659c45d29553adcb924a045151bfcdc Mon Sep 17 00:00:00 2001 From: halotroop2288 Date: Mon, 2 Mar 2020 02:13:46 -0800 Subject: [PATCH] "cleanup" Screens instead of "close" since that's really what they do --- .../github/halotroop/litecraft/screens/ExitGameScreen.java | 2 +- .../com/github/halotroop/litecraft/screens/IngameHUD.java | 2 +- .../com/github/halotroop/litecraft/screens/TitleScreen.java | 4 ++-- .../com/github/hydos/ginger/engine/common/screen/Screen.java | 2 +- .../com/github/hydos/ginger/engine/opengl/api/GingerGL.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/github/halotroop/litecraft/screens/ExitGameScreen.java b/src/main/java/com/github/halotroop/litecraft/screens/ExitGameScreen.java index e41fb08..3b51f10 100644 --- a/src/main/java/com/github/halotroop/litecraft/screens/ExitGameScreen.java +++ b/src/main/java/com/github/halotroop/litecraft/screens/ExitGameScreen.java @@ -29,6 +29,6 @@ public class ExitGameScreen extends Screen {} @Override - public void close() + public void cleanup() { infoText.remove(); } } diff --git a/src/main/java/com/github/halotroop/litecraft/screens/IngameHUD.java b/src/main/java/com/github/halotroop/litecraft/screens/IngameHUD.java index 07bdb86..d067ed7 100644 --- a/src/main/java/com/github/halotroop/litecraft/screens/IngameHUD.java +++ b/src/main/java/com/github/halotroop/litecraft/screens/IngameHUD.java @@ -43,7 +43,7 @@ public class IngameHUD extends Screen } @Override - public void close() + public void cleanup() { debugText.remove(); positionText.remove(); diff --git a/src/main/java/com/github/halotroop/litecraft/screens/TitleScreen.java b/src/main/java/com/github/halotroop/litecraft/screens/TitleScreen.java index 9ced4bf..5727aa9 100644 --- a/src/main/java/com/github/halotroop/litecraft/screens/TitleScreen.java +++ b/src/main/java/com/github/halotroop/litecraft/screens/TitleScreen.java @@ -56,7 +56,7 @@ public class TitleScreen extends Screen if (Litecraft.getInstance().getWorld() != null) { ginger3D.openScreen(new IngameHUD()); - this.close(); + this.cleanup(); } //TODO: add world creation gui so it takes u to world creation place //TODO: add a texture to be rendered behind the gui as an option @@ -64,7 +64,7 @@ public class TitleScreen extends Screen } @Override - public void close() + public void cleanup() { this.debugText.remove(); this.playButton.hide(Litecraft.getInstance().data.guis); diff --git a/src/main/java/com/github/hydos/ginger/engine/common/screen/Screen.java b/src/main/java/com/github/hydos/ginger/engine/common/screen/Screen.java index c60d227..adaf694 100644 --- a/src/main/java/com/github/hydos/ginger/engine/common/screen/Screen.java +++ b/src/main/java/com/github/hydos/ginger/engine/common/screen/Screen.java @@ -12,5 +12,5 @@ public abstract class Screen public abstract void tick(); - public abstract void close(); + public abstract void cleanup(); } diff --git a/src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerGL.java b/src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerGL.java index 1478bc9..4d5f4bf 100644 --- a/src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerGL.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerGL.java @@ -47,7 +47,7 @@ public class GingerGL public void openScreen(Screen screen) { - if (registry.currentScreen != null) registry.currentScreen.close(); + if (registry.currentScreen != null) registry.currentScreen.cleanup(); registry.currentScreen = screen; }