4 files changed, 98 insertions, 75 deletions

@@ -32,8 +32,11 @@ public class TitleScreenGameState implements GameState {
     {
         Audio.playMusic(Database.getMusic(Music.Title));
         
-        choices = new ChoiceWindow(Arrays.asList(Database.getVocab(Vocabulary.NewGame), Database.getVocab(Vocabulary.LoadGame), Database.getVocab(Vocabulary.EndGame)), true, ChoiceWindow.ChoiceWindowLocation.BottomLeft);
+        choices = new ChoiceWindow.Builder(Arrays.asList(Database.getVocab(Vocabulary.NewGame), Database.getVocab(Vocabulary.LoadGame), Database.getVocab(Vocabulary.EndGame)), ChoiceWindow.ChoiceWindowLocation.BottomLeft)
+                .center(true)
+                .build();
         Display.registerRenderable(choices);
+        KeyboardInput.registerInputable(choices);
     }
     
     public void deinitalize()
@@ -41,6 +44,7 @@ public class TitleScreenGameState implements GameState {
         Audio.stopMusic();
         
         Display.unregisterRenderable(choices);
+        KeyboardInput.unregisterInputable(choices);
     }
 
     PauseTimer pt = new PauseTimer(0);
@@ -14,7 +14,6 @@ import com.fourisland.fourpuzzle.database.Transitions;
 import com.fourisland.fourpuzzle.database.Vocabulary;
 import com.fourisland.fourpuzzle.gamestate.TitleScreenGameState;
 import com.fourisland.fourpuzzle.window.ChoiceWindow;
-import com.fourisland.fourpuzzle.window.InputableChoiceWindow;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.event.KeyEvent;
@@ -27,12 +26,14 @@ import java.util.Arrays;
 public class MenuEMS implements EscapeMenuState {
     
     MenuGameState parent;
-    InputableChoiceWindow cw;
+    ChoiceWindow cw;
 
     public void initalize(MenuGameState mgs)
     {
         parent = mgs;
-        cw = new InputableChoiceWindow(Arrays.asList(Database.getVocab(Vocabulary.EscapeMenuItems), Database.getVocab(Vocabulary.EscapeMenuEquipment), Database.getVocab(Vocabulary.EscapeMenuMagic), Database.getVocab(Vocabulary.EscapeMenuSave), Database.getVocab(Vocabulary.EscapeMenuQuit)), false, ChoiceWindow.ChoiceWindowLocation.AbsoluteTopLeft);
+        cw = new ChoiceWindow.Builder(Arrays.asList(Database.getVocab(Vocabulary.EscapeMenuItems), Database.getVocab(Vocabulary.EscapeMenuEquipment), Database.getVocab(Vocabulary.EscapeMenuMagic), Database.getVocab(Vocabulary.EscapeMenuSave), Database.getVocab(Vocabulary.EscapeMenuQuit)), ChoiceWindow.ChoiceWindowLocation.AbsoluteTopLeft)
+                .width(Game.WIDTH/5)
+                .build();
         Display.registerRenderable(cw);
         KeyboardInput.registerInputable(cw);
     }
@@ -8,12 +8,16 @@ package com.fourisland.fourpuzzle.window;
 import com.fourisland.fourpuzzle.Audio;
 import com.fourisland.fourpuzzle.Display;
 import com.fourisland.fourpuzzle.Game;
+import com.fourisland.fourpuzzle.KeyInput;
 import com.fourisland.fourpuzzle.database.Database;
 import com.fourisland.fourpuzzle.database.Sound;
+import com.fourisland.fourpuzzle.util.Inputable;
+import com.fourisland.fourpuzzle.util.PauseTimer;
 import com.fourisland.fourpuzzle.util.Renderable;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.TexturePaint;
+import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
 import java.util.List;
 
@@ -21,9 +25,40 @@ import java.util.List;
  *
  * @author hatkirby
  */
-public class ChoiceWindow implements Renderable {
+public class ChoiceWindow implements Renderable, Inputable {
     
     private static final int SPACER = 4;
+
+    public static class Builder
+    {
+        List<String> choices;
+        ChoiceWindowLocation location;
+        boolean center = false;
+        int width = 0;
+        
+        public Builder(List<String> choices, ChoiceWindowLocation location)
+        {
+            this.choices = choices;
+            this.location = location;
+        }
+        
+        public Builder center(boolean center)
+        {
+            this.center = center;
+            return this;
+        }
+        
+        public Builder width(int width)
+        {
+            this.width = width;
+            return this;
+        }
+        
+        public ChoiceWindow build()
+        {
+            return new ChoiceWindow(this);
+        }
+    }
     
     private List<String> choices;
     int numChoices;
@@ -33,27 +68,36 @@ public class ChoiceWindow implements Renderable {
     BufferedImage cacheBase;
     int x;
     int y;
-    public ChoiceWindow(List<String> choices, boolean center, ChoiceWindowLocation cwl)
+    String clickSound;
+    private ChoiceWindow(Builder builder)
     {
-        this.choices = choices;
+        this.choices = builder.choices;
         numChoices = choices.size();
-        this.center = center;
+        this.center = builder.center;
         
         for (String choice : choices)
         {
-            int l = Display.getFontMetrics().stringWidth(choice);
-            if (l > getWidth())
+            if (builder.width == 0)
             {
-                width = l;
+                int l = Display.getFontMetrics().stringWidth(choice);
+                if (l > getWidth())
+                {
+                    width = l;
+                }
             }
-            
+
             height += Display.getFontMetrics().getHeight() + SPACER;
         }
         
+        if (builder.width != 0)
+        {
+            width = builder.width;
+        }
+        
         cacheBase = Window.Default.getImage(width, height);
         
-        x = cwl.getX(width);
-        y = cwl.getY(height);
+        x = builder.location.getX(width);
+        y = builder.location.getY(height);
     }
 
     public void render(Graphics2D g2)
@@ -167,4 +211,39 @@ public class ChoiceWindow implements Renderable {
         }
     }
 
+    Boolean hasInput = false;
+    PauseTimer pt = new PauseTimer(0);
+    public void processInput(KeyInput key)
+    {
+        if (key.getKey() == KeyEvent.VK_UP)
+        {
+            if (pt.isElapsed())
+            {
+                moveUp();
+                pt.setTimer(1);
+            }
+        } else if (key.getKey() == KeyEvent.VK_DOWN)
+        {
+            if (pt.isElapsed())
+            {
+                moveDown();
+                pt.setTimer(1);
+            }
+        } else if (key.isActionDown())
+        {
+            synchronized (hasInput)
+            {
+                hasInput = true;
+            }
+        }
+    }
+    
+    public boolean hasInput()
+    {
+        synchronized (hasInput)
+        {
+            return hasInput;
+        }
+    }
+
 }
\ No newline at end of file
@@ -1,61 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.fourisland.fourpuzzle.window;
-
-import com.fourisland.fourpuzzle.KeyInput;
-import java.util.List;
-import com.fourisland.fourpuzzle.util.Inputable;
-import com.fourisland.fourpuzzle.util.PauseTimer;
-import java.awt.event.KeyEvent;
-
-/**
- *
- * @author hatkirby
- */
-public class InputableChoiceWindow extends ChoiceWindow implements Inputable {
-    
-    Boolean hasInput = false;
-    PauseTimer pt = new PauseTimer(0);
-    
-    public InputableChoiceWindow(List<String> choices, boolean center, ChoiceWindowLocation cwl)
-    {
-        super(choices, center, cwl);
-    }
-
-    public void processInput(KeyInput key)
-    {
-        if (key.getKey() == KeyEvent.VK_UP)
-        {
-            if (pt.isElapsed())
-            {
-                moveUp();
-                pt.setTimer(1);
-            }
-        } else if (key.getKey() == KeyEvent.VK_DOWN)
-        {
-            if (pt.isElapsed())
-            {
-                moveDown();
-                pt.setTimer(1);
-            }
-        } else if (key.isActionDown())
-        {
-            synchronized (hasInput)
-            {
-                hasInput = true;
-            }
-        }
-    }
-    
-    public boolean hasInput()
-    {
-        synchronized (hasInput)
-        {
-            return hasInput;
-        }
-    }
-
-}