Word hint updating, and system for game messages

abhay7dev · abhay7dev · commit d3eb7a757f82 · 2025-04-28T01:42:16.000-07:00
diff --git a/client/src/main/java/dev/abhay7/skribbl/client/Board.java b/client/src/main/java/dev/abhay7/skribbl/client/Board.java
@@ -11,8 +11,11 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.awt.font.TextAttribute;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -29,6 +32,8 @@ public class Board extends JPanel {
     private Client client;
     private Canvas canvas;
 
+    private JLabel wordLabel;
+
     private boolean isDrawing;
 
     public Board(Client cl, int WIDTH, int HEIGHT) {
@@ -65,24 +70,29 @@ public void actionPerformed(ActionEvent e) {
 
         drawingMenu.add(clearButton);
 
-        canvas.setBorder(BorderFactory.createLineBorder(Color.BLACK, 10));
 
+        
+        canvas.setBorder(BorderFactory.createLineBorder(Color.BLACK, 10));
+        
         this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
         this.setBorder(BorderFactory.createEmptyBorder(20, 0, 20, 0));
         this.add(canvas);
         this.add(drawingMenu);
+        wordLabel = new JLabel("WORD GOES HERE");
+        Map<TextAttribute, Object> attributes = new HashMap<TextAttribute, Object>();
+        attributes.put(TextAttribute.TRACKING, 0.5);
+        wordLabel.setFont(getFont().deriveFont(20.0f).deriveFont(attributes));
+        this.add(wordLabel);
     }
 
     public boolean isDrawing() { return this.isDrawing; }
     public void setDrawing(boolean drawing) { this.isDrawing = drawing; }
     public Canvas getCanvas() { return this.canvas; }
 
     protected void addWordPhrase(String phrase) {
-        JLabel jl = new JLabel(phrase.substring(0, 1).toUpperCase() + phrase.substring(1, phrase.length()));
-        jl.setFont(getFont().deriveFont(20.0f));
-        this.add(jl);
-        this.revalidate();
-        this.repaint();
+        wordLabel.setText(phrase.substring(0, 1).toUpperCase() + phrase.substring(1, phrase.length()));
+        wordLabel.revalidate();
+        wordLabel.repaint();
     }
 
     private JButton getColorButton(Color c) {
@@ -266,10 +276,12 @@ public void mousePressed(MouseEvent e) {
         public void mouseReleased(MouseEvent e) {
             isMouseDown = false;
             e.consume();
-            try {
-                client.getNetworkHandler().sendBoard(canvas.getDrawing());
-            } catch(Exception er) {
-                System.out.println(er);
+            if(isDrawing) {
+                try {
+                    client.getNetworkHandler().sendBoard(canvas.getDrawing());
+                } catch(Exception er) {
+                    System.out.println(er);
+                }
             }
         }
 
diff --git a/client/src/main/java/dev/abhay7/skribbl/client/Client.java b/client/src/main/java/dev/abhay7/skribbl/client/Client.java
@@ -591,11 +591,12 @@ protected void startDrawing() {
                     System.out.println("Error fetching words: " + e);
                 }
             }
-            String chosenWord = this.wordList.get((int) (this.wordList.size() * (Math.random())));
+            this.chosenWord = this.wordList.get((int) (this.wordList.size() * (Math.random())));
             while(this.wordsGuessed.contains(chosenWord)) {
                 chosenWord = this.wordList.get((int) (this.wordList.size() * (Math.random())));
             }
             this.board.addWordPhrase(this.chosenWord);
+            try { new Thread(new GameTimer()).start(); } catch(Exception e) { }
         }
     }
     
@@ -851,4 +852,50 @@ private void fatalError(String message, Exception e) {
     protected NetworkHandler getNetworkHandler() { return this.networkHandler; }
     protected Board getBoard() { return this.board; }
     protected String getUsername() { return this.username; }
+
+    protected class GameTimer implements Runnable {
+        public void run() {
+            long startime = java.time.Instant.now().toEpochMilli();
+
+            StringBuilder sb1 = new StringBuilder();
+            StringBuilder sb2 = new StringBuilder();
+            int in = -1;
+            do {
+                in = (int) (Math.random() * chosenWord.length());
+            } while(in < 0 && chosenWord.charAt(in) == ' ');
+
+            for(int i = 0; i < chosenWord.length(); i++) {
+                if(chosenWord.charAt(i) == ' ') {
+                    sb1.append(" ");
+                    sb2.append(" ");
+                } else { 
+                    sb1.append("_");
+                    if(i == in) sb2.append(chosenWord.charAt(i));
+                    else sb2.append("_");
+                }
+            }
+
+            try {
+                System.out.println("SENT sb1 " + sb1.toString());
+                networkHandler.sendWordUpdate(sb1.toString());
+            } catch(Exception e) {}
+
+            boolean sent = false;
+
+            while(java.time.Instant.now().toEpochMilli() < startime + 30000) {
+
+                try {
+                    if(!sent && java.time.Instant.now().toEpochMilli() > startime + 15000) {
+                        System.out.println("SENT sb2 " + sb2.toString());
+                        networkHandler.sendWordUpdate(sb2.toString());            
+                        sent = true;
+                    }
+                    Thread.sleep(1000);
+                } catch(Exception e) {}
+            }
+
+            System.out.println("Finished gametimer");
+
+        }
+    }
 }
diff --git a/client/src/main/java/dev/abhay7/skribbl/client/NetworkHandler.java b/client/src/main/java/dev/abhay7/skribbl/client/NetworkHandler.java
@@ -224,7 +224,14 @@ private void handlePacket(ReceivedPacket packet) throws JSONException {
 
     private void handleRawGameDataPack(ReceivedPacket packet) {
         if(packet.getData().has("message") && !packet.getData().getString("message").isBlank()) {
-            client.updateMessages(packet.getData().getString("message"));
+            if(!packet.getData().has("type")) {
+                client.updateMessages(packet.getData().getString("message"));
+            } else {
+
+                if(packet.getData().getString("type").equalsIgnoreCase("word")) {
+                    this.client.getBoard().addWordPhrase(packet.getData().getString("message"));
+                }
+            }
         } else /* if(packet.getData().has("image")) */ {
             if(client.getBoard().getCanvas() != null) {
                 GameDataPack gdp = GameDataPack.fromJSON(packet.getData());
@@ -471,6 +478,23 @@ protected synchronized void sendMessage(String msg) throws IOException, JSONExce
         this.setWriting(false);
     }
 
+    protected synchronized void sendWordUpdate(String msg) throws IOException, JSONException, InterruptedException, ExecutionException, TimeoutException {
+        this.setWriting(true);
+
+
+        GameDataPack gdp = new GameDataPack(msg, "word");
+
+        if (!client.inPrivate) {
+            sendDataPackage(gdp, MessageType.GAME_DATA);
+            System.out.println("Sent word update");
+        }
+        else {
+            sendToClientsFriendsPriv(gdp);
+        }
+
+        this.setWriting(false);
+    }
+
     protected synchronized void sendBoard(BufferedImage image) throws IOException, JSONException, InterruptedException, ExecutionException, TimeoutException {
         this.setWriting(true);
 
diff --git a/server/src/main/java/dev/abhay7/skribbl/server/Server.java b/server/src/main/java/dev/abhay7/skribbl/server/Server.java
@@ -305,7 +305,7 @@ private void disconnectAndTerminateUser() {
 
         private void handleDataPackage(DataPackage dataPackage) {
             
-            System.out.println("Received Data Package: " + dataPackage);
+            if(!(dataPackage instanceof KeepAlivePack)) System.out.println("Received Data Package: " + dataPackage);
 
             if (this.verified && dataPackage != null && dataPackage.isServerRequest()) {
             
@@ -399,7 +399,12 @@ private void handleDataPackage(DataPackage dataPackage) {
                         try {
                             GameDataPack gdp = ((GameDataPack) dataPackage);
                             if(!gdp.getMessage().isBlank()) {
-                                this.getCurrentLobby().notifyAllExceptSender(new GameDataPack(false, this.getUsername() + ": " + gdp.getMessage()), this, MessageType.GAME_DATA);
+                                if(gdp.getType().isBlank()) {
+                                    this.getCurrentLobby().notifyAllExceptSender(new GameDataPack(false, this.getUsername() + ": " + gdp.getMessage()), this, MessageType.GAME_DATA);
+                                } else {
+                                    System.out.println("Sending " + gdp.getType());
+                                    this.getCurrentLobby().notifyAllExceptSender(new GameDataPack(gdp.getMessage(), gdp.getType()), this, MessageType.GAME_DATA);
+                                }
                             } else if(gdp.getImage() != null) {
                                 this.getCurrentLobby().notifyAllExceptSender(new GameDataPack(false, gdp.getImage()), this, MessageType.GAME_DATA);
                             }
diff --git a/server/src/main/java/dev/abhay7/skribbl/server/datapacks/GameDataPack.java b/server/src/main/java/dev/abhay7/skribbl/server/datapacks/GameDataPack.java
@@ -13,13 +13,18 @@
 
 public class GameDataPack extends DataPackage {
 
+    private String type = "";
     private String message = "";
     private BufferedImage image;
 
     public GameDataPack(String message) {
         this(true, message);
     }
 
+    public GameDataPack(String message, String type) {
+        this(true, message, type);
+    }
+
     public GameDataPack(BufferedImage image) {
         this(true, image);
     }
@@ -34,6 +39,12 @@ public GameDataPack(boolean isServerRequest, BufferedImage image) {
         this.image = image;
     }
 
+    public GameDataPack(boolean isServerRequest, String message, String type) {
+        super(isServerRequest);
+        this.message = message;
+        this.type = type;
+    }
+
     public static GameDataPack fromJSON(String json) throws JSONException {
         return fromJSON(new JSONObject(json));
     }
@@ -49,8 +60,13 @@ public static GameDataPack fromJSON(JSONObject jo) throws JSONException {
                 System.out.println(ioe);
                 return null;
             }
-        } else if(jo.has("message") && !jo.getString("message").isBlank()) {
-            return new GameDataPack(isServerRequest, jo.getString("message"));
+        }
+        if(jo.has("message") && !jo.getString("message").isBlank()) {
+            if(jo.has("type")) {
+                return new GameDataPack(jo.getString("message"), jo.getString("type"));
+            } else {
+                return new GameDataPack(isServerRequest, jo.getString("message"));
+            }
         }
 
         return null;
@@ -76,10 +92,15 @@ public JSONObject toJSON() throws JSONException {
             }
         }
 
+        if(!this.type.isBlank()) {
+            jo.put("type", this.type);
+        }
+
         return jo;
     }
 
     public String getMessage() { return this.message; }
+    public String getType() { return this.type; }
     public BufferedImage getImage() { return this.image; }
     
 }

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,18 @@`
`13`	`13`
`14`	`14`	`public class GameDataPack extends DataPackage {`
`15`	`15`
	`16`	`+ private String type = "";`
`16`	`17`	`private String message = "";`
`17`	`18`	`private BufferedImage image;`
`18`	`19`
`19`	`20`	`public GameDataPack(String message) {`
`20`	`21`	`this(true, message);`
`21`	`22`	`}`
`22`	`23`
	`24`	`+ public GameDataPack(String message, String type) {`
	`25`	`+ this(true, message, type);`
	`26`	`+ }`
	`27`	`+`
`23`	`28`	`public GameDataPack(BufferedImage image) {`
`24`	`29`	`this(true, image);`
`25`	`30`	`}`
`@@ -34,6 +39,12 @@ public GameDataPack(boolean isServerRequest, BufferedImage image) {`
`34`	`39`	`this.image = image;`
`35`	`40`	`}`
`36`	`41`
	`42`	`+ public GameDataPack(boolean isServerRequest, String message, String type) {`
	`43`	`+ super(isServerRequest);`
	`44`	`+ this.message = message;`
	`45`	`+ this.type = type;`
	`46`	`+ }`
	`47`	`+`
`37`	`48`	`public static GameDataPack fromJSON(String json) throws JSONException {`
`38`	`49`	`return fromJSON(new JSONObject(json));`
`39`	`50`	`}`
`@@ -49,8 +60,13 @@ public static GameDataPack fromJSON(JSONObject jo) throws JSONException {`
`49`	`60`	`System.out.println(ioe);`
`50`	`61`	`return null;`
`51`	`62`	`}`
`52`		`- } else if(jo.has("message") && !jo.getString("message").isBlank()) {`
`53`		`- return new GameDataPack(isServerRequest, jo.getString("message"));`
	`63`	`+ }`
	`64`	`+ if(jo.has("message") && !jo.getString("message").isBlank()) {`
	`65`	`+ if(jo.has("type")) {`
	`66`	`+ return new GameDataPack(jo.getString("message"), jo.getString("type"));`
	`67`	`+ } else {`
	`68`	`+ return new GameDataPack(isServerRequest, jo.getString("message"));`
	`69`	`+ }`
`54`	`70`	`}`
`55`	`71`
`56`	`72`	`return null;`
`@@ -76,10 +92,15 @@ public JSONObject toJSON() throws JSONException {`
`76`	`92`	`}`
`77`	`93`	`}`
`78`	`94`
	`95`	`+ if(!this.type.isBlank()) {`
	`96`	`+ jo.put("type", this.type);`
	`97`	`+ }`
	`98`	`+`
`79`	`99`	`return jo;`
`80`	`100`	`}`
`81`	`101`
`82`	`102`	`public String getMessage() { return this.message; }`
	`103`	`+ public String getType() { return this.type; }`
`83`	`104`	`public BufferedImage getImage() { return this.image; }`
`84`	`105`
`85`	`106`	`}`