Settings abstraction - preferences & rewards #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

alyssaruth merged 13 commits into main from rewards-and-prefs

Oct 14, 2025

client/src/main/java/EntropyMain.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,10 +5,13 @@
  
    import javax.swing.WindowConstants;

    import logging.LoggerUncaughtExceptionHandler;

    import preference.PreferenceSetting;

    import screen.MainScreen;

    import screen.ScreenCache;

    import util.*;

    import static preference.PreferenceSettingKt.getPreference;

    import static util.ClientGlobals.preferenceStore;

    import static utils.CoreGlobals.logger;

    public class EntropyMain implements Registry

    @@ -59,7 +62,7 @@ private static void setLookAndFeel()
  
    		String lookAndFeel = null;

    		try 

    		{

    			lookAndFeel = prefs.get(PREFERENCES_STRING_LOOK_AND_FEEL, "Metal");

    			lookAndFeel = getPreference(PreferenceSetting.LookAndFeel);

    			if (ClientUtil.isAppleOs()

    			  && lookAndFeel.equals("Metal"))

    			{

    @@ -80,7 +83,7 @@ private static void setLookAndFeel()
  
    		{

    			logger.warn("laf.failed", "Failed to load LookAndFeel " + lookAndFeel + ". Caught " + e);

    		    DialogUtil.showError("Failed to load Look & Feel '" + lookAndFeel + "'. \nEntropy will use the default instead.");

    		    prefs.put(PREFERENCES_STRING_LOOK_AND_FEEL, "Metal");

    			preferenceStore.delete(PreferenceSetting.LookAndFeel);

    		}

    	}

    @@ -116,7 +119,7 @@ private static boolean bindOnPort(int portNumber)
  
    	private static void checkForUpdatesIfRequired()

    	{

    		boolean checkForUpdates = Registry.prefs.getBoolean(PREFERENCES_BOOLEAN_CHECK_FOR_UPDATES, true);

    		boolean checkForUpdates = getPreference(PreferenceSetting.CheckForUpdates);

    		if (!checkForUpdates

    		  || ClientUtil.devMode)

    		{

client/src/main/java/bean/ComboBoxItem.java

This file was deleted.

client/src/main/java/object/BidListCellRenderer.java

This file was deleted.

client/src/main/java/object/CardLabel.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,12 +3,14 @@
  
    import javax.swing.ImageIcon;

    import javax.swing.JLabel;

    import preference.PreferenceSetting;

    import screen.EntropyScreen;

    import util.GameUtil;

    import util.Registry;

    import static preference.PreferenceSettingKt.getPreference;

    public class CardLabel extends JLabel

    					   implements Registry

    {

    	private String card = "";

    	private boolean faceUp = false;

    @@ -21,27 +23,27 @@ public void refreshIcon()
  
    		{

    			return;

    		}

    		String deckDirectory = prefs.get(PREFERENCES_STRING_DECK_DIRECTORY, Registry.DECK_DIRECTORY_CLASSIC);

    		String jokerDirectory = prefs.get(PREFERENCES_STRING_JOKER_DIRECTORY, Registry.JOKER_DIRECTORY_CLASSIC);

    		String numberOfColours = prefs.get(PREFERENCES_STRING_NUMBER_OF_COLOURS, Registry.TWO_COLOURS);

    		String back = prefs.get(PREFERENCES_STRING_CARD_BACKS, Registry.BACK_CODE_CLASSIC_BLUE);

    		String deckDesign = getPreference(PreferenceSetting.DeckDesign);

    		String jokerDesign = getPreference(PreferenceSetting.JokerDesign);

    		String numberOfColours = getPreference(PreferenceSetting.NumberOfColours);

    		String back = getPreference(PreferenceSetting.CardBacks);

    		if (faded)

    		{

    			back = "backFaded";

    		}

    		if (!faceUp)

    		{

    			setIcon(new ImageIcon(EntropyScreen.class.getResource("/backs/" + back + ".png")));

    			setIcon(new ImageIcon(getClass().getResource("/backs/" + back + ".png")));

    		}

    		else if (faded)

    		{

    			setIcon(GameUtil.getFadedImageForCard(card, deckDirectory, jokerDirectory));

    			setIcon(GameUtil.getFadedImageForCard(card, deckDesign, jokerDesign));

    		}

    		else

    		{

    			setIcon(GameUtil.getImageForCard(card, deckDirectory, jokerDirectory, numberOfColours));

    			setIcon(GameUtil.getImageForCard(card, deckDesign, jokerDesign, numberOfColours));

    		}

    	}

client/src/main/java/object/DisabledComboBoxModel.java

-Original file line number
+Diff line change
@@ Expand Up @@
     	{
     		if (comboBoxItem != null)
     		{
-    			if (comboBoxItem.isEnabled())
+    			if (comboBoxItem.getEnabled())
     			{
     				super.setSelectedItem(comboBoxItem);
     			}
@@ Expand Down @@

client/src/main/java/object/ReplayTable.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -25,6 +25,7 @@
  
    import javax.swing.table.TableModel;

    import javax.swing.table.TableRowSorter;

    import preference.PreferenceSetting;

    import screen.ReplayDialog;

    import screen.ReplayFilterPanel;

    import screen.ScreenCache;

    @@ -37,12 +38,12 @@
  
    import util.ReplayRowWrapper;

    import util.TableUtil;

    import static preference.PreferenceSettingKt.getPreference;

    import static screen.ScreenCacheKt.FILE_REPLAY;

    import static utils.CoreGlobals.logger;

    public class ReplayTable extends JTable

    						 implements MouseListener,

    						 			Registry

    						 implements MouseListener

    {

    	private static final int INDEX_OF_DATETIME_COLUMN = 0;

    	private static final int INDEX_OF_NAME_COLUMN = INDEX_OF_DATETIME_COLUMN + 1;

    @@ -167,11 +168,11 @@ private void stripOutHiddenAndRemovedColumns()
  
    	    removeColumn(getColumnModel().getColumn(INDEX_OF_COMPLETED_COLUMN));

    	    removeColumn(getColumnModel().getColumn(INDEX_OF_FILENAME_COLUMN));

    	    boolean showGameMode = prefs.getBoolean(PREFERENCES_BOOLEAN_INCLUDE_GAME_MODE_COLUMN, true);

    		boolean showRounds = prefs.getBoolean(PREFERENCES_BOOLEAN_INCLUDE_ROUNDS_COLUMN, false);

    		boolean showPlayers = prefs.getBoolean(PREFERENCES_BOOLEAN_INCLUDE_PLAYERS_COLUMN, true);

    		boolean showCards = prefs.getBoolean(PREFERENCES_BOOLEAN_INCLUDE_CARDS_COLUMN, false);

    		boolean showRoomName = prefs.getBoolean(PREFERENCES_BOOLEAN_INCLUDE_ROOM_NAME_COLUMN, false);

    		boolean showGameMode = getPreference(PreferenceSetting.IncludeGameModeColumn);

    		boolean showRounds = getPreference(PreferenceSetting.IncludeRoundsColumn);

    		boolean showPlayers = getPreference(PreferenceSetting.IncludePlayersColumn);

    		boolean showCards = getPreference(PreferenceSetting.IncludeCardsColumn);

    		boolean showRoomName = getPreference(PreferenceSetting.IncludeRoomNameColumn);

    		if (!showCards)

    		{

client/src/main/java/object/RewardStar.java

This file was deleted.

client/src/main/java/online/screen/GameRoom.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,10 +1,13 @@
  
    package online.screen;

    import achievement.Reward;

    import bean.BidListCellRenderer;

    import game.*;

    import http.dto.RoomSummary;

    import object.*;

    import online.util.XmlBuilderClient;

    import org.w3c.dom.Document;

    import preference.PreferenceSetting;

    import screen.*;

    import util.*;

    @@ -24,6 +27,7 @@
  
    import java.util.prefs.Preferences;

    import static game.RegistryUtilKt.writeActions;

    import static preference.PreferenceSettingKt.getPreference;

    import static utils.ColourUtilKt.getColourForPlayerNumber;

    import static utils.CoreGlobals.logger;

    @@ -212,15 +216,13 @@ else if (mode == GameMode.Vectropy)
  
    	private void setIcon()

    	{

    		boolean unlockedExtraSuits = rewards.getBoolean(REWARDS_BOOLEAN_EXTRA_SUITS, false);

    		ArrayList<String> suits = new ArrayList<>();

    		suits.add("club");

    		suits.add("diamond");

    		suits.add("heart");

    		suits.add("spade");

    		if (unlockedExtraSuits)

    		if (Reward.ExtraSuits.isUnlocked())

    		{

    			suits.add("moon");

    			suits.add("star");

    @@ -704,7 +706,7 @@ public void startGame(int personToStart)
  
    		}

    		adjustPlayersBasedOnHands();

    		playBlind = prefs.getBoolean(PREFERENCES_BOOLEAN_PLAY_BLIND, false);

    		playBlind = getPreference(PreferenceSetting.PlayBlind);

    		hasActedBlindThisGame = false;

    		handPanel.setHasViewedHandThisGame(false);

    		handPanel.setViewCardsVisibility(playBlind && playerIsEnabled(playerNumberLocal));

    @@ -1349,7 +1351,7 @@ public boolean bidHistoryContainsBid()
  
    	@Override

    	public void requestFocus() 

    	{

    		boolean popUpRoom = prefs.getBoolean(PREFERENCES_BOOLEAN_POP_UP_ROOMS, true);

    		boolean popUpRoom = getPreference(PreferenceSetting.PopUpRooms);

    		if (popUpRoom)

    		{

client/src/main/java/online/util/ResponseHandler.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
     import org.w3c.dom.Document;
     import org.w3c.dom.Element;
     import org.w3c.dom.NodeList;
+    import preference.PreferenceSetting;
     import screen.ScreenCache;
     import util.*;
     import utils.CoreGlobals;
@@ Expand All / @@ -18,6 +19,7 @@ @@
     import java.util.HashMap;
     import java.util.List;
+    import static preference.PreferenceSettingKt.getPreference;
     import static utils.CoreGlobals.logger;
     public class ResponseHandler implements XmlConstants
@@ Expand Down Expand Up @@
     	 */
     	private static void pauseDuringChallenge()
     	{
-    		int sleepMillis = 1000 * Registry.prefs.getInt(Registry.PREFERENCES_INT_AUTO_START_SECONDS, 2);
+    		int sleepMillis = 1000 * getPreference(PreferenceSetting.AutoStartSeconds);
     		try { Thread.sleep(sleepMillis); } catch (Throwable t) {}
     	}
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Settings abstraction - preferences & rewards #34

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!