Skip to content

Commit 26641db

Browse files
committed
Revert "Improved logging"
This reverts commit 1785d79.
1 parent 1785d79 commit 26641db

File tree

1 file changed

+20
-18
lines changed
  • src/main/java/com/technicjelle/bluemapfloodgate

1 file changed

+20
-18
lines changed

src/main/java/com/technicjelle/bluemapfloodgate/Main.java

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,20 @@
2323
import java.util.Optional;
2424
import java.util.UUID;
2525
import java.util.function.Consumer;
26-
import java.util.logging.Level;
2726

2827
public final class Main extends JavaPlugin {
28+
private final boolean VERBOSE_LOGGING = false;
29+
private void verboseLog(String message) {
30+
if (VERBOSE_LOGGING) getLogger().info(message);
31+
}
32+
2933
@Override
3034
public void onEnable() {
3135
new Metrics(this, 16426);
3236

3337
BlueMapAPI.onEnable(blueMapOnEnableListener);
3438

3539
getLogger().info("BlueMap Floodgate compatibility plugin enabled!");
36-
// getLogger().setLevel(Level.FINE);
3740
}
3841

3942
private final Consumer<BlueMapAPI> blueMapOnEnableListener = blueMapAPI -> {
@@ -43,25 +46,22 @@ public void onEnable() {
4346

4447
@Override
4548
public Optional<BufferedImage> load(UUID playerUUID) throws IOException {
46-
getLogger().log(Level.FINE, "Loading skin for " + playerUUID);
4749
if (floodgateApi.isFloodgatePlayer(playerUUID)) {
48-
getLogger().log(Level.FINE, "Player is a Floodgate player");
4950
FloodgatePlayer floodgatePlayer = floodgateApi.getPlayer(playerUUID);
5051
String xuid = floodgatePlayer.getXuid();
5152
@Nullable String textureID = textureIDFromXUID(xuid);
5253
if (textureID == null) {
53-
getLogger().log(Level.FINE, "TextureID for " + playerUUID + " is null");
54+
verboseLog("TextureID for " + playerUUID + " is null");
5455
return Optional.empty();
5556
}
5657
@Nullable BufferedImage skin = skinFromTextureID(textureID);
5758
if (skin == null) {
58-
getLogger().log(Level.FINE, "Skin for " + playerUUID + " is null");
59+
verboseLog("Skin for " + playerUUID + " is null");
5960
return Optional.empty();
6061
}
61-
getLogger().log(Level.FINE, "Skin for " + playerUUID + " successfully gotten!");
62+
verboseLog("Skin for " + playerUUID + " successfully gotten!");
6263
return Optional.of(skin);
6364
} else {
64-
getLogger().log(Level.FINE, "Player is not a Floodgate player");
6565
return defaultSkinProvider.load(playerUUID);
6666
}
6767
}
@@ -89,36 +89,37 @@ public void onDisable() {
8989
private @Nullable String textureIDFromXUID(@NotNull String xuid) {
9090
try {
9191
URL url = new URL("https://api.geysermc.org/v2/skin/" + xuid);
92-
getLogger().log(Level.FINE, "Getting textureID from " + url);
92+
verboseLog("Getting textureID from " + url);
9393
try {
9494
URLConnection request = url.openConnection();
9595
request.connect();
9696

9797
JsonObject joRoot = JsonParser.parseReader(new InputStreamReader((InputStream) request.getContent())).getAsJsonObject();
9898
if (joRoot == null) {
99-
getLogger().log(Level.WARNING, "joRoot is null!");
99+
verboseLog("joRoot is null!");
100100
return null;
101101
}
102102

103103
JsonElement jeTextureID = joRoot.get("texture_id");
104104
if (jeTextureID == null) {
105-
getLogger().log(Level.WARNING, "jeTextureID is null!");
105+
verboseLog("jeTextureID is null!");
106106
return null;
107107
}
108108

109109
String textureID = jeTextureID.getAsString();
110110
if (textureID == null) {
111-
getLogger().log(Level.WARNING, "textureID is null!");
111+
verboseLog("textureID is null!");
112112
return null;
113113
}
114114

115115
return textureID;
116116
} catch (IOException e) {
117-
getLogger().log(Level.WARNING, "Failed to get the textureID for " + xuid + " from " + url, e);
117+
getLogger().warning("Failed to get the textureID for " + xuid + " from " + url);
118+
e.printStackTrace();
118119
return null;
119120
}
120121
} catch (MalformedURLException e) {
121-
getLogger().log(Level.SEVERE, "Geyser API URL is malformed", e);
122+
e.printStackTrace();
122123
return null;
123124
}
124125
}
@@ -128,7 +129,7 @@ public void onDisable() {
128129
* @return the skin of the player, or null if it could not be found
129130
*/
130131
private @Nullable BufferedImage skinFromTextureID(@NotNull String textureID) {
131-
getLogger().log(Level.FINE, "Getting skin from textureID: " + textureID);
132+
verboseLog("Getting skin from textureID: " + textureID);
132133
return imageFromURL("https://textures.minecraft.net/texture/" + textureID);
133134
}
134135

@@ -140,17 +141,18 @@ public void onDisable() {
140141
BufferedImage result;
141142
try {
142143
URL imageUrl = new URL(url);
143-
getLogger().log(Level.FINE, "Getting image from URL: " + url);
144+
verboseLog("Getting image from URL: " + url);
144145
try {
145146
InputStream in = imageUrl.openStream();
146147
result = ImageIO.read(in);
147148
in.close();
148149
} catch (IOException e) {
149-
getLogger().log(Level.SEVERE, "Failed to get the image from " + url, e);
150+
getLogger().warning("Failed to get the image from " + url);
151+
e.printStackTrace();
150152
return null;
151153
}
152154
} catch (MalformedURLException e) {
153-
getLogger().log(Level.SEVERE, "URL is malformed: " + url, e);
155+
e.printStackTrace();
154156
return null;
155157
}
156158
return result;

0 commit comments

Comments
 (0)