Remove Ad Modal: Return to Ad Modal on exit

Author: DJtheRedstoner

src/main/java/gg/essential/ad/modal/AdModal.java

@@ -74,7 +74,7 @@ public void init() {
         }));
 
         buttonList.add(new TextureButton(centreX - 64, startY + height + 8, 128, 8, REMOVE_INTEGRATION, 0xFF5C5C5C, 0xFF757575, false, () -> {
-            ModalManager.INSTANCE.setModal(TwoButtonModal.removeAds());
+            ModalManager.INSTANCE.setModal(TwoButtonModal.removeAds(this));
         }));
         buttonList.add(new TextureButton(startX + width - 8 - 5, startY + 8, 5, 5, X_ICON, 0xFF757575, 0xFF999999, true, () -> ModalManager.INSTANCE.setModal(null)));
     }
@@ -215,6 +215,7 @@ public void close() {
         for (ResourceLocation location : iconTextures.values()) {
             Minecraft.getMinecraft().getTextureManager().deleteTexture(location);
         }
+        iconTextures.clear();
         super.close();
     }
 

src/main/java/gg/essential/ad/modal/ModalManager.java

@@ -46,12 +46,13 @@ public class ModalManager {
     private int previousHeight = -1;
 
     public void setModal(Modal modal) {
-        if (currentModal != null) {
-            currentModal.close();
-        }
+        Modal previous = currentModal;
         previousWidth = -1;
         previousHeight = -1;
         this.currentModal = modal;
+        if (previous != null) {
+            previous.close();
+        }
     }
 
     public MousePosition getMousePosition() {

src/main/java/gg/essential/ad/modal/TwoButtonModal.java

@@ -55,18 +55,28 @@ public static TwoButtonModal postInstall() {
         );
     }
 
-    public static TwoButtonModal removeAds() {
+    public static TwoButtonModal removeAds(AdModal adModal) {
+        boolean[] removed = new boolean[1];
         return new TwoButtonModal(
             "Do you want to remove all\n'Get Essential Mod' buttons?",
-            (x, y, width) -> new ModalButton(x, y, width, ButtonColor.GRAY, "No", () -> {
+            (x, y, width) -> new ModalButton(x, y, width, ButtonColor.GRAY, "Back", () -> {
                 ModalManager.INSTANCE.setModal(null);
             }),
-            (x, y, width) -> new ModalButton(x, y, width, ButtonColor.RED, "Yes", () -> {
+            (x, y, width) -> new ModalButton(x, y, width, ButtonColor.RED, "Remove", () -> {
                 EssentialAd.CONFIG.hideButtons();
+                removed[0] = true;
                 ModalManager.INSTANCE.setModal(null);
                 Minecraft.getMinecraft().currentScreen.onResize(Minecraft.getMinecraft(), UResolution.getScaledWidth(), UResolution.getScaledHeight());
             })
-        );
+        ) {
+            @Override
+            public void close() {
+                super.close();
+                if (!removed[0]) {
+                    ModalManager.INSTANCE.setModal(adModal);
+                }
+            }
+        };
     }
 
     public static TwoButtonModal installFailed() {