From 561d0177c2561d8f0d4a895105ce46ffdc8ea8ca Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Sun, 26 Apr 2020 16:28:38 +0100
Subject: [PATCH 1/5] Added fabric link

---
 .../Profiles/Minecraft/Control_Minecraft.xaml               | 6 ++++--
 .../Profiles/Minecraft/Control_Minecraft.xaml.cs            | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml
index e8a026028..29a10c28d 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml
+++ b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml
@@ -18,6 +18,8 @@
                     </TextBlock>
 
                     <Button Content="Minecraft Forge download" HorizontalAlignment="Left" Padding="10,2" Click="GoToForgePage_Click" />
+                    
+                    <Button Content="Minecraft Fabric download" HorizontalAlignment="Left" Padding="10,2" Margin="0,10" Click="GoToFabricDownloadPage"/>
 
                     <TextBlock Margin="0,10,0,0" Text="Supported versions:" FontSize="13" FontWeight="Bold" />
 
@@ -35,7 +37,7 @@
                                         <ColumnDefinition Width="Auto" />
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
-                                    
+
                                     <TextBlock Text="{Binding Path=Name}" FontWeight="SemiBold" HorizontalAlignment="Stretch" Grid.Column="0" />
                                     <TextBlock Grid.Column="1">
                                         <Run Text="{Binding Path=Version}" />
@@ -87,7 +89,7 @@
 
                     <Label Content="Health:" Grid.Row="2" HorizontalAlignment="Right" Margin="8,0" />
                     <Slider Grid.Row="2" Grid.Column="1" Margin="0,4" ValueChanged="HealthSlider_ValueChanged" Minimum="0" Maximum="20" TickFrequency="1" IsSnapToTickEnabled="True" />
-                    
+
                     <Label Content="Absorption:" Grid.Row="3" HorizontalAlignment="Right" Margin="8,0" />
                     <Slider Grid.Row="3" Grid.Column="1" Margin="0,4" ValueChanged="Slider_ValueChanged" Minimum="0" Maximum="20" TickFrequency="1" IsSnapToTickEnabled="True" />
 
diff --git a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml.cs
index 07a11210a..25243ab50 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml.cs
@@ -63,6 +63,10 @@ private void GoToModDownloadPage_Click(object sender, RoutedEventArgs e) {
             Process.Start(((sender as Button).DataContext as ModDetails).Link);
         }
 
+        private void GoToFabricDownloadPage(object sender, RoutedEventArgs e) {
+            Process.Start(@"https://fabricmc.net/");
+        }
+
         private async void PopulateModList() {
             ModList.Clear();
             try {

From a527eb3a0c50a4770b6f747d9ec47ba24f0c7545 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Sun, 26 Apr 2020 16:35:34 +0100
Subject: [PATCH 2/5] Adjusted mc profile so the background doesnt change
 unless the mod is installed

---
 .../Profiles/Minecraft/MinecraftProfile.cs    | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs b/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs
index fa645b076..bf13231b7 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs
@@ -132,12 +132,24 @@ public override void Reset() {
                 }, 
                 new OverrideLogicBuilder()
                     .SetLookupTable("_PrimaryColor", new OverrideLookupTableBuilder<Color>()
-                        .AddEntry(Color.FromArgb(125,42,123), new BooleanGSINumeric("World/DimensionID", 1))//The End
-                        .AddEntry(Color.FromArgb(255,183,0), new BooleanGSINumeric("World/DimensionID", -1))//Nether
+                        .AddEntry(Color.FromArgb(125,42,123), new BooleanAnd(new IEvaluatable<bool>[] { 
+                            new BooleanGSINumeric("World/DimensionID", 1),
+                            new BooleanGSIBoolean("Player/InGame") 
+                        }))//The End
+                        .AddEntry(Color.FromArgb(255,183,0), new BooleanAnd(new IEvaluatable<bool>[] {
+                            new BooleanGSINumeric("World/DimensionID", -1),
+                            new BooleanGSIBoolean("Player/InGame")
+                        }))//The Nether
                     )
                     .SetLookupTable("_SecondaryColor", new OverrideLookupTableBuilder<Color>()
-                        .AddEntry(Color.FromArgb(49,0,59), new BooleanGSINumeric("World/DimensionID", 1))//The End
-                        .AddEntry(Color.FromArgb(87,83,0), new BooleanGSINumeric("World/DimensionID", -1))//Nether
+                        .AddEntry(Color.FromArgb(49,0,59), new BooleanAnd(new IEvaluatable<bool>[] {
+                            new BooleanGSINumeric("World/DimensionID", 1),
+                            new BooleanGSIBoolean("Player/InGame")
+                        }))//The End
+                        .AddEntry(Color.FromArgb(87,83,0), new BooleanAnd(new IEvaluatable<bool>[] {
+                            new BooleanGSINumeric("World/DimensionID", -1),
+                            new BooleanGSIBoolean("Player/InGame")
+                        }))//The Nether
                     )
                 ),
 
@@ -149,12 +161,24 @@ public override void Reset() {
                 },
                 new OverrideLogicBuilder()
                     .SetLookupTable("_PrimaryColor", new OverrideLookupTableBuilder<Color>()
-                        .AddEntry(Color.FromArgb(209,232,80), new BooleanGSINumeric("World/DimensionID", 1))//The End
-                        .AddEntry(Color.FromArgb(184,26,0), new BooleanGSINumeric("World/DimensionID", -1))//Nether
+                        .AddEntry(Color.FromArgb(209,232,80), new BooleanAnd(new IEvaluatable<bool>[] {
+                            new BooleanGSINumeric("World/DimensionID", 1),
+                            new BooleanGSIBoolean("Player/InGame")
+                        }))//The End
+                        .AddEntry(Color.FromArgb(184,26,0), new BooleanAnd(new IEvaluatable<bool>[] {
+                            new BooleanGSINumeric("World/DimensionID", -1),
+                            new BooleanGSIBoolean("Player/InGame")
+                        }))//The Nether
                     )
                     .SetLookupTable("_SecondaryColor", new OverrideLookupTableBuilder<Color>()
-                        .AddEntry(Color.FromArgb(107,102,49), new BooleanGSINumeric("World/DimensionID", 1))//The End
-                        .AddEntry(Color.FromArgb(59,8,0), new BooleanGSINumeric("World/DimensionID", -1))//Nether
+                        .AddEntry(Color.FromArgb(107,102,49),new BooleanAnd(new IEvaluatable<bool>[] {
+                            new BooleanGSINumeric("World/DimensionID", 1),
+                            new BooleanGSIBoolean("Player/InGame")
+                        }))//The End
+                        .AddEntry(Color.FromArgb(59,8,0),  new BooleanAnd(new IEvaluatable<bool>[] {
+                            new BooleanGSINumeric("World/DimensionID", -1),
+                            new BooleanGSIBoolean("Player/InGame")
+                        }))//The Nether
                     )
                 ),
             };

