create package org.polytech.ryuk

app/build.gradle

@@ -33,7 +33,7 @@ dependencies {
 
 application {
     // Define the main class for the application.
-    mainClass = 'gui.Main'
+    mainClass = 'org.polytech.ryuk.gui.Main'
 }
 
 // Add libraries into the final jar

app/src/main/java/network/protocol/PacketVisitor.java

@@ -1,31 +0,0 @@
-package network.protocol;
-
-import network.protocol.packets.ChangeCellPacket;
-import network.protocol.packets.ConnexionInfoPacket;
-import network.protocol.packets.DisconnectPacket;
-import network.protocol.packets.EndGamePacket;
-import network.protocol.packets.KeepAlivePacket;
-import network.protocol.packets.LoginPacket;
-import network.protocol.packets.PlayerJoinPacket;
-import network.protocol.packets.PlayerLeavePacket;
-import network.protocol.packets.StartGamePacket;
-import network.protocol.packets.UpdatePlayerScorePacket;
-
-public interface PacketVisitor {
-
-	default void visit(Packet packet) {
-		packet.accept(this);
-	}
-	
-	void visitPacket(ConnexionInfoPacket packet);
-	void visitPacket(DisconnectPacket packet);
-	void visitPacket(KeepAlivePacket packet);
-	void visitPacket(LoginPacket packet);
-	void visitPacket(PlayerJoinPacket packet);
-	void visitPacket(PlayerLeavePacket packet);
-	void visitPacket(StartGamePacket packet);
-	void visitPacket(EndGamePacket packet);
-	void visitPacket(UpdatePlayerScorePacket packet);
-	void visitPacket(ChangeCellPacket packet);
-	
-}

app/src/main/java/org/polytech/ryuk/common/ConsumerSignal.java

@@ -1,4 +1,4 @@
-package common;
+package org.polytech.ryuk.common;
 
 import java.util.HashSet;
 import java.util.Set;

app/src/main/java/org/polytech/ryuk/common/Signal.java

@@ -1,4 +1,4 @@
-package common;
+package org.polytech.ryuk.common;
 
 import java.util.HashSet;
 import java.util.Set;

app/src/main/java/org/polytech/ryuk/game/Game.java

@@ -1,4 +1,4 @@
-package game;
+package org.polytech.ryuk.game;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
 public class Game {
 

app/src/main/java/org/polytech/ryuk/game/Player.java

@@ -1,4 +1,4 @@
-package game;
+package org.polytech.ryuk.game;
 
 import java.io.Serializable;
 

app/src/main/java/org/polytech/ryuk/gui/AnimatedBackground.java

@@ -1,4 +1,4 @@
-package gui;
+package org.polytech.ryuk.gui;
 
 import imgui.ImGui;
 import imgui.ImVec2;

app/src/main/java/org/polytech/ryuk/gui/ColorGenerator.java

@@ -1,4 +1,4 @@
-package gui;
+package org.polytech.ryuk.gui;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/polytech/ryuk/gui/Fonts.java

@@ -1,4 +1,4 @@
-package gui;
+package org.polytech.ryuk.gui;
 
 import imgui.ImFont;
 import imgui.ImFontConfig;

app/src/main/java/org/polytech/ryuk/gui/Images.java

@@ -1,4 +1,4 @@
-package gui;
+package org.polytech.ryuk.gui;
 
 import java.nio.ByteBuffer;
 

app/src/main/java/org/polytech/ryuk/gui/Main.java

@@ -1,8 +1,8 @@
-package gui;
+package org.polytech.ryuk.gui;
+
+import org.polytech.ryuk.gui.menu.MainMenu;
+import org.polytech.ryuk.gui.menu.StateMachine;
 
-import gui.menu.MainMenu;
-import gui.menu.StateMachine;
-import imgui.ImGui;
 import imgui.app.Application;
 import imgui.app.Configuration;
 

app/src/main/java/org/polytech/ryuk/gui/Options.java

@@ -1,4 +1,4 @@
-package gui;
+package org.polytech.ryuk.gui;
 
 public class Options {
 

app/src/main/java/org/polytech/ryuk/gui/RenderableMultidoku.java

@@ -1,15 +1,15 @@
-package gui;
+package org.polytech.ryuk.gui;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import sudoku.structure.Block;
-import sudoku.structure.Cell;
-import sudoku.structure.Coordinate;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.Block;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.Coordinate;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class RenderableMultidoku {
 

app/src/main/java/org/polytech/ryuk/gui/SudokuType.java

@@ -1,10 +1,10 @@
-package gui;
+package org.polytech.ryuk.gui;
 
 import java.util.List;
 
-import sudoku.constraint.Constraint;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.SudokuFactory;;
+import org.polytech.ryuk.sudoku.constraint.Constraint;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.SudokuFactory;;
 
 public enum SudokuType {
 

app/src/main/java/org/polytech/ryuk/gui/Symbols.java

@@ -1,4 +1,4 @@
-package gui;
+package org.polytech.ryuk.gui;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/polytech/ryuk/gui/menu/BaseView.java

@@ -1,4 +1,4 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
 
 import imgui.ImGui;
 

app/src/main/java/org/polytech/ryuk/gui/menu/ConnexionStatusView.java

@@ -1,11 +1,12 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
 
+import org.polytech.ryuk.network.client.Client;
+import org.polytech.ryuk.network.server.Server;
+
 import imgui.ImGui;
-import network.client.Client;
-import network.server.Server;
 
 public class ConnexionStatusView extends BaseView {
 

app/src/main/java/org/polytech/ryuk/gui/menu/EndGameView.java

@@ -1,11 +1,12 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
+
+import org.polytech.ryuk.game.Player;
+import org.polytech.ryuk.gui.ColorGenerator;
+import org.polytech.ryuk.gui.widget.SudokuRenderer;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
-import game.Player;
-import gui.ColorGenerator;
-import gui.widget.SudokuRenderer;
 import imgui.ImGui;
 import imgui.ImVec4;
-import sudoku.structure.MultiDoku;
 
 public class EndGameView extends BaseView {
 

app/src/main/java/org/polytech/ryuk/gui/menu/MainMenu.java

@@ -1,4 +1,4 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
 
 import imgui.ImGui;
 import imgui.ImVec2;

app/src/main/java/org/polytech/ryuk/gui/menu/MultiMenu.java

@@ -1,4 +1,4 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
 
 import java.io.IOException;
 

app/src/main/java/org/polytech/ryuk/gui/menu/MultiPlayerDokuView.java

@@ -1,17 +1,18 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
+
+import org.polytech.ryuk.game.Player;
+import org.polytech.ryuk.gui.widget.LeaderboardRenderer;
+import org.polytech.ryuk.gui.widget.MultiPlayerCompleteProgress;
+import org.polytech.ryuk.gui.widget.SudokuRenderer;
+import org.polytech.ryuk.gui.widget.TimerRenderer;
+import org.polytech.ryuk.network.client.Client;
+import org.polytech.ryuk.network.server.Server;
+import org.polytech.ryuk.sudoku.solver.BacktrackingSolver;
+import org.polytech.ryuk.sudoku.solver.Solver;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
-import game.Player;
-import gui.widget.LeaderboardRenderer;
-import gui.widget.MultiPlayerCompleteProgress;
-import gui.widget.SudokuRenderer;
-import gui.widget.TimerRenderer;
 import imgui.ImGui;
-import network.client.Client;
-import network.server.Server;
-import sudoku.solver.BacktrackingSolver;
-import sudoku.solver.Solver;
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
 
 public class MultiPlayerDokuView extends BaseView {
 

app/src/main/java/org/polytech/ryuk/gui/menu/MultiPlayerView.java

@@ -1,12 +1,13 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
+
+import org.polytech.ryuk.game.Player;
+import org.polytech.ryuk.gui.widget.SudokuSelector;
+import org.polytech.ryuk.network.client.Client;
+import org.polytech.ryuk.network.server.Server;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
-import game.Player;
-import gui.widget.SudokuSelector;
 import imgui.ImGui;
 import imgui.type.ImInt;
-import network.client.Client;
-import network.server.Server;
-import sudoku.structure.MultiDoku;
 
 public class MultiPlayerView extends BaseView {
 

app/src/main/java/org/polytech/ryuk/gui/menu/OptionsMenu.java

@@ -1,7 +1,8 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
+
+import org.polytech.ryuk.gui.Options;
+import org.polytech.ryuk.gui.Symbols;
 
-import gui.Options;
-import gui.Symbols;
 import imgui.ImGui;
 import imgui.type.ImInt;
 

app/src/main/java/org/polytech/ryuk/gui/menu/SoloMenu.java

@@ -1,8 +1,9 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
+
+import org.polytech.ryuk.gui.widget.SudokuSelector;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
-import gui.widget.SudokuSelector;
 import imgui.ImGui;
-import sudoku.structure.MultiDoku;
 
 public class SoloMenu extends BaseView {
 

app/src/main/java/org/polytech/ryuk/gui/menu/StateMachine.java

@@ -1,8 +1,9 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
 
 import java.util.Stack;
 
-import gui.AnimatedBackground;
+import org.polytech.ryuk.gui.AnimatedBackground;
+
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.flag.ImGuiKey;

app/src/main/java/org/polytech/ryuk/gui/menu/SudokuView.java

@@ -1,16 +1,17 @@
-package gui.menu;
+package org.polytech.ryuk.gui.menu;
 
 import java.util.concurrent.CancellationException;
 
-import gui.widget.SudokuRenderer;
+import org.polytech.ryuk.gui.widget.SudokuRenderer;
+import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import org.polytech.ryuk.sudoku.solver.BacktrackingSolver;
+import org.polytech.ryuk.sudoku.solver.HumanSolver;
+import org.polytech.ryuk.sudoku.solver.MixedSolver;
+import org.polytech.ryuk.sudoku.solver.Solver;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+
 import imgui.ImGui;
 import imgui.ImGuiStyle;
-import sudoku.io.SudokuSerializer;
-import sudoku.solver.BacktrackingSolver;
-import sudoku.solver.HumanSolver;
-import sudoku.solver.MixedSolver;
-import sudoku.solver.Solver;
-import sudoku.structure.MultiDoku;
 
 public class SudokuView extends BaseView {
 

app/src/main/java/org/polytech/ryuk/gui/widget/LeaderboardRenderer.java

@@ -1,7 +1,8 @@
-package gui.widget;
+package org.polytech.ryuk.gui.widget;
+
+import org.polytech.ryuk.game.Game;
+import org.polytech.ryuk.game.Player;
 
-import game.Game;
-import game.Player;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.ImVec4;

app/src/main/java/org/polytech/ryuk/gui/widget/MultiPlayerCompleteProgress.java

@@ -1,7 +1,8 @@
-package gui.widget;
+package org.polytech.ryuk.gui.widget;
+
+import org.polytech.ryuk.game.Game;
+import org.polytech.ryuk.game.Player;
 
-import game.Game;
-import game.Player;
 import imgui.ImGui;
 import imgui.ImVec2;
 

app/src/main/java/org/polytech/ryuk/gui/widget/SmoothProgressBar.java

@@ -1,4 +1,4 @@
-package gui.widget;
+package org.polytech.ryuk.gui.widget;
 
 import imgui.ImGui;
 import imgui.ImVec2;

app/src/main/java/org/polytech/ryuk/gui/widget/SudokuRenderer.java

@@ -1,4 +1,4 @@
-package gui.widget;
+package org.polytech.ryuk.gui.widget;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -6,24 +6,25 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import common.ConsumerSignal;
-import common.Signal;
-import gui.ColorGenerator;
-import gui.Fonts;
-import gui.Options;
-import gui.RenderableMultidoku;
-import gui.Symbols;
-import gui.ColorGenerator.Color;
+import org.polytech.ryuk.common.ConsumerSignal;
+import org.polytech.ryuk.common.Signal;
+import org.polytech.ryuk.gui.ColorGenerator;
+import org.polytech.ryuk.gui.ColorGenerator.Color;
+import org.polytech.ryuk.gui.Fonts;
+import org.polytech.ryuk.gui.Options;
+import org.polytech.ryuk.gui.RenderableMultidoku;
+import org.polytech.ryuk.gui.Symbols;
+import org.polytech.ryuk.sudoku.constraint.Constraint;
+import org.polytech.ryuk.sudoku.structure.Block;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
+
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.ImVec4;
 import imgui.flag.ImGuiCol;
 import imgui.flag.ImGuiStyleVar;
-import sudoku.constraint.Constraint;
-import sudoku.structure.Block;
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
 
 public class SudokuRenderer {
 

app/src/main/java/org/polytech/ryuk/gui/widget/SudokuSelector.java

@@ -1,19 +1,20 @@
-package gui.widget;
+package org.polytech.ryuk.gui.widget;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import common.ConsumerSignal;
-import gui.SudokuType;
+import org.polytech.ryuk.common.ConsumerSignal;
+import org.polytech.ryuk.gui.SudokuType;
+import org.polytech.ryuk.sudoku.constraint.Constraint;
+import org.polytech.ryuk.sudoku.structure.Difficulty;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.SudokuFactory;
+
 import imgui.ImGui;
 import imgui.extension.imguifiledialog.ImGuiFileDialog;
 import imgui.extension.imguifiledialog.flag.ImGuiFileDialogFlags;
 import imgui.type.ImBoolean;
 import imgui.type.ImInt;
-import sudoku.constraint.Constraint;
-import sudoku.structure.Difficulty;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.SudokuFactory;
 
 public class SudokuSelector {
 

app/src/main/java/org/polytech/ryuk/gui/widget/TimerRenderer.java

@@ -1,4 +1,4 @@
-package gui.widget;
+package org.polytech.ryuk.gui.widget;
 
 import java.time.Instant;
 

app/src/main/java/org/polytech/ryuk/network/Connexion.java

@@ -1,11 +1,11 @@
-package network;
+package org.polytech.ryuk.network;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.net.Socket;
 
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
 
 public abstract class Connexion implements PacketVisitor {
 	

app/src/main/java/org/polytech/ryuk/network/ConnexionThread.java

@@ -1,9 +1,9 @@
-package network;
+package org.polytech.ryuk.network;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 
-import network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.Packet;
 
 public class ConnexionThread extends Thread {
 

app/src/main/java/org/polytech/ryuk/network/client/Client.java

@@ -1,18 +1,18 @@
-package network.client;
+package org.polytech.ryuk.network.client;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
 import java.util.Random;
 
-import common.ConsumerSignal;
-import common.Signal;
-import game.Game;
-import game.Player;
-import network.protocol.packets.ChangeCellPacket;
-import network.protocol.packets.LoginPacket;
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.common.ConsumerSignal;
+import org.polytech.ryuk.common.Signal;
+import org.polytech.ryuk.game.Game;
+import org.polytech.ryuk.game.Player;
+import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket;
+import org.polytech.ryuk.network.protocol.packets.LoginPacket;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class Client {
 	private final ClientConnexion clientConnection;

app/src/main/java/org/polytech/ryuk/network/client/ClientConnexion.java

@@ -1,22 +1,22 @@
-package network.client;
+package org.polytech.ryuk.network.client;
 
 import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import game.Player;
-import network.Connexion;
-import network.protocol.packets.ChangeCellPacket;
-import network.protocol.packets.ConnexionInfoPacket;
-import network.protocol.packets.DisconnectPacket;
-import network.protocol.packets.EndGamePacket;
-import network.protocol.packets.KeepAlivePacket;
-import network.protocol.packets.LoginPacket;
-import network.protocol.packets.PlayerJoinPacket;
-import network.protocol.packets.PlayerLeavePacket;
-import network.protocol.packets.StartGamePacket;
-import network.protocol.packets.UpdatePlayerScorePacket;
-import sudoku.io.SudokuSerializer;
+import org.polytech.ryuk.game.Player;
+import org.polytech.ryuk.network.Connexion;
+import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket;
+import org.polytech.ryuk.network.protocol.packets.ConnexionInfoPacket;
+import org.polytech.ryuk.network.protocol.packets.DisconnectPacket;
+import org.polytech.ryuk.network.protocol.packets.EndGamePacket;
+import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket;
+import org.polytech.ryuk.network.protocol.packets.LoginPacket;
+import org.polytech.ryuk.network.protocol.packets.PlayerJoinPacket;
+import org.polytech.ryuk.network.protocol.packets.PlayerLeavePacket;
+import org.polytech.ryuk.network.protocol.packets.StartGamePacket;
+import org.polytech.ryuk.network.protocol.packets.UpdatePlayerScorePacket;
+import org.polytech.ryuk.sudoku.io.SudokuSerializer;
 
 public class ClientConnexion extends Connexion {
 

app/src/main/java/org/polytech/ryuk/network/protocol/Packet.java

@@ -1,4 +1,4 @@
-package network.protocol;
+package org.polytech.ryuk.network.protocol;
 
 import java.io.Serializable;
 

app/src/main/java/org/polytech/ryuk/network/protocol/PacketVisitor.java

@@ -0,0 +1,31 @@
+package org.polytech.ryuk.network.protocol;
+
+import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket;
+import org.polytech.ryuk.network.protocol.packets.ConnexionInfoPacket;
+import org.polytech.ryuk.network.protocol.packets.DisconnectPacket;
+import org.polytech.ryuk.network.protocol.packets.EndGamePacket;
+import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket;
+import org.polytech.ryuk.network.protocol.packets.LoginPacket;
+import org.polytech.ryuk.network.protocol.packets.PlayerJoinPacket;
+import org.polytech.ryuk.network.protocol.packets.PlayerLeavePacket;
+import org.polytech.ryuk.network.protocol.packets.StartGamePacket;
+import org.polytech.ryuk.network.protocol.packets.UpdatePlayerScorePacket;
+
+public interface PacketVisitor {
+
+	default void visit(Packet packet) {
+		packet.accept(this);
+	}
+	
+	void visitPacket(ConnexionInfoPacket packet);
+	void visitPacket(DisconnectPacket packet);
+	void visitPacket(KeepAlivePacket packet);
+	void visitPacket(LoginPacket packet);
+	void visitPacket(PlayerJoinPacket packet);
+	void visitPacket(PlayerLeavePacket packet);
+	void visitPacket(StartGamePacket packet);
+	void visitPacket(EndGamePacket packet);
+	void visitPacket(UpdatePlayerScorePacket packet);
+	void visitPacket(ChangeCellPacket packet);
+	
+}

app/src/main/java/org/polytech/ryuk/network/protocol/Packets.java

@@ -1,4 +1,4 @@
-package network.protocol;
+package org.polytech.ryuk.network.protocol;
 
 public enum Packets {
 

app/src/main/java/org/polytech/ryuk/network/protocol/packets/ChangeCellPacket.java

@@ -1,8 +1,8 @@
-package network.protocol.packets;
+package org.polytech.ryuk.network.protocol.packets;
 
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
-import network.protocol.Packets;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packets;
 
 public class ChangeCellPacket extends Packet {
 

app/src/main/java/org/polytech/ryuk/network/protocol/packets/ConnexionInfoPacket.java

@@ -1,8 +1,8 @@
-package network.protocol.packets;
+package org.polytech.ryuk.network.protocol.packets;
 
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
-import network.protocol.Packets;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packets;
 
 public class ConnexionInfoPacket extends Packet {
 

app/src/main/java/org/polytech/ryuk/network/protocol/packets/DisconnectPacket.java

@@ -1,8 +1,8 @@
-package network.protocol.packets;
+package org.polytech.ryuk.network.protocol.packets;
 
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
-import network.protocol.Packets;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packets;
 
 public class DisconnectPacket extends Packet {
 

app/src/main/java/org/polytech/ryuk/network/protocol/packets/EndGamePacket.java

@@ -1,8 +1,8 @@
-package network.protocol.packets;
+package org.polytech.ryuk.network.protocol.packets;
 
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
-import network.protocol.Packets;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packets;
 
 public class EndGamePacket extends Packet {
 

app/src/main/java/org/polytech/ryuk/network/protocol/packets/KeepAlivePacket.java

@@ -1,8 +1,8 @@
-package network.protocol.packets;
+package org.polytech.ryuk.network.protocol.packets;
 
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
-import network.protocol.Packets;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packets;
 
 public class KeepAlivePacket extends Packet {
 

app/src/main/java/org/polytech/ryuk/network/protocol/packets/LoginPacket.java

@@ -1,8 +1,8 @@
-package network.protocol.packets;
+package org.polytech.ryuk.network.protocol.packets;
 
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
-import network.protocol.Packets;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packets;
 
 public class LoginPacket extends Packet {
 

app/src/main/java/org/polytech/ryuk/network/protocol/packets/PlayerJoinPacket.java

@@ -1,9 +1,9 @@
-package network.protocol.packets;
+package org.polytech.ryuk.network.protocol.packets;
 
-import game.Player;
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
-import network.protocol.Packets;
+import org.polytech.ryuk.game.Player;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packets;
 
 public class PlayerJoinPacket extends Packet{
 

app/src/main/java/org/polytech/ryuk/network/protocol/packets/PlayerLeavePacket.java

@@ -1,8 +1,8 @@
-package network.protocol.packets;
+package org.polytech.ryuk.network.protocol.packets;
 
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
-import network.protocol.Packets;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packets;
 
 public class PlayerLeavePacket extends Packet{
 

app/src/main/java/org/polytech/ryuk/network/protocol/packets/StartGamePacket.java

@@ -1,10 +1,10 @@
-package network.protocol.packets;
+package org.polytech.ryuk.network.protocol.packets;
 
 import java.time.Instant;
 
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
-import network.protocol.Packets;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packets;
 
 public class StartGamePacket extends Packet {
 

app/src/main/java/org/polytech/ryuk/network/protocol/packets/UpdatePlayerScorePacket.java

@@ -1,8 +1,8 @@
-package network.protocol.packets;
+package org.polytech.ryuk.network.protocol.packets;
 
-import network.protocol.Packet;
-import network.protocol.PacketVisitor;
-import network.protocol.Packets;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.PacketVisitor;
+import org.polytech.ryuk.network.protocol.Packets;
 
 public class UpdatePlayerScorePacket extends Packet {
 

app/src/main/java/org/polytech/ryuk/network/server/KeepAliveHandler.java

@@ -1,8 +1,8 @@
-package network.server;
+package org.polytech.ryuk.network.server;
 
 import java.util.Random;
 
-import network.protocol.packets.KeepAlivePacket;
+import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket;
 
 public class KeepAliveHandler {
 

app/src/main/java/org/polytech/ryuk/network/server/Server.java

@@ -1,4 +1,4 @@
-package network.server;
+package org.polytech.ryuk.network.server;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -6,14 +6,14 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
-import game.Game;
-import game.Player;
-import game.Game.GameState;
-import network.protocol.Packet;
-import network.protocol.packets.EndGamePacket;
-import network.protocol.packets.StartGamePacket;
-import sudoku.io.SudokuSerializer;
-import sudoku.structure.MultiDoku;
+import org.polytech.ryuk.game.Game;
+import org.polytech.ryuk.game.Game.GameState;
+import org.polytech.ryuk.game.Player;
+import org.polytech.ryuk.network.protocol.Packet;
+import org.polytech.ryuk.network.protocol.packets.EndGamePacket;
+import org.polytech.ryuk.network.protocol.packets.StartGamePacket;
+import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
 public class Server {
 

app/src/main/java/org/polytech/ryuk/network/server/ServerAcceptThread.java

@@ -1,4 +1,4 @@
-package network.server;
+package org.polytech.ryuk.network.server;
 
 import java.io.IOException;
 import java.net.Socket;

app/src/main/java/org/polytech/ryuk/network/server/ServerConnexion.java

@@ -1,25 +1,25 @@
-package network.server;
+package org.polytech.ryuk.network.server;
 
 import java.io.IOException;
 import java.net.Socket;
 
-import game.Game;
-import game.Player;
-import game.Game.GameState;
-import network.Connexion;
-import network.protocol.packets.ChangeCellPacket;
-import network.protocol.packets.ConnexionInfoPacket;
-import network.protocol.packets.DisconnectPacket;
-import network.protocol.packets.EndGamePacket;
-import network.protocol.packets.KeepAlivePacket;
-import network.protocol.packets.LoginPacket;
-import network.protocol.packets.PlayerJoinPacket;
-import network.protocol.packets.PlayerLeavePacket;
-import network.protocol.packets.StartGamePacket;
-import network.protocol.packets.UpdatePlayerScorePacket;
-import sudoku.io.SudokuSerializer;
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
+import org.polytech.ryuk.game.Game;
+import org.polytech.ryuk.game.Game.GameState;
+import org.polytech.ryuk.game.Player;
+import org.polytech.ryuk.network.Connexion;
+import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket;
+import org.polytech.ryuk.network.protocol.packets.ConnexionInfoPacket;
+import org.polytech.ryuk.network.protocol.packets.DisconnectPacket;
+import org.polytech.ryuk.network.protocol.packets.EndGamePacket;
+import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket;
+import org.polytech.ryuk.network.protocol.packets.LoginPacket;
+import org.polytech.ryuk.network.protocol.packets.PlayerJoinPacket;
+import org.polytech.ryuk.network.protocol.packets.PlayerLeavePacket;
+import org.polytech.ryuk.network.protocol.packets.StartGamePacket;
+import org.polytech.ryuk.network.protocol.packets.UpdatePlayerScorePacket;
+import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
 public class ServerConnexion extends Connexion {
 

app/src/main/java/org/polytech/ryuk/network/server/ServerLogicThread.java

@@ -1,4 +1,4 @@
-package network.server;
+package org.polytech.ryuk.network.server;
 
 public class ServerLogicThread extends Thread {
 

app/src/main/java/org/polytech/ryuk/sudoku/Main.java

@@ -1,9 +1,9 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package sudoku;
+package org.polytech.ryuk.sudoku;
 
-import sudoku.io.ConsoleInterface;
+import org.polytech.ryuk.sudoku.io.ConsoleInterface;
 
 public class Main {
     public String getGreeting() {

app/src/main/java/org/polytech/ryuk/sudoku/constraint/BlockConstraint.java

@@ -1,7 +1,7 @@
-package sudoku.constraint;
+package org.polytech.ryuk.sudoku.constraint;
 
-import sudoku.structure.Block;
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.Block;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class BlockConstraint implements IConstraint{
 

app/src/main/java/org/polytech/ryuk/sudoku/constraint/ColumnConstraint.java

@@ -1,7 +1,7 @@
-package sudoku.constraint;
+package org.polytech.ryuk.sudoku.constraint;
 
-import sudoku.structure.Cell;
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class ColumnConstraint implements IConstraint {
 

app/src/main/java/org/polytech/ryuk/sudoku/constraint/Constraint.java

@@ -1,8 +1,8 @@
-package sudoku.constraint;
+package org.polytech.ryuk.sudoku.constraint;
 
 import java.util.List;
 
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public enum Constraint {
 

app/src/main/java/org/polytech/ryuk/sudoku/constraint/DiagonalConstraint.java

@@ -1,6 +1,6 @@
-package sudoku.constraint;
+package org.polytech.ryuk.sudoku.constraint;
 
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class DiagonalConstraint implements IConstraint {
 

app/src/main/java/org/polytech/ryuk/sudoku/constraint/IConstraint.java

@@ -1,9 +1,9 @@
-package sudoku.constraint;
+package org.polytech.ryuk.sudoku.constraint;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public interface IConstraint {
 

app/src/main/java/org/polytech/ryuk/sudoku/constraint/LineConstraint.java

@@ -1,6 +1,6 @@
-package sudoku.constraint;
+package org.polytech.ryuk.sudoku.constraint;
 
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class LineConstraint implements IConstraint {
 

app/src/main/java/org/polytech/ryuk/sudoku/io/ConsoleInterface.java

@@ -1,15 +1,15 @@
-package sudoku.io;
+package org.polytech.ryuk.sudoku.io;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
 
-import sudoku.constraint.Constraint;
-import sudoku.solver.RandomSolver;
-import sudoku.structure.Difficulty;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
-import sudoku.structure.SudokuFactory;
+import org.polytech.ryuk.sudoku.constraint.Constraint;
+import org.polytech.ryuk.sudoku.solver.RandomSolver;
+import org.polytech.ryuk.sudoku.structure.Difficulty;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.SudokuFactory;
 
 public class ConsoleInterface {
     public Scanner reader = new Scanner(System.in);

app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuFile.java

@@ -0,0 +1,7 @@
+package org.polytech.ryuk.sudoku.io;
+
+public class SudokuFile {
+
+	
+
+}

app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuPrinter.java

@@ -1,7 +1,7 @@
-package sudoku.io;
+package org.polytech.ryuk.sudoku.io;
 
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class SudokuPrinter {
 

app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuSave.java

@@ -1,4 +1,4 @@
-package sudoku.io;
+package org.polytech.ryuk.sudoku.io;
 
 public class SudokuSave {
 

app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuSerializer.java

@@ -1,4 +1,4 @@
-package sudoku.io;
+package org.polytech.ryuk.sudoku.io;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -10,12 +10,11 @@ import java.util.List;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-
-import sudoku.constraint.Constraint;
-import sudoku.structure.Block;
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.constraint.Constraint;
+import org.polytech.ryuk.sudoku.structure.Block;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class SudokuSerializer {
 

app/src/main/java/org/polytech/ryuk/sudoku/solver/BacktrackingSolver.java

@@ -1,10 +1,10 @@
-package sudoku.solver;
+package org.polytech.ryuk.sudoku.solver;
 
 import java.util.List;
 import java.util.concurrent.CancellationException;
 
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
 public class BacktrackingSolver implements Solver {
 

app/src/main/java/org/polytech/ryuk/sudoku/solver/HumanSolver.java

@@ -1,13 +1,13 @@
-package sudoku.solver;
+package org.polytech.ryuk.sudoku.solver;
 
 import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import sudoku.io.SudokuPrinter;
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.io.SudokuPrinter;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class HumanSolver implements Solver {
 

app/src/main/java/org/polytech/ryuk/sudoku/solver/MixedSolver.java

@@ -1,14 +1,14 @@
-package sudoku.solver;
+package org.polytech.ryuk.sudoku.solver;
 
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import sudoku.io.SudokuPrinter;
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.io.SudokuPrinter;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class MixedSolver implements Solver{
 

app/src/main/java/org/polytech/ryuk/sudoku/solver/RandomSolver.java

@@ -1,14 +1,14 @@
-package sudoku.solver;
+package org.polytech.ryuk.sudoku.solver;
 
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import sudoku.io.SudokuPrinter;
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.io.SudokuPrinter;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 public class RandomSolver implements Solver {
 

app/src/main/java/org/polytech/ryuk/sudoku/solver/Solver.java

@@ -1,10 +1,10 @@
-package sudoku.solver;
+package org.polytech.ryuk.sudoku.solver;
 
 import java.util.List;
 import java.util.logging.Logger;
 
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
 public interface Solver {
 

app/src/main/java/org/polytech/ryuk/sudoku/solver/StupidSolver.java

@@ -1,9 +1,9 @@
-package sudoku.solver;
+package org.polytech.ryuk.sudoku.solver;
 
 import java.util.concurrent.CancellationException;
 
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
 
 /**
  * Class de test non utilisé

app/src/main/java/org/polytech/ryuk/sudoku/structure/Block.java

@@ -1,4 +1,4 @@
-package sudoku.structure;
+package org.polytech.ryuk.sudoku.structure;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/polytech/ryuk/sudoku/structure/Cell.java

@@ -1,4 +1,4 @@
-package sudoku.structure;
+package org.polytech.ryuk.sudoku.structure;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/polytech/ryuk/sudoku/structure/Coordinate.java

@@ -1,4 +1,4 @@
-package sudoku.structure;
+package org.polytech.ryuk.sudoku.structure;
 
 /**
  * Représente les coordonnées d'une Cell

app/src/main/java/org/polytech/ryuk/sudoku/structure/Difficulty.java

@@ -1,4 +1,4 @@
-package sudoku.structure;
+package org.polytech.ryuk.sudoku.structure;
 
 //TODO: melvyn va passer par là
 public enum Difficulty {

app/src/main/java/org/polytech/ryuk/sudoku/structure/MultiDoku.java

@@ -1,4 +1,4 @@
-package sudoku.structure;
+package org.polytech.ryuk.sudoku.structure;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -6,7 +6,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
-import sudoku.io.SudokuSerializer;
+import org.polytech.ryuk.sudoku.io.SudokuSerializer;
 
 /**
  * @class MultiDoku

app/src/main/java/org/polytech/ryuk/sudoku/structure/StateManager.java

@@ -1,4 +1,4 @@
-package sudoku.structure;
+package org.polytech.ryuk.sudoku.structure;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/org/polytech/ryuk/sudoku/structure/Sudoku.java

@@ -1,13 +1,10 @@
-package sudoku.structure;
-
-import sudoku.constraint.BlockConstraint;
-import sudoku.constraint.Constraint;
-import sudoku.constraint.IConstraint;
-import sudoku.io.SudokuPrinter;
+package org.polytech.ryuk.sudoku.structure;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.polytech.ryuk.sudoku.constraint.Constraint;
+
 /**
  * @class Sudoku
  * @brief Représent un Sudoku

app/src/main/java/org/polytech/ryuk/sudoku/structure/SudokuFactory.java

@@ -1,4 +1,4 @@
-package sudoku.structure;
+package org.polytech.ryuk.sudoku.structure;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -9,10 +9,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import sudoku.constraint.Constraint;
-import sudoku.io.SudokuSerializer;
-import sudoku.solver.RandomSolver;
-import sudoku.solver.Solver;
+import org.polytech.ryuk.sudoku.constraint.Constraint;
+import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import org.polytech.ryuk.sudoku.solver.RandomSolver;
+import org.polytech.ryuk.sudoku.solver.Solver;
 
 public class SudokuFactory {
 

app/src/main/java/sudoku/io/SudokuFile.java

@@ -1,7 +0,0 @@
-package sudoku.io;
-
-public class SudokuFile {
-
-	
-
-}

app/src/test/java/sudoku/AppTest.java

@@ -1,14 +0,0 @@
-/*
- * This Java source file was generated by the Gradle 'init' task.
- */
-package sudoku;
-
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
-class AppTest {
-    @Test void appHasAGreeting() {
-        Main classUnderTest = new Main();
-        assertNotNull(classUnderTest.getGreeting(), "app should have a greeting");
-    }
-}

app/src/test/java/sudoku/SudokuSerializerTest.java

@@ -8,11 +8,10 @@ import java.util.Random;
 
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
-
-import sudoku.io.SudokuSerializer;
-import sudoku.solver.RandomSolver;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.SudokuFactory;
+import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import org.polytech.ryuk.sudoku.solver.RandomSolver;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.SudokuFactory;
 
 public class SudokuSerializerTest {
 

app/src/test/java/sudoku/solver/SolverTest.java

@@ -1,18 +1,19 @@
 package sudoku.solver;
 
-import org.junit.jupiter.api.Test;
-import sudoku.io.SudokuPrinter;
-import sudoku.io.SudokuSerializer;
-import sudoku.structure.Cell;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
-import sudoku.structure.SudokuFactory;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 import java.util.Random;
 
+import org.junit.jupiter.api.Test;
+import org.polytech.ryuk.sudoku.io.SudokuPrinter;
+import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import org.polytech.ryuk.sudoku.solver.RandomSolver;
+import org.polytech.ryuk.sudoku.structure.Cell;
+import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import org.polytech.ryuk.sudoku.structure.Sudoku;
+import org.polytech.ryuk.sudoku.structure.SudokuFactory;
+
 class SolverTest {
 
 	@Test