Merge pull request #29 from RudideC/master

bugfixes, changes to animation defaults

build.gradle

@@ -88,7 +88,7 @@ dependencies {
     include "dev.felnull:special-model-loader:1.4.0+pre.1"
 
     // SVG Rendering Library
-    implementation "com.formdev:svgSalamander:1.1.4"
+    include implementation("com.formdev:svgSalamander:1.1.4")
 
 
     // ─────────────────────────────────────────────
@@ -111,7 +111,7 @@ dependencies {
     // ─────────────────────────────────────────────
 
     // Session Java (auth/session handling)
-    implementation "com.github.selimaj-dev:session-java:0.1.6"
+    include implementation("com.github.selimaj-dev:session-java:0.1.6")
 }
 
 

src/main/java/org/saturnclient/saturnclient/client/player/Roles.java

@@ -17,7 +17,9 @@ public class Roles {
 
     private static final Map<UUID, Role> ROLES = Map.of(
             UUID.fromString("d362a042-28bd-49e1-a807-ae74dbe8aba9"),
-            Role.OWNER);
+            Role.OWNER,
+            UUID.fromString("d8dc7023-179b-4460-bcf6-493fbf1289a6"),
+            Role.CONTRIBUTOR);
 
     /*
      * Gets the icon color of a specific individual, here are the different colors

src/main/java/org/saturnclient/saturnclient/config/AnimationConfig.java

@@ -10,19 +10,19 @@ public class AnimationConfig {
     public static final AnimationConfig logo = new AnimationConfig(true, 700, 0);
 
     // Main menu
-    public static final AnimationConfig mainMenu = new AnimationConfig(true, 700, 120);
+    public static final AnimationConfig mainMenu = new AnimationConfig(true, 300, 120);
 
     // Mod menu
-    public static final AnimationConfig modMenu = new AnimationConfig(true, 700, 30);
+    public static final AnimationConfig modMenu = new AnimationConfig(true, 100, 20);
 
     // Shift menu
-    public static final AnimationConfig shiftMenu = new AnimationConfig(true, 300, 120);
+    public static final AnimationConfig shiftMenu = new AnimationConfig(true, 100, 100);
 
     // Cosmetics menu
     public static final AnimationConfig cosmeticsMenu = new AnimationConfig(true, 700, 40);
 
     // Emote wheel
-    public static final AnimationConfig emoteWheel = new AnimationConfig(true, 700, 80);
+    public static final AnimationConfig emoteWheel = new AnimationConfig(true, 200, 40);
 
     public static void init(ConfigManager parent) {
         config = new ConfigManager(parent, "Animations");

src/main/java/org/saturnclient/saturnclient/config/Theme.java

@@ -30,7 +30,7 @@ public class Theme {
     public static final Property<Integer> WIDGET_RADIUS = Property.integer(10);
 
     // Font
-    public static final Property<Integer> FONT = Property.font(1);
+    public static final Property<Integer> FONT = Property.font(2);
 
     public static void init(ConfigManager parent) {
         ConfigManager config = new ConfigManager(parent, "UI Style");

src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java

@@ -9,6 +9,7 @@ import org.saturnclient.ui2.resources.Textures;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Final;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
@@ -26,19 +27,19 @@ public abstract class SplashOverlayMixin {
     @Shadow
     private ResourceReload reload;
 
-    @Shadow(remap = false)
+    @Shadow
     private long reloadCompleteTime;
 
-    @Shadow(remap = false)
+    @Shadow
     private long reloadStartTime;
 
-    @Shadow(remap = false)
+    @Shadow @Final
     private boolean reloading;
 
-    @Shadow(remap = false)
+    @Shadow @Final
     private Consumer<Optional<Throwable>> exceptionHandler;
 
-    @Shadow(remap = false)
+    @Shadow
     private float progress;
 
     /**