From e8ceed1e7172cd129f38d7c9cc249828435cba20 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Sun, 26 Apr 2020 17:36:56 +0100
Subject: [PATCH 3/5] replaced fire and rain layer with particle layer

---
 .../Profiles/Minecraft/MinecraftProfile.cs    | 76 +++++++++++++++++--
 1 file changed, 69 insertions(+), 7 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs b/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs
index bf13231b7..14bdcaa66 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs
@@ -13,13 +13,16 @@
 using System.Threading.Tasks;
 using DK = Aurora.Devices.DeviceKeys;
 
-namespace Aurora.Profiles.Minecraft {
+namespace Aurora.Profiles.Minecraft
+{
 
-    public class MinecraftProfile : ApplicationProfile {
+    public class MinecraftProfile : ApplicationProfile
+    {
 
         public MinecraftProfile() : base() { }
 
-        public override void Reset() {
+        public override void Reset()
+        {
             base.Reset();
 
             // Keys that do something and should be highlighted in a static color
@@ -77,7 +80,7 @@ public override void Reset() {
                     }
                 },
                 new OverrideLogicBuilder()
-                    .SetDynamicBoolean("_Enabled", new BooleanAnd(new List<BooleanGSIBoolean>(new[] { 
+                    .SetDynamicBoolean("_Enabled", new BooleanAnd(new List<BooleanGSIBoolean>(new[] {
                         new BooleanGSIBoolean("Player/IsInWater"),new BooleanGSIBoolean("Player/InGame") }
                     )))
                 ),
@@ -119,9 +122,68 @@ public override void Reset() {
                     .SetDynamicBoolean("_Enabled", new BooleanGSIBoolean("Player/InGame"))
                 ),
 
-                new Layer("On Fire", new MinecraftBurnLayerHandler()),
+                new Layer("On Fire", new SimpleParticleLayerHandler()
+                {
+                    Properties = new SimpleParticleLayerProperties()
+                    {
+                        _SpawnLocation = ParticleSpawnLocations.BottomEdge,
+                        _ParticleColorStops = new Utils.ColorStopCollection()
+                        {
+                            { 0f, Color.Orange },
+                            { 0.6f , Color.Red },
+                            { 1f, Color.Black }
+                        },
+                        _MinSpawnTime = 0.05f,
+                        _MaxSpawnTime = 0.05f,
+                        _MinSpawnAmount = 8,
+                        _MaxSpawnAmount = 10,
+                        _MinLifetime = 0.5f,
+                        _MaxLifetime = 2f,
+                        _MinInitialVelocityX = 0,
+                        _MaxInitialVelocityX = 0,
+                        _MinInitialVelocityY = -5f,
+                        _MaxInitialVelocityY = -0.8f,
+                        _AccelerationX = 0f,
+                        _AccelerationY = 0.5f,
+                        _MinSize = 8,
+                        _MaxSize = 12,
+                        _DeltaSize = -4,
+                    }
+                },
+                new OverrideLogicBuilder()
+                    .SetDynamicBoolean("_SpawningEnabled", new BooleanGSIBoolean("Player/IsBurning"))
+                ),
 
-                new Layer("Raining", new MinecraftRainLayerHandler()),
+                new Layer("Raining", new SimpleParticleLayerHandler()
+                {
+                    Properties = new SimpleParticleLayerProperties()
+                    {
+                        _SpawnLocation = ParticleSpawnLocations.TopEdge,
+                        _ParticleColorStops = new Utils.ColorStopCollection
+                        {
+                            { 0f, Color.Cyan },
+                            { 1f, Color.Cyan }
+                        },
+                        _MinSpawnTime = .1f,
+                        _MaxSpawnTime = .2f,
+                        _MinSpawnAmount = 1,
+                        _MaxSpawnAmount = 2,
+                        _MinLifetime = 1,
+                        _MaxLifetime = 1,
+                        _MinInitialVelocityX = 0,
+                        _MaxInitialVelocityX = 0,
+                        _MinInitialVelocityY =3,
+                        _MaxInitialVelocityY = 3,
+                        _AccelerationX = 0,
+                        _AccelerationY = 0,
+                        _MinSize = 2,
+                        _MaxSize = 4,
+                        _DeltaSize = 0,
+                    }
+                },
+                new OverrideLogicBuilder()
+                    .SetDynamicBoolean("_SpawningEnabled", new BooleanGSIBoolean("World/IsRaining"))
+                ),
 
                 new Layer("Grass Block Top", new MinecraftBackgroundLayerHandler() {
                     Properties = new MinecraftBackgroundLayerHandlerProperties() {
@@ -129,7 +191,7 @@ public override void Reset() {
                         _SecondaryColor = Color.FromArgb(30, 80, 25),
                         _Sequence = new KeySequence(new FreeFormObject(0, -60, 900, 128))
                     }
-                }, 
+                },
                 new OverrideLogicBuilder()
                     .SetLookupTable("_PrimaryColor", new OverrideLookupTableBuilder<Color>()
                         .AddEntry(Color.FromArgb(125,42,123), new BooleanAnd(new IEvaluatable<bool>[] { 

From 766f20f9eead873d5e59d843cd22a9f91dfa5bfd Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Mon, 27 Apr 2020 14:55:17 +0100
Subject: [PATCH 4/5] clarified that fabric mod loader is also available

also separated the line breaks into two separate lines since they are two line breaks and not one smh my head
---
 .../Profiles/Minecraft/Control_Minecraft.xaml             | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml
index 29a10c28d..c0b639c74 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml
+++ b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Control_Minecraft.xaml
@@ -12,8 +12,12 @@
                 <StackPanel Margin="10">
                     <CheckBox x:Name="GameEnabled" Content="Enable Aurora to provide lighting effects with Minecraft. Ensure you have read the below text." Checked="GameEnabled_Checked" Unchecked="GameEnabled_Checked" />
                     <TextBlock HorizontalAlignment="Left" Margin="0,10" TextWrapping="Wrap" MaxWidth="824">
-                        <Run Text="Support for Minecraft requires a mod so that Aurora is able to fetch the variables from the game. Currently this mod requires Forge mod loader, though other options may become available in future." />
-                        <LineBreak /><LineBreak />
+                        <Run Text="Support for Minecraft requires a mod so that Aurora is able to fetch the variables from the game."/>
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Currently this mod requires either Forge or Fabric mod loader, depending on the version of the game."/>
+                        <LineBreak />
+                        <LineBreak />
                         <Run Text="These mods are not authored by the main Aurora developers and any issues with these mods should not be directed at them, but posted on the relevant GitLab repo for the mod." />
                     </TextBlock>
 

From 10eb3a0ea8a655d1fc231839a703145027134c02 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Mon, 27 Apr 2020 15:40:51 +0100
Subject: [PATCH 5/5] replaced mc health layer with overrides

---
 .../Layers/MinecraftBurnLayerHandler.cs       |  2 +-
 .../Layers/MinecraftHealthBarLayerHandler.cs  |  2 +-
 .../Layers/MinecraftRainLayerHandler.cs       |  2 +-
 .../Profiles/Minecraft/MinecraftProfile.cs    | 20 +++++++++++++++----
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftBurnLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftBurnLayerHandler.cs
index eb1a16817..8ef54abf8 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftBurnLayerHandler.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftBurnLayerHandler.cs
@@ -12,7 +12,7 @@
 using System.Windows.Controls;
 
 namespace Aurora.Profiles.Minecraft.Layers {
-
+    [Obsolete("This layer is obselete and has been replaced by the Overrides system.")]
     public class MinecraftBurnLayerHandler : LayerHandler<LayerHandlerProperties> {
 
         private List<FireParticle> particles = new List<FireParticle>();
diff --git a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftHealthBarLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftHealthBarLayerHandler.cs
index 6df015a6f..dcdf3e5e6 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftHealthBarLayerHandler.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftHealthBarLayerHandler.cs
@@ -11,7 +11,7 @@
 using System.Windows.Controls;
 
 namespace Aurora.Profiles.Minecraft.Layers {
-
+    [Obsolete("This layer is obselete and has been replaced by the Overrides system.")]
     public class MinecraftHealthBarLayerHandlerProperties : LayerHandlerProperties<MinecraftHealthBarLayerHandlerProperties> {
 
         [JsonIgnore]
diff --git a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftRainLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftRainLayerHandler.cs
index be6481eb0..53e803485 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftRainLayerHandler.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/Minecraft/Layers/MinecraftRainLayerHandler.cs
@@ -12,7 +12,7 @@
 using System.Windows.Controls;
 
 namespace Aurora.Profiles.Minecraft.Layers {
-
+    [Obsolete("This layer is obselete and has been replaced by the Overrides system.")]
     public class MinecraftRainLayerHandlerProperties : LayerHandlerProperties<MinecraftRainLayerHandlerProperties> {
 
         [JsonIgnore]
diff --git a/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs b/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs
index 14bdcaa66..55cb271a7 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs
@@ -5,6 +5,7 @@
 using Aurora.Settings.Overrides;
 using Aurora.Settings.Overrides.Logic;
 using Aurora.Settings.Overrides.Logic.Builder;
+using Octokit;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -31,8 +32,13 @@ public override void Reset()
             Layers = new System.Collections.ObjectModel.ObservableCollection<Layer>() {
                 new Layer("Controls Assistant Layer", new MinecraftKeyConflictLayerHandler()),
 
-                new Layer("Health Bar", new MinecraftHealthBarLayerHandler() {
-                    Properties = new MinecraftHealthBarLayerHandlerProperties() {
+                new Layer("Health Bar", new PercentLayerHandler() {
+                    Properties = new PercentLayerHandlerProperties()
+                    {
+                        _VariablePath = "Player/Health",
+                        _MaxVariablePath = "Player/HealthMax",
+                        _PrimaryColor = Color.Red,
+                        _SecondaryColor = Color.Transparent,
                         _Sequence = new KeySequence(new[] {
                             DK.Z, DK.X, DK.C, DK.V, DK.B, DK.N, DK.M, DK.COMMA, DK.PERIOD, DK.FORWARD_SLASH
                         })
@@ -40,6 +46,12 @@ public override void Reset()
                 },
                 new OverrideLogicBuilder()
                     .SetDynamicBoolean("_Enabled", new BooleanGSIBoolean("Player/InGame"))
+                    .SetLookupTable("_PrimaryColor", new OverrideLookupTableBuilder<Color>()
+                        .AddEntry(Color.FromArgb(255, 210, 0), new BooleanGSIBoolean("Player/PlayerEffects/HasAbsorption"))
+                        .AddEntry(Color.FromArgb(240, 75, 100), new BooleanGSIBoolean("Player/PlayerEffects/HasRegeneration"))
+                        .AddEntry(Color.FromArgb(145, 160, 30), new BooleanGSIBoolean("Player/PlayerEffects/HasPoison"))
+                        .AddEntry(Color.FromArgb(70, 5, 5), new BooleanGSIBoolean("Player/PlayerEffects/HasWither"))
+                    )
                 ),
 
                 new Layer("Experience Bar", new PercentLayerHandler() {
@@ -194,9 +206,9 @@ public override void Reset()
                 },
                 new OverrideLogicBuilder()
                     .SetLookupTable("_PrimaryColor", new OverrideLookupTableBuilder<Color>()
-                        .AddEntry(Color.FromArgb(125,42,123), new BooleanAnd(new IEvaluatable<bool>[] { 
+                        .AddEntry(Color.FromArgb(125,42,123), new BooleanAnd(new IEvaluatable<bool>[] {
                             new BooleanGSINumeric("World/DimensionID", 1),
-                            new BooleanGSIBoolean("Player/InGame") 
+                            new BooleanGSIBoolean("Player/InGame")
                         }))//The End
                         .AddEntry(Color.FromArgb(255,183,0), new BooleanAnd(new IEvaluatable<bool>[] {
                             new BooleanGSINumeric("World/DimensionID", -1),