This commit is contained in:
@@ -15,6 +15,11 @@ public class Main extends Application {
|
||||
config.setTitle("Let's play sudoku!");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void disposeWindow() {
|
||||
stateMachine.clear();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initImGui(Configuration config) {
|
||||
super.initImGui(config);
|
||||
|
||||
@@ -12,6 +12,8 @@ public abstract class BaseView {
|
||||
|
||||
public abstract void render();
|
||||
|
||||
public void onKill() {}
|
||||
|
||||
public void closeMenu() {
|
||||
this.stateMachine.popState();
|
||||
}
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
package gui.menu;
|
||||
|
||||
import imgui.ImGui;
|
||||
|
||||
public class CreateGameMenu extends BaseView {
|
||||
|
||||
public CreateGameMenu(StateMachine stateMachine) {
|
||||
super(stateMachine);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render() {
|
||||
ImGui.text("Créer");
|
||||
renderReturnButton();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package gui.menu;
|
||||
|
||||
import imgui.ImGui;
|
||||
|
||||
public class JoinGameMenu extends BaseView {
|
||||
|
||||
public JoinGameMenu(StateMachine stateMachine) {
|
||||
super(stateMachine);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render() {
|
||||
ImGui.text("Rejoindre");
|
||||
renderReturnButton();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,15 +1,22 @@
|
||||
package gui.menu;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import imgui.ImGui;
|
||||
import imgui.ImVec2;
|
||||
import imgui.type.ImInt;
|
||||
import imgui.type.ImString;
|
||||
import network.client.Client;
|
||||
import network.server.Server;
|
||||
|
||||
public class MultiMenu extends BaseView {
|
||||
|
||||
private final ImInt port = new ImInt(25565);
|
||||
private final ImString address = new ImString("localhost");
|
||||
|
||||
private Server server;
|
||||
private Client client;
|
||||
|
||||
public MultiMenu(StateMachine stateMachine) {
|
||||
super(stateMachine);
|
||||
}
|
||||
@@ -19,7 +26,11 @@ public class MultiMenu extends BaseView {
|
||||
ImGui.beginChild("##CreateGame", new ImVec2(displaySize.x / 2.0f, displaySize.y * 8.0f / 9.0f));
|
||||
ImGui.inputInt("Port", port);
|
||||
if (ImGui.button("Créer")) {
|
||||
// TODO: create game
|
||||
try {
|
||||
this.stateMachine.pushState(new MultiPlayerView(stateMachine, (short) port.get()));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
ImGui.endChild();
|
||||
}
|
||||
@@ -30,7 +41,12 @@ public class MultiMenu extends BaseView {
|
||||
ImGui.inputText("Adresse", address);
|
||||
ImGui.inputInt("Port", port);
|
||||
if (ImGui.button("Rejoindre")) {
|
||||
// TODO: join game
|
||||
try {
|
||||
this.stateMachine.pushState(new MultiPlayerView(stateMachine, address.get(), (short) port.get()));
|
||||
} catch (IOException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
ImGui.endChild();
|
||||
}
|
||||
|
||||
58
app/src/main/java/gui/menu/MultiPlayerView.java
Normal file
58
app/src/main/java/gui/menu/MultiPlayerView.java
Normal file
@@ -0,0 +1,58 @@
|
||||
package gui.menu;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.UnknownHostException;
|
||||
|
||||
import imgui.ImGui;
|
||||
import network.client.Client;
|
||||
import network.server.Server;
|
||||
|
||||
public class MultiPlayerView extends BaseView {
|
||||
|
||||
private Client client;
|
||||
private Server server;
|
||||
|
||||
/**
|
||||
* Client
|
||||
*
|
||||
* @param stateMachine
|
||||
* @param address
|
||||
* @param port
|
||||
* @throws IOException
|
||||
* @throws UnknownHostException
|
||||
*/
|
||||
public MultiPlayerView(StateMachine stateMachine, String address, short port)
|
||||
throws UnknownHostException, IOException {
|
||||
super(stateMachine);
|
||||
this.client = new Client(address, port);
|
||||
}
|
||||
|
||||
/**
|
||||
* Server
|
||||
*
|
||||
* @param stateMachine
|
||||
* @param port
|
||||
* @throws IOException
|
||||
*/
|
||||
public MultiPlayerView(StateMachine stateMachine, short port) throws IOException {
|
||||
super(stateMachine);
|
||||
this.server = new Server(port);
|
||||
this.client = new Client("localhost", port);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onKill() {
|
||||
if (this.server != null) {
|
||||
this.server.stop();
|
||||
}
|
||||
if (this.client != null) {
|
||||
this.client.stop();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render() {
|
||||
ImGui.text("Tema le gameplay");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -15,11 +15,19 @@ public class StateMachine {
|
||||
this.menus = new Stack<>();
|
||||
}
|
||||
|
||||
public void clear() {
|
||||
for (BaseView view : menus) {
|
||||
view.onKill();
|
||||
}
|
||||
menus.clear();
|
||||
}
|
||||
|
||||
public void pushState(BaseView menu) {
|
||||
menus.add(menu);
|
||||
}
|
||||
|
||||
public void popState() {
|
||||
menus.getLast().onKill();
|
||||
menus.pop();
|
||||
}
|
||||
|
||||
|
||||
27
app/src/main/java/network/Connexion.java
Normal file
27
app/src/main/java/network/Connexion.java
Normal file
@@ -0,0 +1,27 @@
|
||||
package network;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.ObjectOutputStream;
|
||||
import java.net.Socket;
|
||||
|
||||
public abstract class Connexion implements PacketVisitor {
|
||||
|
||||
final Socket socket;
|
||||
private final ObjectOutputStream objectOutputStream;
|
||||
private final ConnexionThread connexionThread;
|
||||
|
||||
public Connexion(Socket socket) throws IOException {
|
||||
this.socket = socket;
|
||||
this.objectOutputStream = new ObjectOutputStream(this.socket.getOutputStream());
|
||||
this.connexionThread = new ConnexionThread(this);
|
||||
this.connexionThread.start();
|
||||
}
|
||||
|
||||
public void sendPacket(Packet packet) throws IOException {
|
||||
objectOutputStream.writeObject(packet);
|
||||
}
|
||||
|
||||
public void close() {
|
||||
this.connexionThread.cancel();
|
||||
}
|
||||
}
|
||||
39
app/src/main/java/network/ConnexionThread.java
Normal file
39
app/src/main/java/network/ConnexionThread.java
Normal file
@@ -0,0 +1,39 @@
|
||||
package network;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.ObjectInputStream;
|
||||
|
||||
public class ConnexionThread extends Thread{
|
||||
|
||||
private final Connexion connexion;
|
||||
private final ObjectInputStream objectInputStream;
|
||||
|
||||
public ConnexionThread(Connexion connexion) throws IOException {
|
||||
this.connexion = connexion;
|
||||
this.objectInputStream = new ObjectInputStream(this.connexion.socket.getInputStream());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
while(!interrupted()) {
|
||||
try {
|
||||
Object o = objectInputStream.readObject();
|
||||
if (o instanceof Packet packet) {
|
||||
connexion.visit(packet);
|
||||
}
|
||||
} catch (ClassNotFoundException | IOException e) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void cancel() {
|
||||
try {
|
||||
objectInputStream.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
interrupt();
|
||||
}
|
||||
|
||||
}
|
||||
11
app/src/main/java/network/Packet.java
Normal file
11
app/src/main/java/network/Packet.java
Normal file
@@ -0,0 +1,11 @@
|
||||
package network;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
public abstract class Packet implements Serializable {
|
||||
|
||||
// public abstract int getId();
|
||||
|
||||
public abstract void accept(PacketVisitor packetVisitor);
|
||||
|
||||
}
|
||||
8
app/src/main/java/network/PacketFactory.java
Normal file
8
app/src/main/java/network/PacketFactory.java
Normal file
@@ -0,0 +1,8 @@
|
||||
package network;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class PacketFactory {
|
||||
|
||||
|
||||
}
|
||||
15
app/src/main/java/network/PacketVisitor.java
Normal file
15
app/src/main/java/network/PacketVisitor.java
Normal file
@@ -0,0 +1,15 @@
|
||||
package network;
|
||||
|
||||
import network.packets.ConnexionInfoPacket;
|
||||
import network.packets.KeepAlivePacket;
|
||||
|
||||
public interface PacketVisitor {
|
||||
|
||||
default void visit(Packet packet) {
|
||||
packet.accept(this);
|
||||
}
|
||||
|
||||
void visit(ConnexionInfoPacket packet);
|
||||
void visit(KeepAlivePacket packet);
|
||||
|
||||
}
|
||||
7
app/src/main/java/network/Packets.java
Normal file
7
app/src/main/java/network/Packets.java
Normal file
@@ -0,0 +1,7 @@
|
||||
package network;
|
||||
|
||||
public enum Packets {
|
||||
|
||||
ConnectionInfo, KeepAlive
|
||||
|
||||
}
|
||||
17
app/src/main/java/network/client/Client.java
Normal file
17
app/src/main/java/network/client/Client.java
Normal file
@@ -0,0 +1,17 @@
|
||||
package network.client;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.UnknownHostException;
|
||||
|
||||
public class Client {
|
||||
private final ClientConnexion clientConnection;
|
||||
|
||||
public Client(String address, short port) throws UnknownHostException, IOException {
|
||||
this.clientConnection = new ClientConnexion(address, port);
|
||||
}
|
||||
|
||||
public void stop() {
|
||||
this.clientConnection.close();
|
||||
}
|
||||
|
||||
}
|
||||
33
app/src/main/java/network/client/ClientConnexion.java
Normal file
33
app/src/main/java/network/client/ClientConnexion.java
Normal file
@@ -0,0 +1,33 @@
|
||||
package network.client;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.Socket;
|
||||
import java.net.UnknownHostException;
|
||||
|
||||
import network.Connexion;
|
||||
import network.packets.ConnexionInfoPacket;
|
||||
import network.packets.KeepAlivePacket;
|
||||
|
||||
public class ClientConnexion extends Connexion {
|
||||
|
||||
public ClientConnexion(String address, short port) throws UnknownHostException, IOException {
|
||||
super(new Socket(address, port));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(ConnexionInfoPacket packet) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(KeepAlivePacket packet) {
|
||||
System.out.println("Coucou !!!!!!!!!!!!!!!!!!!");
|
||||
try {
|
||||
sendPacket(packet);
|
||||
} catch (IOException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
31
app/src/main/java/network/client/PacketDispatcher.java
Normal file
31
app/src/main/java/network/client/PacketDispatcher.java
Normal file
@@ -0,0 +1,31 @@
|
||||
package network.client;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import network.Packet;
|
||||
import network.PacketVisitor;
|
||||
|
||||
public class PacketDispatcher {
|
||||
|
||||
private final List<PacketVisitor> handlers;
|
||||
|
||||
public PacketDispatcher() {
|
||||
this.handlers = new ArrayList<>();
|
||||
}
|
||||
|
||||
public void dispatch(Packet packet) {
|
||||
for (PacketVisitor handler : handlers) {
|
||||
handler.visit(packet);
|
||||
}
|
||||
}
|
||||
|
||||
public void registerHandler(PacketVisitor handler) {
|
||||
handlers.add(handler);
|
||||
}
|
||||
|
||||
public void unregisterHandler(PacketVisitor handler) {
|
||||
handlers.remove(handler);
|
||||
}
|
||||
|
||||
}
|
||||
25
app/src/main/java/network/packets/ConnexionInfoPacket.java
Normal file
25
app/src/main/java/network/packets/ConnexionInfoPacket.java
Normal file
@@ -0,0 +1,25 @@
|
||||
package network.packets;
|
||||
|
||||
import network.Packet;
|
||||
import network.PacketVisitor;
|
||||
import network.Packets;
|
||||
|
||||
public class ConnexionInfoPacket extends Packet {
|
||||
|
||||
static private final long serialVersionUID = Packets.ConnectionInfo.ordinal();
|
||||
|
||||
private final int connectionId;
|
||||
|
||||
public ConnexionInfoPacket(int connectionId) {
|
||||
this.connectionId = connectionId;
|
||||
}
|
||||
|
||||
public int getConnectionId() {
|
||||
return connectionId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept(PacketVisitor packetVisitor) {
|
||||
packetVisitor.visit(this);
|
||||
}
|
||||
}
|
||||
26
app/src/main/java/network/packets/KeepAlivePacket.java
Normal file
26
app/src/main/java/network/packets/KeepAlivePacket.java
Normal file
@@ -0,0 +1,26 @@
|
||||
package network.packets;
|
||||
|
||||
import network.Packet;
|
||||
import network.PacketVisitor;
|
||||
import network.Packets;
|
||||
|
||||
public class KeepAlivePacket extends Packet {
|
||||
|
||||
static private final long serialVersionUID = Packets.KeepAlive.ordinal();
|
||||
|
||||
private final long keepAliveId;
|
||||
|
||||
public KeepAlivePacket(long keepAliveId) {
|
||||
this.keepAliveId = keepAliveId;
|
||||
}
|
||||
|
||||
public long getKeepAliveId() {
|
||||
return keepAliveId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept(PacketVisitor packetVisitor) {
|
||||
packetVisitor.visit(this);
|
||||
}
|
||||
|
||||
}
|
||||
28
app/src/main/java/network/server/Server.java
Normal file
28
app/src/main/java/network/server/Server.java
Normal file
@@ -0,0 +1,28 @@
|
||||
package network.server;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.ServerSocket;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class Server {
|
||||
|
||||
final ServerSocket serverSocket;
|
||||
final List<ServerConnexion> connexions;
|
||||
private final ServerThread thread;
|
||||
|
||||
public Server(short port) throws IOException {
|
||||
this.serverSocket = new ServerSocket(port);
|
||||
this.connexions = new ArrayList<>();
|
||||
this.thread = new ServerThread(this);
|
||||
this.thread.start();
|
||||
}
|
||||
|
||||
public void stop() {
|
||||
this.thread.cancel();
|
||||
for (ServerConnexion connexion : this.connexions) {
|
||||
connexion.close();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
35
app/src/main/java/network/server/ServerConnexion.java
Normal file
35
app/src/main/java/network/server/ServerConnexion.java
Normal file
@@ -0,0 +1,35 @@
|
||||
package network.server;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.Socket;
|
||||
import java.util.Random;
|
||||
|
||||
import network.Connexion;
|
||||
import network.packets.ConnexionInfoPacket;
|
||||
import network.packets.KeepAlivePacket;
|
||||
|
||||
public class ServerConnexion extends Connexion{
|
||||
|
||||
public ServerConnexion(Socket socket) throws IOException {
|
||||
super(socket);
|
||||
System.out.println("Bonjour le client !");
|
||||
sendKeepAlive();
|
||||
}
|
||||
|
||||
public void sendKeepAlive() throws IOException {
|
||||
Random r = new Random();
|
||||
sendPacket(new KeepAlivePacket(r.nextLong()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(ConnexionInfoPacket packet) {
|
||||
// TODO Auto-generated method stub
|
||||
throw new UnsupportedOperationException("Unimplemented method 'visit'");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(KeepAlivePacket packet) {
|
||||
System.out.println("Je l'ai reçu !");
|
||||
}
|
||||
|
||||
}
|
||||
36
app/src/main/java/network/server/ServerThread.java
Normal file
36
app/src/main/java/network/server/ServerThread.java
Normal file
@@ -0,0 +1,36 @@
|
||||
package network.server;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.Socket;
|
||||
|
||||
public class ServerThread extends Thread {
|
||||
|
||||
private final Server server;
|
||||
|
||||
public ServerThread(Server server) {
|
||||
this.server = server;
|
||||
}
|
||||
|
||||
public void cancel() {
|
||||
try {
|
||||
this.server.serverSocket.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
interrupt();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
while(!interrupted()) {
|
||||
Socket newConnection = this.server.serverSocket.accept();
|
||||
ServerConnexion serverConnection = new ServerConnexion(newConnection);
|
||||
this.server.connexions.add(serverConnection);
|
||||
}
|
||||
} catch(IOException e) {
|
||||
// e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user