Update notice (#1228)

gentlegiantJGC · web-flow · commit d46d7f285fcd · 2025-12-11T12:12:32.000Z
* Add licence dialog

* Update to Python 3.10

* Reformat
diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         cfg:
-        - {os: windows-latest, python-version: '3.9', architecture: x64}
+        - {os: windows-latest, python-version: '3.10', architecture: x64}
 
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/python-stylecheck.yml b/.github/workflows/python-stylecheck.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.10']
 
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/python-unittests.yml b/.github/workflows/python-unittests.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.10']
 
     steps:
     - uses: actions/checkout@v4
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Extract the contained folder to a location on your computer and run the executab
 
 **If you are running a compiled build you do NOT need to do this.**
 
-1) Install [Python 3.9+](https://www.python.org/)
+1) Install [Python 3.10](https://www.python.org/downloads/release/python-31011/)
 2) We recommend setting up a [python virtual environment](https://docs.python.org/3/tutorial/venv.html) so you don't run into issues with dependency conflicts.
 3) run `python -m pip install amulet-map-editor` to install the library and all its dependencies.
 4) run `python -m amulet_map_editor` to run the program
diff --git a/amulet_map_editor/api/framework/app.py b/amulet_map_editor/api/framework/app.py
@@ -8,7 +8,7 @@
 from amulet_map_editor.api import config
 from amulet_map_editor import __version__
 from .warning_dialog import WarningDialog
-from .support_dialog import SupportDialog
+from .licence_dialog import LicenceDialog
 
 log = logging.getLogger(__name__)
 
@@ -30,16 +30,17 @@ def OnInit(self):
 
         meta_config = config.get("amulet_meta", {})
 
-        support_dialog_show_time = meta_config.get("support_dialog_show_time", 0)
-        if support_dialog_show_time < time.time() - 3600 * 24 * 7:
-            # Last shown more than a week ago
-            support_dialog = SupportDialog(
-                self._amulet_ui, 60, support_dialog_show_time == 0
-            )
-            support_dialog.Centre()
-            if support_dialog.ShowModal() == wx.ID_OK:
-                meta_config["support_dialog_show_time"] = time.time()
-                config.put("amulet_meta", meta_config)
+        if not getattr(sys, "frozen", False):
+            licence_dialog_show_time = meta_config.get("licence_dialog_show_time", 0)
+            if licence_dialog_show_time < time.time() - 3600 * 24 * 30:
+                # Last shown more than a month ago
+                licence_dialog = LicenceDialog(self._amulet_ui)
+                licence_dialog.Centre()
+                if licence_dialog.ShowModal() == wx.ID_OK:
+                    meta_config["licence_dialog_show_time"] = time.time()
+                    config.put("amulet_meta", meta_config)
+                else:
+                    return False
 
         if not meta_config.get("do_not_show_warning_dialog", False):
             warning_dialog = WarningDialog(self._amulet_ui)
