From a01520ed9295ab2c6afedd56443c847e10ebe71e Mon Sep 17 00:00:00 2001
From: braker <7152322+araszka@users.noreply.github.com>
Date: Sun, 9 Jun 2024 12:52:03 +0200
Subject: [PATCH] Bugfix/fallthrough attributes causing problems (#243)

---
 src/EvoSC.Manialinks/EvoSC.Manialinks.csproj         |  2 +-
 src/EvoSC.Manialinks/Templates/Containers/Window.mt  |  1 -
 src/EvoSC.Manialinks/Templates/Controls/Button.mt    | 12 ++++--------
 src/EvoSC.Manialinks/Templates/Controls/Switch.mt    |  2 +-
 src/EvoSC.Manialinks/Templates/Drawing/Circle.mt     |  2 +-
 .../Templates/Drawing/QuarterCircle.mt               | 10 +++++-----
 src/EvoSC.Manialinks/Templates/Drawing/Rectangle.mt  |  8 ++++----
 src/EvoSC.Manialinks/Templates/Scripts/Button.ms     | 12 ++++++------
 src/EvoSC.Manialinks/Templates/Scripts/Switch.ms     |  4 ++--
 src/Modules/Scoreboard/Templates/Scoreboard.mt       |  2 +-
 10 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/EvoSC.Manialinks/EvoSC.Manialinks.csproj b/src/EvoSC.Manialinks/EvoSC.Manialinks.csproj
index 2ac3f423a..0347d70df 100644
--- a/src/EvoSC.Manialinks/EvoSC.Manialinks.csproj
+++ b/src/EvoSC.Manialinks/EvoSC.Manialinks.csproj
@@ -13,6 +13,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="ManiaTemplates" Version="0.0.22-alpha" />
+      <PackageReference Include="ManiaTemplates" Version="0.0.24-alpha" />
     </ItemGroup>
 </Project>
diff --git a/src/EvoSC.Manialinks/Templates/Containers/Window.mt b/src/EvoSC.Manialinks/Templates/Containers/Window.mt
index 3585d6f1c..0bc290415 100644
--- a/src/EvoSC.Manialinks/Templates/Containers/Window.mt
+++ b/src/EvoSC.Manialinks/Templates/Containers/Window.mt
@@ -102,7 +102,6 @@ The window is designed to only be used once per Manialink.
           
           <IconButton className="evosc-window-closebtn"
                       id="btnClose-{{ id }}"
-                      dataId="{{ id }}"
                       icon="{{ Icons.Close }}" 
                       style="round"
                       type="accent"
diff --git a/src/EvoSC.Manialinks/Templates/Controls/Button.mt b/src/EvoSC.Manialinks/Templates/Controls/Button.mt
index 03291e3f3..d4ae6b775 100644
--- a/src/EvoSC.Manialinks/Templates/Controls/Button.mt
+++ b/src/EvoSC.Manialinks/Templates/Controls/Button.mt
@@ -94,9 +94,8 @@
               radius='{{ style == "normal" ? 0.5 : Theme.UI_Button_Size(size, height)/2 }}'
               color='{{ disabled ? Theme.UI_Button_Disabled_Bg : Theme.UI_Button_Bg(type) }}'
               quadrant="TopLeft"
-              scriptevents="{{ disabled ? 0 : 1 }}"
+              scriptevents="{{ !disabled }}"
               data-id="{{ id }}"
-              enableScriptEvents="true"
       />
 
       <QuarterCircle
@@ -105,9 +104,8 @@
               color='{{ disabled ? Theme.UI_Button_Disabled_Bg : Theme.UI_Button_Bg(type) }}'
               quadrant="TopRight"
               x='{{ width-(style == "normal" ? 0.5 : Theme.UI_Button_Size(size, height)/2) }}'
-              scriptevents="{{ disabled ? 0 : 1 }}"
+              scriptevents="{{ !disabled }}"
               data-id="{{ id }}"
-              enableScriptEvents="true"
       />
       
       <QuarterCircle
@@ -116,9 +114,8 @@
               color='{{ disabled ? Theme.UI_Button_Disabled_Bg : Theme.UI_Button_Bg(type) }}'
               quadrant="BottomLeft"
               y='{{ -Theme.UI_Button_Size(size, height)+(style == "normal" ? 0.5 : Theme.UI_Button_Size(size, height)/2) }}'
-              scriptevents="{{ disabled ? 0 : 1 }}"
+              scriptevents="{{ !disabled }}"
               data-id="{{ id }}"
-              enableScriptEvents="true"
       />
       
       <QuarterCircle
@@ -128,9 +125,8 @@
               quadrant="BottomRight"
               x='{{ width-(style == "normal" ? 0.5 : Theme.UI_Button_Size(size, height)/2) }}'
               y='{{ -Theme.UI_Button_Size(size, height)+(style == "normal" ? 0.5 : Theme.UI_Button_Size(size, height)/2) }}'
-              scriptevents="{{ disabled ? 0 : 1 }}"
+              scriptevents="{{ !disabled }}"
               data-id="{{ id }}"
-              enableScriptEvents="true"
       />
 
       <!-- Text -->
diff --git a/src/EvoSC.Manialinks/Templates/Controls/Switch.mt b/src/EvoSC.Manialinks/Templates/Controls/Switch.mt
index 94ecb7257..a66ab945c 100644
--- a/src/EvoSC.Manialinks/Templates/Controls/Switch.mt
+++ b/src/EvoSC.Manialinks/Templates/Controls/Switch.mt
@@ -39,7 +39,7 @@
                      width="10"
                      height="5"
                      scriptEvents="true"
-                     dataid="{{ id }}"
+                     dataId="{{ id }}"
                      cornerRadius="0.5"
           />
           <Panel className='evosc-toggleswitch'
diff --git a/src/EvoSC.Manialinks/Templates/Drawing/Circle.mt b/src/EvoSC.Manialinks/Templates/Drawing/Circle.mt
index ed6dc564c..426853678 100644
--- a/src/EvoSC.Manialinks/Templates/Drawing/Circle.mt
+++ b/src/EvoSC.Manialinks/Templates/Drawing/Circle.mt
@@ -3,7 +3,7 @@ Draws a circle.
 -->
 <component>
   <!-- Unique identifier of the circle -->
-  <property type="string" name="id" default="evosc_rectangle" />
+  <property type="string" name="id" default="evosc_circle" />
 
   <!-- Radius of the circle -->
   <property type="double" name="radius" />
diff --git a/src/EvoSC.Manialinks/Templates/Drawing/QuarterCircle.mt b/src/EvoSC.Manialinks/Templates/Drawing/QuarterCircle.mt
index 8a236e902..8cdfb6b9c 100644
--- a/src/EvoSC.Manialinks/Templates/Drawing/QuarterCircle.mt
+++ b/src/EvoSC.Manialinks/Templates/Drawing/QuarterCircle.mt
@@ -15,7 +15,7 @@ Draws a quarter of a circle from different quadrants.
   <property type="string" name="color" />
 
   <!-- Enable/disable script events for the quarter -->
-  <property type="bool" name="scriptEvents" default="false" />
+  <property type="bool" name="scriptevents" default="false" />
 
   <!-- Action to trigger when mouse is clicked on the quarter -->
   <property type="string" name="action" default="" />
@@ -36,7 +36,7 @@ Draws a quarter of a circle from different quadrants.
               if='quadrant == "TopLeft"'
               opacity="{{ Util.ColorOpacity(color) }}"
               class="{{ className }}"
-              scriptevents="{{ scriptEvents ? 1 : 0 }}"
+              scriptevents="{{ scriptevents ? 1 : 0 }}"
       />
 
       <quad
@@ -47,7 +47,7 @@ Draws a quarter of a circle from different quadrants.
               if='quadrant == "TopRight"'
               opacity="{{ Util.ColorOpacity(color) }}"
               class="{{ className }}"
-              scriptevents="{{ scriptEvents ? 1 : 0 }}"
+              scriptevents="{{ scriptevents ? 1 : 0 }}"
       />
 
       <quad
@@ -58,7 +58,7 @@ Draws a quarter of a circle from different quadrants.
               if='quadrant == "BottomLeft"'
               opacity="{{ Util.ColorOpacity(color) }}"
               class="{{ className }}"
-              scriptevents="{{ scriptEvents ? 1 : 0 }}"
+              scriptevents="{{ scriptevents ? 1 : 0 }}"
       />
 
       <quad
@@ -69,7 +69,7 @@ Draws a quarter of a circle from different quadrants.
               if='quadrant == "BottomRight"'
               opacity="{{ Util.ColorOpacity(color) }}"
               class="{{ className }}"
-              scriptevents="{{ scriptEvents ? 1 : 0 }}"
+              scriptevents="{{ scriptevents ? 1 : 0 }}"
       />
     </frame>
   </template>
diff --git a/src/EvoSC.Manialinks/Templates/Drawing/Rectangle.mt b/src/EvoSC.Manialinks/Templates/Drawing/Rectangle.mt
index e918455a0..5941340b4 100644
--- a/src/EvoSC.Manialinks/Templates/Drawing/Rectangle.mt
+++ b/src/EvoSC.Manialinks/Templates/Drawing/Rectangle.mt
@@ -62,10 +62,10 @@ Draws a rectangle.
     >
         <frame>
           <frame if="cornerRadius > 0">
-            <QuarterCircle scriptevents="{{ scriptEvents ? 1 : 0 }}" if='Util.HasItem(corners, "TopLeft")' quadrant="TopLeft" radius="{{ cornerRadius }}" x="0" y="0" color="{{ bgColor }}" data-id="{{ dataId }}" />
-            <QuarterCircle scriptevents="{{ scriptEvents ? 1 : 0 }}" if='Util.HasItem(corners, "TopRight")' quadrant="TopRight" radius="{{ cornerRadius }}" x="{{ width-cornerRadius }}" y="0" color="{{ bgColor }}" data-id="{{ dataId }}" />
-            <QuarterCircle scriptevents="{{ scriptEvents ? 1 : 0 }}" if='Util.HasItem(corners, "BottomLeft")' quadrant="BottomLeft" radius="{{ cornerRadius }}" x="0" y="-{{ height-cornerRadius }}" color="{{ bgColor }}" data-id="{{ dataId }}" />
-            <QuarterCircle scriptevents="{{ scriptEvents ? 1 : 0 }}" if='Util.HasItem(corners, "BottomRight")' quadrant="BottomRight" radius="{{ cornerRadius }}" x="{{ width-cornerRadius }}" y="-{{ height-cornerRadius }}" color="{{ bgColor }}" data-id="{{ dataId }}" />
+            <QuarterCircle scriptevents="{{ scriptEvents }}" if='Util.HasItem(corners, "TopLeft")' quadrant="TopLeft" radius="{{ cornerRadius }}" x="0" y="0" color="{{ bgColor }}" data-id="{{ dataId }}" />
+            <QuarterCircle scriptevents="{{ scriptEvents }}" if='Util.HasItem(corners, "TopRight")' quadrant="TopRight" radius="{{ cornerRadius }}" x="{{ width-cornerRadius }}" y="0" color="{{ bgColor }}" data-id="{{ dataId }}" />
+            <QuarterCircle scriptevents="{{ scriptEvents }}" if='Util.HasItem(corners, "BottomLeft")' quadrant="BottomLeft" radius="{{ cornerRadius }}" x="0" y="-{{ height-cornerRadius }}" color="{{ bgColor }}" data-id="{{ dataId }}" />
+            <QuarterCircle scriptevents="{{ scriptEvents }}" if='Util.HasItem(corners, "BottomRight")' quadrant="BottomRight" radius="{{ cornerRadius }}" x="{{ width-cornerRadius }}" y="-{{ height-cornerRadius }}" color="{{ bgColor }}" data-id="{{ dataId }}" />
           </frame>
 
           <!-- Top -->
diff --git a/src/EvoSC.Manialinks/Templates/Scripts/Button.ms b/src/EvoSC.Manialinks/Templates/Scripts/Button.ms
index c0181b6e6..d9e6b0de1 100644
--- a/src/EvoSC.Manialinks/Templates/Scripts/Button.ms
+++ b/src/EvoSC.Manialinks/Templates/Scripts/Button.ms
@@ -6,15 +6,15 @@ Void HighlightButton(Text _Id, Boolean _Highlight, Text _ButtonType) {
     foreach (buttonPart in Page.GetClassChildren_Result) {
         declare part <=> buttonPart as CMlQuad;
         
-        declare ColorFocus = {{ Color.ToMlColor(Theme.UI_Button_Default_BgFocus) }};
-        declare ColorNormal = {{ Color.ToMlColor(Theme.UI_Button_Default_Bg) }};
+        declare ColorFocus = {! Color.ToMlColor(Theme.UI_Button_Default_BgFocus) !};
+        declare ColorNormal = {! Color.ToMlColor(Theme.UI_Button_Default_Bg) !};
         
         if (_ButtonType == "secondary") {
-            ColorFocus = {{ Color.ToMlColor(Theme.UI_Button_Secondary_BgFocus) }};
-            ColorNormal = {{ Color.ToMlColor(Theme.UI_Button_Secondary_Bg) }};
+            ColorFocus = {! Color.ToMlColor(Theme.UI_Button_Secondary_BgFocus) !};
+            ColorNormal = {! Color.ToMlColor(Theme.UI_Button_Secondary_Bg) !};
         } else if (_ButtonType == "accent") {
-            ColorFocus = {{ Color.ToMlColor(Theme.UI_Button_Accent_BgFocus) }};
-            ColorNormal = {{ Color.ToMlColor(Theme.UI_Button_Accent_Bg) }};
+            ColorFocus = {! Color.ToMlColor(Theme.UI_Button_Accent_BgFocus) !};
+            ColorNormal = {! Color.ToMlColor(Theme.UI_Button_Accent_Bg) !};
         }
         
         if (_Highlight) {
diff --git a/src/EvoSC.Manialinks/Templates/Scripts/Switch.ms b/src/EvoSC.Manialinks/Templates/Scripts/Switch.ms
index 6b9692aa3..ccedb0ac8 100644
--- a/src/EvoSC.Manialinks/Templates/Scripts/Switch.ms
+++ b/src/EvoSC.Manialinks/Templates/Scripts/Switch.ms
@@ -14,13 +14,13 @@ Void SetSwitchState(Text idName, Boolean value) {
         icon.SetText("{{ Icons.Check }}");
         AnimMgr.Add(head, """<quad pos='5 0' />""", 250, CAnimManager::EAnimManagerEasing::ExpOut);
         AnimMgr.Add(icon, """<label pos='7.5 -2.1' />""", 250, CAnimManager::EAnimManagerEasing::ExpOut);
-        icon.TextColor = {{ Color.ToMlColor(Theme.Green) }};
+        icon.TextColor = {! Color.ToMlColor(Theme.Green) !};
         entry.SetText("True", False);
     } else {
         AnimMgr.Add(head, """<quad pos='0 0' />""", 250, CAnimManager::EAnimManagerEasing::ExpOut);
         AnimMgr.Add(icon, """<label pos='2.5 -2.1' />""", 250, CAnimManager::EAnimManagerEasing::ExpOut);
         icon.SetText("{{ Icons.Close }}");
-        icon.TextColor = {{ Color.ToMlColor(Theme.Red) }};
+        icon.TextColor = {! Color.ToMlColor(Theme.Red) !};
         entry.SetText("False", False);
     }
 }
diff --git a/src/Modules/Scoreboard/Templates/Scoreboard.mt b/src/Modules/Scoreboard/Templates/Scoreboard.mt
index c6e50351f..ed59bcc16 100644
--- a/src/Modules/Scoreboard/Templates/Scoreboard.mt
+++ b/src/Modules/Scoreboard/Templates/Scoreboard.mt
@@ -581,7 +581,7 @@
             CurrentScoreMode = -1;
             SettingsVisible = False;
             
-            {{ string.Join("\n", PositionColors.Select(pc => $"PositionColors[{pc.Key}] = \"{pc.Value}\";")) }}
+            {! string.Join("\n", PositionColors.Select(pc => $"PositionColors[{pc.Key}] = \"{pc.Value}\";")) !}
         ***
         
         *** OnLoop ***