Merge pull request #23 from alyssaruth/achievement-count

Achievement count
alyssaruth · Oct 30, 2024 · 6bfb8dd · 6bfb8dd
2 parents 11453ba + d9dc281
commit 6bfb8dd
Show file tree

Hide file tree

Showing 109 changed files with 2,163 additions and 2,520 deletions.
diff --git a/buildSrc/src/main/kotlin/DependencyVersions.kt b/buildSrc/src/main/kotlin/DependencyVersions.kt
@@ -1,4 +1,5 @@
 object DependencyVersions {
+    const val KTFMT = "0.15.1"
     const val KTOR = "2.3.12"
     const val JACKSON = "2.16.1"
     const val LOGBACK = "1.5.8"

diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     id("Entropy.kotlin-common-conventions")
-    id("com.ncorti.ktfmt.gradle") version "0.15.1"
+    id("com.ncorti.ktfmt.gradle") version DependencyVersions.KTFMT
     application
 }
 

diff --git a/client/src/main/java/EntropyMain.java b/client/src/main/java/EntropyMain.java
@@ -43,7 +43,7 @@ else if (!bindOnPort(BIND_PORT_NUMBER))
 
 		checkForUpdatesIfRequired();
 
-		MainScreen application = ScreenCache.getMainScreen();
+		MainScreen application = ScreenCache.get(MainScreen.class);
 		application.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
 		application.setSize(1050, 600);
 		application.setVisible(true);

diff --git a/client/src/main/java/bean/ButtonColumn.java b/client/src/main/java/bean/ButtonColumn.java
diff --git a/client/src/main/java/object/AchievementBadge.java b/client/src/main/java/object/AchievementBadge.java
diff --git a/client/src/main/java/object/EntropyAchievementsTracker.java b/client/src/main/java/object/EntropyAchievementsTracker.java
@@ -1,8 +1,10 @@
 package object;
 
+import achievement.AchievementUtilKt;
 import util.AchievementsUtil;
 import util.CardsUtil;
 import util.Registry;
+import utils.Achievement;
 
 public class EntropyAchievementsTracker implements Registry
 {
@@ -159,7 +161,7 @@ public void unlockEndOfGameAchievements(int startingCards)
 		if (!deviatedFromFirstSuit
 		  && startingCards == 5)
 		{
-			AchievementsUtil.unlockAchievement(ACHIEVEMENTS_BOOLEAN_MONOTONE);
+			AchievementUtilKt.unlockAchievement(Achievement.Monotone);
 		}
 	}
 }