network

bhrdbn · bhrdbn · commit 0afbf5e81f43 · 2021-07-21T23:47:42.000+04:30
diff --git a/src/main/java/clientcontroller/Controller.java b/src/main/java/clientcontroller/Controller.java
@@ -268,7 +268,7 @@ public String showAll() {
 
     public boolean admin() {
         try {
-            dataOutputStream.writeUTF("admin " + token);
+            dataOutputStream.writeUTF("admin enter " + token);
             dataOutputStream.flush();
             String result = dataInputStream.readUTF();
             return result.equals("true");
diff --git a/src/main/java/clientview/Admin.java b/src/main/java/clientview/Admin.java
@@ -1,9 +1,7 @@
 package clientview;
 
 import clientcontroller.Controller;
-import model.CheatSheet;
 
-import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -24,12 +22,12 @@ public static Admin getInstance() {
     public void run()  {
         System.out.println("welcome abp");
         while (true) {
-            String input = Main.scanner.nextLine();
-            Matcher matcher1 = getCommand(input, "^set ([a-zA-Z\\s]+) forbidden$");
-            Matcher matcher2 = getCommand(input, "^set ([a-zA-Z\\s]+) allowed$");
-            Matcher matcher3 = getCommand(input, "exit");
-            Matcher matcher4 = getCommand(input, "^increase ([a-zA-Z\\s]+)$");
-            Matcher matcher5 = getCommand(input, "^decrease ([a-zA-Z\\s]+)$");
+            String input = MainClient.scanner.nextLine();
+            Matcher matcher1 = getCommand(input, "^set ([a-zA-Z]+) forbidden$");
+            Matcher matcher2 = getCommand(input, "^set ([a-zA-Z]+) allowed$");
+            Matcher matcher3 = getCommand(input, "^exit");
+            Matcher matcher4 = getCommand(input, "^increase ([a-zA-Z]+)$");
+            Matcher matcher5 = getCommand(input, "^decrease ([a-zA-Z]+)$");
             if(matcher1.find()){
                 System.out.println(controller.setForbidden(matcher1.group(1)));
             }
diff --git a/src/main/java/clientview/DeckView.java b/src/main/java/clientview/DeckView.java
@@ -26,7 +26,7 @@ public static clientview.DeckView getInstance()
     public void run() {
         System.out.println("welcome to deck menu");
         while (true) {
-            String input= Main.scanner.nextLine();
+            String input= MainClient.scanner.nextLine();
             Matcher matcher = getCommand(input, "deck create (\\w+)");
             Matcher matcher1 = getCommand(input, "deck delete (\\w+)");
             Matcher matcher2 = getCommand(input, "^deck set-activate (\\w+)");
diff --git a/src/main/java/clientview/Duel.java b/src/main/java/clientview/Duel.java
@@ -4,7 +4,6 @@
 import java.util.regex.Pattern;
 
 import clientcontroller.*;
-import servercontroller.GlobalVariable;
 
 public class Duel {
     Controller controller = Controller.getInstance();
@@ -27,7 +26,7 @@ public static Duel getInstance() {
     public void run() {
         System.out.println("welcome to duel menu");
         while (true) {
-            String input = Main.scanner.nextLine();
+            String input = MainClient.scanner.nextLine();
             Matcher matcherPlayer0 = getCommand(input, "duel new second-player (\\w+) rounds (\\d)");
             Matcher matcherPlayer1 = getCommand(input, "duel new rounds (\\d) second-player (\\w+)");
             Matcher matcherSelect4 = getCommand(input, "select spell (\\d)");
diff --git a/src/main/java/clientview/GraveView.java b/src/main/java/clientview/GraveView.java
@@ -14,7 +14,7 @@ public static GraveView getInstance() {
     }
     public void run(){
         while(true){
-            String input=Main.scanner.nextLine();
+            String input= MainClient.scanner.nextLine();
             if(input.equals("back")){
                 MenuHandler.runBack(Menu.GRAVEYARD);
                 break;
diff --git a/src/main/java/clientview/Lobby.java b/src/main/java/clientview/Lobby.java
@@ -1,7 +1,6 @@
 package clientview;
 
 import clientcontroller.Controller;
-import clientview.MainView;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
@@ -23,7 +22,7 @@ public static Lobby getInstance()
     public void run(){
         System.out.println("welcome to main menu");
         while(true){
-            String input=Main.scanner.nextLine();
+            String input= MainClient.scanner.nextLine();
             Matcher matcher = getCommand(input, "^request game round (\\d)$");
             //Matcher matcher1 = getCommand(input, "^request game round (\\d) username");
             Matcher matcher2 = getCommand(input, "exit");
@@ -38,7 +37,7 @@ public void requestView(String round){
         LocalDateTime l=LocalDateTime.now();
         System.out.println("you cancel your request by typing 'cancel request' or wait to connect ...");
         while(ChronoUnit.SECONDS.between(l,LocalDateTime.now())<6) {
-             s = Main.scanner.nextLine();
+             s = MainClient.scanner.nextLine();
             if(s!=null&&s.startsWith("cancel")) {
                 System.out.println("you canceled");
                 return;
diff --git a/src/main/java/clientview/Login.java b/src/main/java/clientview/Login.java
@@ -22,7 +22,7 @@ public static Login getInstance() {
     public void run() {
         System.out.println("welcome to login menu");
         while (true) {
-            String input=Main.scanner.nextLine();
+            String input= MainClient.scanner.nextLine();
             Matcher matcher1 = getCommand(input, "user create username (\\w+) nickname (\\w+) password (\\w+)");
             Matcher matcher1_1 = getCommand(input, "user create nickname (\\w+) username (\\w+) password (\\w+)");
             Matcher matcher1_2 = getCommand(input, "user create username (\\w+) password (\\w+) nickname (\\w+)");
@@ -78,13 +78,13 @@ else if(matcher6.find())
     public void loginUser(Matcher matcher, int flag) {
         if (flag == 0) {
             System.out.println(controller.loginUser(matcher.group(1), matcher.group(2)));
-            if(controller.loginUser(matcher.group(1), matcher.group(2)).equals("user logged in successfully!")){
+            if(controller.loginUser(matcher.group(1), matcher.group(2)).startsWith("user logged in")){
                 MenuHandler.runNextLogin();
             }
             b = 8;
         } else {
             System.out.println(Controller.getInstance().loginUser(matcher.group(2), matcher.group(1)));
-            if(controller.loginUser(matcher.group(2), matcher.group(1)).equals("user logged in successfully!")){
+            if(controller.loginUser(matcher.group(2), matcher.group(1)).equals("user logged in!")){
                 MenuHandler.runNextLogin();
             }
         }
diff --git a/src/main/java/clientview/MainClient.java b/src/main/java/clientview/MainClient.java
@@ -10,7 +10,7 @@
 import java.util.Scanner;
 
 
-public class Main {
+public class MainClient {
 
     public static Scanner scanner=new Scanner(System.in);
 
diff --git a/src/main/java/clientview/MainView.java b/src/main/java/clientview/MainView.java
@@ -3,7 +3,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import  clientcontroller.*;
-import model.*;
+
 public class MainView {
     private static MainView mainView=null;
     private MainView(){
@@ -21,7 +21,7 @@ public static MainView getInstance()
     public void run(){
         System.out.println("welcome to main menu");
         while(true){
-            String input=Main.scanner.nextLine();
+            String input= MainClient.scanner.nextLine();
             Matcher matcher = getCommand(input, "scoreboard show");
             Matcher matcher1 = getCommand(input, "user logout");
             Matcher matcher2 = getCommand(input, "exit");
diff --git a/src/main/java/clientview/Profile.java b/src/main/java/clientview/Profile.java
@@ -23,7 +23,7 @@ public static Profile getInstance() {
     public void run() {
         System.out.println("welcome to profile menu");
         while (true) {
-            String input = Main.scanner.nextLine();
+            String input = MainClient.scanner.nextLine();
             Matcher matcher1 = getCommand(input, "profile change nickname (\\w+)");
             Matcher matcher2 = getCommand(input, "profile change password current (\\w+) new (\\w+)|profile change current password(\\w+) new(\\w+)|profile change current(\\w+) new(\\w+) password");
             Matcher matcher2_1 = getCommand(input, "profile change password new (\\w+) current (\\w+)|profile change new(\\w+) password current(\\w+)|profile change new(\\w+) current(\\w+) password");
diff --git a/src/main/java/clientview/Shop.java b/src/main/java/clientview/Shop.java
@@ -4,10 +4,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import java.util.regex.*;
-
 import clientcontroller.*;
-import model.Card;
 import model.CheatSheet;
 
 public class Shop {
@@ -30,7 +27,7 @@ public static Shop getInstance() {
     public void run() throws IOException {
         System.out.println("welcome to shop menu");
         while (true) {
-            String input = Main.scanner.nextLine();
+            String input = MainClient.scanner.nextLine();
             Matcher matcher1 = getCommand(input, "^shop buy ([a-zA-Z\\s]+)$");
             Matcher matcher2 = getCommand(input, "shop show --all");
             Matcher matcher3 = getCommand(input, "exit");
@@ -70,8 +67,9 @@ public Matcher getCommand(String input, String regex) {
         return matcher;
     }
     public void admin(){
-        if(shopController.admin()) MenuHandler.admin();
-        else System.out.println("you don't have access");
+
+       if(shopController.admin()) MenuHandler.admin();
+       else System.out.println("you don't have access");
     }
 
 }
diff --git a/src/main/java/model/ActionMonster.java b/src/main/java/model/ActionMonster.java
@@ -1,10 +1,9 @@
 package model;
 
-import clientview.Main;
+import clientview.MainClient;
 import servercontroller.GlobalVariable;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class ActionMonster {
     public void setAction(int cardControllerNumber,MonsterCard monsterCard, String token) {
@@ -99,15 +98,15 @@ public void increaseAttackAll(MonsterCard monsterCard, String token) //1
     public void trick(String token) //12
     {
         System.out.println("please enter the (index)monster you want from hand to drop");
-        int num= Main.scanner.nextInt();
+        int num= MainClient.scanner.nextInt();
         GlobalVariable.getBoards().get(token).getPlayBoardByTurn().getHand().remove(num);
         System.out.println("succesfully");
     }
 
     public void terratiger(String token) //13
     {
         System.out.println("please enter the (index)monster you want from hand to put in defence");
-        int num=Main.scanner.nextInt();
+        int num= MainClient.scanner.nextInt();
         GlobalVariable.getBoards().get(token).getPlayBoardByTurn().setSelectedMonsterCard((MonsterCard) GlobalVariable.getBoards().get(token).getPlayBoardByTurn().getHand().get(num));
         System.out.println("succesfully");
     }
diff --git a/src/main/java/model/Board.java b/src/main/java/model/Board.java
@@ -20,9 +20,9 @@ public Board(PlayBoard playBoardPlayer, PlayBoard playBoardOpponent) {
     @Override
     public String toString() {
         String board = "";
-        board += getOpponentPlayBoardByTurn().rotateToString();
+        board += playBoard2.rotateToString();
         board += "\n----------------------\n";
-        board += getPlayBoardByTurn().toString();
+        board += playBoard1.toString();
         board += "\n\n----------------------\n\n";
         return board;
     }
diff --git a/src/main/java/model/Card.java b/src/main/java/model/Card.java
@@ -11,7 +11,7 @@ public class Card {
     protected long price;
     private Location location;
     protected boolean isForbidden=false;
-    protected int countInShop=10;
+    protected int countInShop;
     public void setName(String name) {
         this.name = name;
     }
@@ -67,9 +67,13 @@ public Card(String name, int number, String type, String cardDescription, boolea
      //   this.commands = new ArrayList<>();
         this.side = true;
         this.price = price;
+        countInShop=10;
     }
 
-  // public void run(PlayBoard playBoard,Card card){
+    public void setCountInShop(int countInShop) {
+        this.countInShop = countInShop;
+    }
+    // public void run(PlayBoard playBoard,Card card){
   //      for (Command command:commands)
   //          command.doAction(GlobalVariable.getBoard());
   // }
diff --git a/src/main/java/model/GraveYard.java b/src/main/java/model/GraveYard.java
@@ -1,6 +1,6 @@
 package model;
 
-import clientview.Main;
+import clientview.MainClient;
 
 import java.util.ArrayList;
 
@@ -51,7 +51,7 @@ public void showMenu(){
 
     public void inputCommandLine(){
         System.out.println("Here is GraveYard");
-        String inputLine = Main.scanner.nextLine();
+        String inputLine = MainClient.scanner.nextLine();
         inputLine = inputLine.trim();
         inputLine = inputLine.toLowerCase();
         String[] input = inputLine.split("[ ]+");
diff --git a/src/main/java/model/MonsterCard.java b/src/main/java/model/MonsterCard.java
@@ -81,6 +81,7 @@ public MonsterCard(String name, int number, String type, int action,String cardD
         this.action=action;
 
 
+
     }
     public MonsterCard(MonsterCard card){
         super(card.name,card.number,card.cardType,card.description,card.side,card.price);
diff --git a/src/main/java/network/ChatMessage.java b/src/main/java/network/ChatMessage.java
@@ -1,3 +1,4 @@
+package network;
 
 import java.io.*;
 /*
diff --git a/src/main/java/network/Client.java b/src/main/java/network/Client.java
@@ -1,3 +1,4 @@
+package network;
 
 import java.net.*;
 import java.io.*;
diff --git a/src/main/java/network/Server.java b/src/main/java/network/Server.java
@@ -1,3 +1,4 @@
+package network;
 
 import java.io.*;
 import java.net.*;
diff --git a/src/main/java/sample/Controller.java b/src/main/java/sample/Controller.java
@@ -1,21 +1,21 @@
-package sample;
-
-import javafx.scene.input.MouseEvent;
-
-public class Controller {
-
-    public void liveGameShow(MouseEvent mouseEvent) {
-    }
-
-    public void Rating(MouseEvent mouseEvent) {
-    }
-
-    public void TopGames(MouseEvent mouseEvent) {
-    }
-
-    public void rewatchPastGames(MouseEvent mouseEvent) {
-    }
-
-    public void Back(MouseEvent mouseEvent) {
-    }
-}
+//package sample;
+//
+//import javafx.scene.input.MouseEvent;
+//
+//public class Controller {
+//
+//    public void liveGameShow(MouseEvent mouseEvent) {
+//    }
+//
+//    public void Rating(MouseEvent mouseEvent) {
+//    }
+//
+//    public void TopGames(MouseEvent mouseEvent) {
+//    }
+//
+//    public void rewatchPastGames(MouseEvent mouseEvent) {
+//    }
+//
+//    public void Back(MouseEvent mouseEvent) {
+//    }
+//}
diff --git a/src/main/java/sample/Main.java b/src/main/java/sample/Main.java
@@ -1,23 +1,23 @@
-package sample;
-
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-
-public class Main extends Application {
-
-    @Override
-    public void start(Stage primaryStage) throws Exception{
-        Parent root = FXMLLoader.load(getClass().getResource("sample.fxml"));
-        primaryStage.setTitle("Hello World");
-        primaryStage.setScene(new Scene(root, 700, 900));
-        primaryStage.show();
-    }
-
-
-    public static void main(String[] args) {
-        launch(args);
-    }
-}
+//package sample;
+//
+//import javafx.application.Application;
+//import javafx.fxml.FXMLLoader;
+//import javafx.scene.Parent;
+//import javafx.scene.Scene;
+//import javafx.stage.Stage;
+//
+//public class Main extends Application {
+//
+//    @Override
+//    public void start(Stage primaryStage) throws Exception{
+//        Parent root = FXMLLoader.load(getClass().getResource("sample.fxml"));
+//        primaryStage.setTitle("Hello World");
+//        primaryStage.setScene(new Scene(root, 700, 900));
+//        primaryStage.show();
+//    }
+//
+//
+//    public static void main(String[] args) {
+//        launch(args);
+//    }
+//}
diff --git a/src/main/java/servercontroller/Controller.java b/src/main/java/servercontroller/Controller.java
diff --git a/src/main/java/servercontroller/GameController.java b/src/main/java/servercontroller/GameController.java
diff --git a/src/main/java/serverview/Main.java b/src/main/java/serverview/Main.java

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public static GraveView getInstance() {`
`14`	`14`	`}`
`15`	`15`	`public void run(){`
`16`	`16`	`while(true){`
`17`		`- String input=Main.scanner.nextLine();`
	`17`	`+ String input= MainClient.scanner.nextLine();`
`18`	`18`	`if(input.equals("back")){`
`19`	`19`	`MenuHandler.runBack(Menu.GRAVEYARD);`
`20`	`20`	`break;`