added window to enter ip to connect to, and fixed gradle jar main class

chrisj42 · Mar 27, 2018 · f7dc75c · f7dc75c
1 parent dc76043
commit f7dc75c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/core/client/src/miniventure/game/client/ClientWorld.java b/core/client/src/miniventure/game/client/ClientWorld.java
@@ -91,8 +91,9 @@ public void update(float delta) {
 	public boolean worldLoaded() { return getLevelCount() > 0; }
 
 	@Override
-	public void createWorld(int width, int height) { createWorld(width, height, true); }
-	public void createWorld(int width, int height, boolean startServer) {
+	public void createWorld(int width, int height) { createWorld(width, height, true, ""); }
+	public void createWorld(String ipAddress) { createWorld(0, 0, false, ipAddress); }
+	private void createWorld(int width, int height, boolean startServer, String ipAddress) {
 		LoadingScreen loadingScreen = new LoadingScreen();
 		ClientCore.setScreen(loadingScreen);
 
@@ -106,7 +107,7 @@ public void createWorld(int width, int height, boolean startServer) {
 			if(startServer) // start server, then connect
 				serverStarter.startServer(width, height, connect);
 			else // server should already be running; just connect
-				connect.act();
+				client.connectToServer(loadingScreen, ipAddress);
 
 		}).start();
 	}

diff --git a/core/client/src/miniventure/game/screen/MainMenu.java b/core/client/src/miniventure/game/screen/MainMenu.java
@@ -1,5 +1,7 @@
 package miniventure.game.screen;
 
+import javax.swing.JOptionPane;
+
 import miniventure.game.GameCore;
 import miniventure.game.client.ClientWorld;
 
@@ -41,7 +43,8 @@ public void clicked(InputEvent e, float x, float y) {
 		joinBtn.addListener(new ClickListener() {
 			@Override
 			public void clicked(InputEvent e, float x, float y) {
-				world.createWorld(0, 0, false);
+				String ipAddress = JOptionPane.showInputDialog("Enter the IP Address you want to connect to.");
+				world.createWorld(ipAddress);
 			}
 		});
 

diff --git a/desktop/build.gradle b/desktop/build.gradle
@@ -4,7 +4,7 @@ sourceCompatibility = 1.8
 sourceSets.main.java.srcDirs = [ "src/" ]
 
 project.ext.mainClassName = "miniventure.game.desktop.DesktopLauncher"
-project.ext.assetsDir = new File("../core/assets");
+project.ext.assetsDir = new File("../core/game/assets");
 
 task run(dependsOn: classes, type: JavaExec) {
     main = project.mainClassName

diff --git a/desktop/src/META-INF/MANIFEST.MF b/desktop/src/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: miniventure.desktop.DesktopLauncher
+Main-Class: miniventure.game.desktop.DesktopLauncher
 
diff --git a/.../miniventure/desktop/DesktopLauncher.java → ...venture/game/desktop/DesktopLauncher.java b/.../miniventure/desktop/DesktopLauncher.java → ...venture/game/desktop/DesktopLauncher.java
@@ -1,4 +1,4 @@
-package miniventure.desktop;
+package miniventure.game.desktop;
 
 import miniventure.game.GameCore;
 import miniventure.game.client.ClientCore;