diff --git a/amulet_map_editor/api/framework/licence_dialog.py b/amulet_map_editor/api/framework/licence_dialog.py
@@ -0,0 +1,95 @@
+import webbrowser
+
+import wx
+import wx.lib.agw.hyperlink
+
+from amulet_map_editor import lang
+
+
+_padding = 20
+
+
+class LicenceDialog(wx.Dialog):
+    def __init__(self, parent: wx.Window):
+        super().__init__(parent, style=wx.CAPTION)
+        self.SetTitle(lang.get("licence_dialog.title"))
+
+        root_sizer = wx.BoxSizer(wx.VERTICAL)
+        root_sizer.AddSpacer(_padding)
+
+        root_sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        root_sizer.Add(root_sizer_2)
+
+        root_sizer_2.AddSpacer(_padding)
+        self._main_sizer = wx.BoxSizer(wx.VERTICAL)
+        root_sizer_2.Add(self._main_sizer)
+        root_sizer_2.AddSpacer(_padding)
+
+        root_sizer.AddSpacer(_padding)
+
+        title = wx.StaticText(
+            self,
+            wx.ID_ANY,
+            lang.get("licence_dialog.header"),
+            style=wx.ALIGN_CENTER_HORIZONTAL,
+        )
+        font = title.GetFont()
+        font.SetPointSize(25)
+        title.SetFont(font)
+        self._main_sizer.Add(title, 0, wx.ALL | wx.EXPAND, 5)
+
+        self._add_line(lang.get("licence_dialog.content_1"))
+        self._main_sizer.AddSpacer(20)
+        self._add_line(lang.get("licence_dialog.content_2"))
+        self._main_sizer.AddSpacer(20)
+        self._add_line(lang.get("licence_dialog.content_3"))
+        self._main_sizer.AddSpacer(20)
+        self._add_line(lang.get("licence_dialog.content_4"))
+
+        self._main_sizer.AddSpacer(10)
+
+        button_sizer = wx.StdDialogButtonSizer()
+        root_sizer.Add(button_sizer, 0, wx.ALIGN_RIGHT | wx.ALL, 4)
+
+        self._quit_button = wx.Button(
+            self, wx.ID_CANCEL, lang.get("licence_dialog.quit_button")
+        )
+        self.SetEscapeId(self._quit_button.GetId())
+        button_sizer.Add(self._quit_button)
+
+        self._buy_button = wx.Button(
+            self, wx.ID_ANY, lang.get("licence_dialog.buy_button")
+        )
+        self._buy_button.SetDefault()
+        self._buy_button.Bind(wx.EVT_BUTTON, self._buy)
+        button_sizer.Add(self._buy_button)
+
+        self._continue_button = wx.Button(
+            self, wx.ID_OK, lang.get("licence_dialog.continue_button")
+        )
+        button_sizer.Add(self._continue_button)
+        self.SetAffirmativeId(self._continue_button.GetId())
+
+        button_sizer.Realize()
+
+        self.SetSizer(root_sizer)
+        root_sizer.Fit(self)
+
+        self.Layout()
+
+    def _add_line(self, text: str) -> None:
+        content = wx.StaticText(
+            self,
+            wx.ID_ANY,
+            text,
+            style=wx.ALIGN_CENTER_HORIZONTAL,
+        )
+        font = content.GetFont()
+        font.SetPointSize(12)
+        content.SetFont(font)
+        content.Wrap(750)
+        self._main_sizer.Add(content, 0, wx.EXPAND)
+
+    @staticmethod
+    def _buy(_) -> None:
+        webbrowser.open("https://www.amuletmc.com/")
diff --git a/amulet_map_editor/api/framework/pages/main_menu.py b/amulet_map_editor/api/framework/pages/main_menu.py
@@ -8,7 +8,6 @@
 
 from amulet_map_editor.api import image, lang
 from .base_page import BasePageUI
-from ..support_dialog import SupportDialog
 from amulet_map_editor.api.wx.ui.select_world import open_level_from_dialog
 
 
@@ -50,11 +49,6 @@ def __init__(self, parent: wx.Window):
         )
         sizer.Add(self._open_world_button, 0, wx.ALL | wx.CENTER, 5)
 
-        self._support_button = wx.Button(self, size=(400, 70))
-        self._support_button.SetFont(button_font)
-        self._support_button.Bind(wx.EVT_BUTTON, self._support)
-        sizer.Add(self._support_button, 0, wx.ALL | wx.CENTER, 5)
-
         self._user_manual_button = wx.Button(self, size=(400, 70))
         self._user_manual_button.SetFont(button_font)
         self._user_manual_button.Bind(wx.EVT_BUTTON, self._documentation)
@@ -115,7 +109,6 @@ def __init__(self, parent: wx.Window):
     def _load_strings(self):
         self._amulet_name.SetLabel(lang.get("meta.amulet"))
         self._open_world_button.SetLabel(lang.get("main_menu.open_world"))
-        self._support_button.SetLabel(lang.get("main_menu.support"))
         self._user_manual_button.SetLabel(lang.get("main_menu.user_manual"))
         self._user_manual_button.SetToolTip(lang.get("app.browser_open_tooltip"))
         self._bug_tracker_button.SetLabel(lang.get("main_menu.bug_tracker"))
