Skip to content

Commit 59bd007

Browse files
committed
Small debug dump improvements
1 parent f66695a commit 59bd007

File tree

4 files changed

+32
-13
lines changed

4 files changed

+32
-13
lines changed

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/MinecraftVersion.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.regex.Matcher;
3434
import java.util.regex.Pattern;
3535

36+
@DebugDump
3637
public class MinecraftVersion implements Comparable<MinecraftVersion> {
3738

3839
private static final Pattern VERSION_REGEX = Pattern.compile("(?:(?<major>\\d+)\\.(?<minor>\\d+))(?:\\.(?<patch>\\d+))?(?:\\-(?:pre|rc)\\d+)?");
@@ -41,10 +42,8 @@ public class MinecraftVersion implements Comparable<MinecraftVersion> {
4142
public static final MinecraftVersion EARLIEST_SUPPORTED = new MinecraftVersion(1, 12, 2);
4243
public static final MinecraftVersion THE_FLATTENING = new MinecraftVersion(1, 13);
4344

44-
@DebugDump
4545
private final int major, minor, patch;
4646

47-
@DebugDump
4847
private final Lazy<MinecraftResource> resource;
4948

5049
public MinecraftVersion(int major, int minor) {
@@ -142,6 +141,7 @@ public static MinecraftVersion of(String versionString) {
142141
return new MinecraftVersion(major, minor, patch);
143142
}
144143

144+
@DebugDump
145145
public enum MinecraftResource {
146146

147147
MC_1_12 (new MinecraftVersion(1, 12), "mc1_12", "https://launcher.mojang.com/v1/objects/0f275bc1547d01fa5f56ba34bdc87d981ee12daf/client.jar"),
@@ -152,9 +152,9 @@ public enum MinecraftResource {
152152
MC_1_16_2 (new MinecraftVersion(1, 16, 2), "mc1_16", "https://launcher.mojang.com/v1/objects/653e97a2d1d76f87653f02242d243cdee48a5144/client.jar"),
153153
MC_1_17 (new MinecraftVersion(1, 17), "mc1_16", "https://launcher.mojang.com/v1/objects/1cf89c77ed5e72401b869f66410934804f3d6f52/client.jar");
154154

155-
@DebugDump private final MinecraftVersion version;
156-
@DebugDump private final String resourcePrefix;
157-
@DebugDump private final String clientUrl;
155+
private final MinecraftVersion version;
156+
private final String resourcePrefix;
157+
private final String clientUrl;
158158

159159
MinecraftResource(MinecraftVersion version, String resourcePrefix, String clientUrl) {
160160
this.version = version;

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/CoreConfig.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
import java.io.File;
3131
import java.io.IOException;
3232

33+
@DebugDump
3334
public class CoreConfig {
3435

35-
@DebugDump private boolean downloadAccepted = false;
36-
@DebugDump private int renderThreadCount = 0;
37-
@DebugDump private boolean metricsEnabled = false;
38-
@DebugDump private File dataFolder = new File("data");
39-
40-
36+
private boolean downloadAccepted = false;
37+
private int renderThreadCount = 0;
38+
private boolean metricsEnabled = false;
39+
private File dataFolder = new File("data");
40+
4141
public CoreConfig(ConfigurationNode node) throws IOException {
4242

4343
//accept-download

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/BmMap.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,5 +182,15 @@ public boolean equals(Object obj) {
182182

183183
return false;
184184
}
185-
185+
186+
@Override
187+
public String toString() {
188+
return "BmMap{" +
189+
"id='" + id + '\'' +
190+
", name='" + name + '\'' +
191+
", world=" + world +
192+
", fileRoot=" + fileRoot +
193+
'}';
194+
}
195+
186196
}

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAWorld.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,5 +422,14 @@ public static Vector2i blockToChunk(Vector3i pos) {
422422
pos.getZ() >> 4
423423
);
424424
}
425-
425+
426+
@Override
427+
public String toString() {
428+
return "MCAWorld{" +
429+
"uuid=" + uuid +
430+
", worldFolder=" + worldFolder +
431+
", name='" + name + '\'' +
432+
'}';
433+
}
434+
426435
}

0 commit comments

Comments
 (0)