Skip to content
This repository was archived by the owner on Feb 28, 2025. It is now read-only.

Commit e5aa3c6

Browse files
author
CiroZDP
committed
Improve logging functions
1 parent fbce161 commit e5aa3c6

31 files changed

+199
-44
lines changed

‎opcraft/logs/game.log‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
[17:20:33] [main/INFO]: Selected language: English (United States)
2-
[17:20:33] [main/INFO]: OpenCraft 24r04 started!
1+
[18:51:10] [main/INFO]: Selected language: Dullutiano (Dulutia)
2+
[18:51:10] [main/INFO]: OpenCraft 24r05 started!

‎opcraft/logs/internal.log‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[net.opencraft.sound.Sound] Ignored exception:
2+
java.util.NoSuchElementException: No value present
3+
at java.base/java.util.Optional.get(Optional.java:143)
4+
at net.opencraft.sound.Sound.play(Sound.java:83)
5+
at net.opencraft.sound.SoundManager.update(SoundManager.java:90)
6+
at net.opencraft.renderer.scenes.Scene.setCurrent(Scene.java:56)
7+
at net.opencraft.client.Game.init(Game.java:51)
8+
at net.opencraft.client.Game.run(Game.java:59)
9+
at java.base/java.lang.Thread.run(Thread.java:842)
10+

‎opcraft/logs/renderdragon.log‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
[17:20:32] [renderThread/INFO]: Buffered rendering not configured, creating new framework.
2-
[17:20:33] [renderThread/INFO]: Render system initialized!
1+
[18:51:10] [renderThread/INFO]: Buffered rendering not configured, creating new framework.
2+
[18:51:10] [renderThread/INFO]: Render system initialized!
3+
[18:51:10] [renderThread/INFO]: Rendered scene opencraft.scene:load
4+
[18:51:15] [renderThread/INFO]: Rendered scene opencraft.scene:menu

‎opcraft/logs/soundmanager.log‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[18:51:10] [soundManager/INFO]: Sound manager started!

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
package net.opencraft.client;
22

3-
import static net.opencraft.LoggerConfig.LOG_FORMAT;
4-
import static net.opencraft.LoggerConfig.handle;
5-
import static net.opencraft.renderer.display.DisplayManager.destroyDisplay;
3+
import static net.opencraft.logging.LoggerConfig.*;
4+
import static net.opencraft.renderer.display.DisplayManager.*;
65

76
import java.awt.image.BufferedImage;
87
import java.io.IOException;
98
import java.util.Locale;
109
import java.util.logging.Logger;
1110

12-
import net.opencraft.LoggerConfig;
1311
import net.opencraft.config.GameConfig;
1412
import net.opencraft.config.GameExperiments;
1513
import net.opencraft.data.packs.DefaultPack;
1614
import net.opencraft.data.packs.Pack;
15+
import net.opencraft.language.Languages;
16+
import net.opencraft.logging.LoggerConfig;
1717
import net.opencraft.renderer.RenderDragon;
18-
import net.opencraft.renderer.Screen;
1918
import net.opencraft.renderer.scenes.Scene;
2019
import net.opencraft.sound.SoundManager;
2120

