Update to 24r04

opcraft/logs/latest.log

@@ -1,2 +1 @@
-[12:50:33] [main/INFO]: Initializing the game...
-[12:50:33] [main/INFO]: Game initializated!
+[22:25:35] [main/INFO]: OpenCraft 24r03 started!

src/main/java/net/opencraft/client/Game.java

@@ -4,15 +4,14 @@
 import static net.opencraft.LoggerConfig.handle;
 import static net.opencraft.renderer.display.DisplayManager.destroyDisplay;
 
-import java.awt.Graphics;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.Locale;
 import java.util.logging.Logger;
 
 import net.opencraft.config.GameConfig;
 import net.opencraft.config.GameExperiments;
-import net.opencraft.config.Workspace;
+import net.opencraft.data.packs.DefaultPack;
 import net.opencraft.data.packs.Pack;
 import net.opencraft.renderer.RenderDragon;
 import net.opencraft.renderer.Screen;
@@ -22,17 +21,17 @@
 public class Game implements Runnable {
 
 	public static final String NAME = "OpenCraft";
-	public static final String VERSION = "24r03";
-	public static final String TITLE = NAME + ' ' + VERSION;
+	public static final String VERSION = "24r04";
+	public static final String TITLE = NAME + ((char) 0x20) + VERSION;
 
 	public static final int NANOSECONDS = 1000000000;
-	public static final double NANO_PER_TICK = NANOSECONDS / GameConfig.TICK_RATE;
-
-	private static Game instance;
-	private static Pack selected_pack;
+	public static final double NANO_PER_TICK = (double) NANOSECONDS / GameConfig.TICK_RATE;
 
+	private static final Game instance = new Game();
 	private static final Logger logger = Logger.getLogger("main");
 
+	private static Pack selected_pack = DefaultPack.getDefaultPack();
+
 	private boolean running = false;
 	private Screen screen;
 
@@ -41,12 +40,21 @@ public class Game implements Runnable {
 		System.setProperty("java.util.logging.SimpleFormatter.format", LOG_FORMAT);
 		handle(logger);
 	}
+
+	public void init() {
+		Thread.currentThread().setName("main");
+
+		RenderDragon.init();
+		this.screen = RenderDragon.getScreen();
+		Scene.setCurrent(Scene.LOAD_SCENE);
+
+		running = true;
+	}
 
 	@Override
 	public void run() {
-		logger.info("Initializing the game...");
 		init();
-		logger.info("Game initializated!");
+		logger.info(Game.TITLE + " started!");
 
 		long lastUpdate = System.nanoTime();
 
@@ -74,8 +82,8 @@ public void run() {
 	}
 
 	public void render() {
-		Graphics g = this.screen.getGraphics();
-		Scene.renderCurrent(g);
+		BufferedImage img = this.screen.getImage();
+		Scene.renderCurrent(img);
 		RenderDragon.update();
 	}
 
@@ -91,18 +99,6 @@ public void stop() {
 		destroyDisplay();
 	}
 
-	public void init() {
-		Thread.currentThread().setName("main");
-
-		Workspace.create();
-
-		RenderDragon.init();
-		screen = RenderDragon.getScreen();
-		Scene.setCurrent(Scene.LOAD_SCENE);
-
-		running = true;
-	}
-
 	public static Locale getLanguage() {
 		return GameConfig.LANGUAGE;
 	}
@@ -132,7 +128,7 @@ public static void selectPack(Pack pack) {
 	}
 
 	public static void useDefaultPack() {
-		selectPack(null);
+		selectPack(DefaultPack.getDefaultPack());
 	}
 
 	public static Pack getResourcePack() {
@@ -144,15 +140,14 @@ public static Game getInstance() {
 	}
 
 	public static boolean isDefaultPackSelected() {
-		return selected_pack == null;
+		return selected_pack instanceof DefaultPack;
 	}
 
 	public static BufferedImage screenshot() {
-		Game game = getInstance();
-		return game.screen.screenshot();
+		return getInstance().screen.screenshot();
 	}
 
 	public static void main(String[] args) throws IOException {
-		new Thread(instance = new Game()).start();
+		new Thread(instance).start();
 	}
 }

src/main/java/net/opencraft/config/GameConfig.java

@@ -10,5 +10,6 @@ public class GameConfig {
 	public static byte    TICK_RATE    = 60;
 	public static boolean UNICODE = false;
 	public static Pack    PACK_SELECTED = null;
+	public static String  GAME_DIR = "opcraft";
 
 }

src/main/java/net/opencraft/config/GameExperiments.java

@@ -43,6 +43,6 @@ private GameExperiments() {
 	 * This experiment skip completly the load screen.<br>
 	 * Recommended for developers!
 	 * */
-	public static final boolean SKIP_LOAD_SCENE = false;
+	public static final boolean SKIP_LOAD_SCENE = true;
 
 }

src/main/java/net/opencraft/data/packs/DefaultPack.java

@@ -0,0 +1,30 @@
+package net.opencraft.data.packs;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+public final class DefaultPack extends Pack {
+
+	private static final DefaultPack defaultPack = new DefaultPack();
+
+	public DefaultPack() {
+	}
+
+	public static Pack getDefaultPack() {
+		return DefaultPack.defaultPack;
+	}
+
+	@Override
+	public InputStream getResource(String resource) {
+		InputStream in = InputStream.nullInputStream();
+
+		System.out.println("Resource adquired: " + resource);
+		try {
+			in = new FileInputStream(resource);
+		} catch (Exception ignored) {
+		}
+
+		return in;
+	}
+
+}

src/main/java/net/opencraft/data/packs/Pack.java

@@ -2,6 +2,6 @@
 
 import java.io.InputStream;
 
-public interface Pack {
-	InputStream getResource(String resource);
+public abstract class Pack {
+	public abstract InputStream getResource(String resource);
 }

src/main/java/net/opencraft/data/packs/ResourcePack.java

@@ -6,7 +6,7 @@
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 
-public class ResourcePack implements Pack {
+public class ResourcePack extends Pack {
 
 	private ZipFile zfile;