@@ -125,11 +118,6 @@ def _load_strings(self):
         self._sponsor_label.SetLabel(lang.get("main_menu.our_sponsors"))
         self._sponsor_link.SetLabel(lang.get("main_menu.sponsor_link"))
 
-    def _support(self, _):
-        support_dialog = SupportDialog(self, 0, False)
-        support_dialog.Centre()
-        support_dialog.ShowModal()
-
     @staticmethod
     def _documentation(_):
         webbrowser.open(
diff --git a/amulet_map_editor/api/framework/support_dialog.py b/amulet_map_editor/api/framework/support_dialog.py
diff --git a/amulet_map_editor/lang/en.lang b/amulet_map_editor/lang/en.lang
@@ -83,7 +83,6 @@ menu_bar.help.menu_name=&Help
 ## The start screen
 main_menu.tab_name=Main Menu
 main_menu.open_world=Open World
-main_menu.support=Support Amulet
 main_menu.user_manual=User Manual
 main_menu.bug_tracker=Bug Tracker
 main_menu.discord=Amulet Discord
@@ -96,15 +95,15 @@ language_select.help=Select the language to use in Amulet from the list below.
 language_select.contribute=If you want to fix or add translations click here.
 
 # Support Dialog
-support_dialog.title=I Need Your Support!
-support_dialog.support_button=I am contributing to Amulet.
-support_dialog.ignore_button_wait=Continue without contributing. Wait {t} seconds
-support_dialog.ignore_button=Continue without contributing.
-support_dialog.content_1=Pathway Studios have been funding the development of Amulet for the past 6 years but have decided to stop funding development from 2026.
-support_dialog.content_2=Who am I?\nI am James. You may know me as gentlegiantJGC.\nAmulet has been my job since 2019 but to continue I need financial support.\nAny contribution, no matter how small, is greatly appreciated.\nWithout your support, development and maintenance of Amulet will stop and Amulet will not be able to open worlds from new versions.
-support_dialog.github_sponsor=Support Amulet on Github
-support_dialog.paypal_sponsor=Support Amulet on Paypal
-support_dialog.content_3=The future of Amulet\nFor the past two years I have been rewriting Amulet from the ground up.\nMost of the libraries are now written in C++ for improved speed and parallelisation and the new application uses Qt to allow more control over the user interface.\nI still have a way to go until the rewrite can replace this version of Amulet but experimental versions of the rewrite should be out soon.
+licence_dialog.title=Amulet
+licence_dialog.header=You must own a license to use Amulet.
+licence_dialog.quit_button=Close Amulet.
+licence_dialog.continue_button=I have a license.
+licence_dialog.buy_button=Buy a license.
+licence_dialog.content_1=From 11th December 2025, you must own a license to use Amulet.
+licence_dialog.content_2=Pathway Studios have been funding the development of Amulet for the past 6 years but have decided to stop funding development from 2026.
+licence_dialog.content_3=I have always wanted Amulet to be free for those who cannot afford it and that has been a reality while Pathway Studios was funding the project but that time has come to an end. The only solution I can see to fund continued development is to charge for use of the software. I understand that this decision may be generally disliked but it is the only way that I can see to keep Amulet alive.
+licence_dialog.content_4=The future of Amulet\nFor the past two years I have been rewriting Amulet from the ground up.\nMost of the libraries are now written in C++ for improved speed and parallelisation and the new application uses Qt to allow more control over the user interface.\nI still have a way to go until the rewrite can replace this version of Amulet but, if funding allows, experimental versions of the rewrite should be ready soon.
 
 # Warning Dialog
 warning_dialog.title=Welcome to Amulet
diff --git a/amulet_map_editor/lang/en_GB.lang b/amulet_map_editor/lang/en_GB.lang
@@ -0,0 +1,4 @@
+licence_dialog.header=You must own a licence to use Amulet.
+licence_dialog.content_1=From 11th December 2025, you must own a licence to use Amulet.
+licence_dialog.continue_button=I have a licence.
+licence_dialog.buy_button=Buy a licence.