2221
public class Game implements Runnable {
2322

2423
public static final String NAME = "OpenCraft";
25-
public static final String VERSION = "24r04";
24+
public static final String VERSION = "24r05";
2625
public static final String TITLE = NAME + ((char) 0x20) + VERSION;
2726

2827
public static final int NANOSECONDS = 1000000000;
@@ -34,7 +33,6 @@ public class Game implements Runnable {
3433
private static Pack selected_pack = DefaultPack.getDefaultPack();
3534

3635
private boolean running = false;
37-
private Screen screen;
3836

3937
static {
4038
LoggerConfig.clearLogDir();
@@ -46,21 +44,20 @@ public class Game implements Runnable {
4644

4745
public void init() {
4846
RenderDragon.init();
49-
System.out.println();
5047

51-
this.screen = RenderDragon.getScreen();
5248
if (GameExperiments.SKIP_LOAD_SCENE)
5349
Scene.setCurrent(Scene.MENU_SCENE);
5450
else
5551
Scene.setCurrent(Scene.LOAD_SCENE);
5652

53+
System.out.println();
5754
running = true;
5855
}
5956

6057
@Override
6158
public void run() {
6259
init();
63-
logger.info(String.format("Selected language: %s", getLanguage().getDisplayName(getLanguage())));
60+
logger.info(String.format("Selected language: %s", Languages.getDisplayName(getLanguage())));
6461

6562
logger.info(Game.TITLE + " started!");
6663

@@ -87,8 +84,6 @@ public void run() {
8784
}
8885

8986
public void render() {
90-
BufferedImage img = this.screen.getImage();
91-
Scene.renderCurrent(img);
9287
RenderDragon.update();
9388
}
9489

@@ -149,7 +144,7 @@ public static boolean isDefaultPackSelected() {
149144
}
150145

151146
public static BufferedImage screenshot() {
152-
return getInstance().screen.screenshot();
147+
return RenderDragon.getScreen().screenshot();
153148
}
154149

155150
public static void main(String[] args) throws IOException {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
import java.util.Locale;
44

55
import net.opencraft.data.packs.Pack;
6+
import net.opencraft.language.Languages;
67

78
public class GameConfig {
89

9-
public static Locale LANGUAGE = Locale.getDefault();
10+
public static Locale LANGUAGE = Languages.get("du-DU");
1011
public static byte TICK_RATE = 60;
1112
public static boolean UNICODE = false;
1213
public static Pack PACK_SELECTED = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ private GameExperiments() {
4343
* This experiment skip completly the load screen.<br>
4444
* Recommended for developers!
4545
* */
46-
public static final boolean SKIP_LOAD_SCENE = true;
46+
public static final boolean SKIP_LOAD_SCENE = false;
4747

4848
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import java.io.FileInputStream;
44
import java.io.InputStream;
55

6+
import net.opencraft.logging.InternalLogger;
7+
68
public final class DefaultPack extends Pack {
79

810
private static final DefaultPack defaultPack = new DefaultPack();
@@ -21,6 +23,9 @@ public InputStream getResource(String resource) {
2123
try {
2224
in = new FileInputStream(resource);
2325
} catch (Exception ignored) {
26+
InternalLogger.out.printf("[%s] Ignored exception:\n", getClass().getName());
27+
ignored.printStackTrace(InternalLogger.out);
28+
InternalLogger.out.println();
2429
}
2530

2631
return in;

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import java.util.zip.ZipException;
77
import java.util.zip.ZipFile;
88

9+
import net.opencraft.logging.InternalLogger;
10+
911
public class ResourcePack extends Pack {
1012

1113
private ZipFile zfile;
@@ -27,7 +29,11 @@ public static ResourcePack get(final String filename) {
2729

2830
try {
2931
pack = new ResourcePack(filename);
30-
} catch (Exception ignored) {}
32+
} catch (Exception ignored) {
33+
InternalLogger.out.printf("[%s] Ignored exception:\n", ResourcePack.class.getName());
34+
ignored.printStackTrace(InternalLogger.out);
35+
InternalLogger.out.println();
36+
}
3137

3238
return pack;
3339
}
@@ -38,7 +44,11 @@ public InputStream getResource(String resource) {
3844

3945
try {
4046
stream = zfile.getInputStream(zfile.getEntry(resource));
41-
} catch (Exception ignored) {}
47+
} catch (Exception ignored) {
48+
InternalLogger.out.printf("[%s] Ignored exception:\n", getClass().getName());
49+
ignored.printStackTrace(InternalLogger.out);
50+
InternalLogger.out.println();
51+
}
4252

4353
return stream;
4454
}

‎src/main/java/net/opencraft/language/Languages.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,14 @@ public class Languages {
77
public static Locale get(String languageTag) {
88
return Locale.forLanguageTag(languageTag);
99
}
10+
11+
public static String getDisplayName(Locale locale) {
12+
String name = locale.getDisplayName(locale);
13+
14+
if (locale.equals(Languages.get("du-DU")))
15+
name = "Dullutiano (Dulutia)";
16+
17+
return name;
18+
}
1019

1120
}

0 commit comments

Comments
 (0)