Motschen/MidnightLib
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightLib.git synced 2025-12-18 18:15:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ditch Log4j for future-proofing

Browse Source
This commit is contained in:
Motschen
2022-02-22 12:44:28 +01:00
parent a9190f2a0d
commit 5183b54285
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/eu/midnightdust/hats/web/HatLoader.java
View File

@@ -4,9 +4,6 @@ import com.google.common.reflect.TypeToken;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@@ -19,7 +16,7 @@ import java.util.concurrent.CompletableFuture;
@SuppressWarnings("UnstableApiUsage") @SuppressWarnings("UnstableApiUsage")
public class HatLoader { public class HatLoader {
public static final Logger logger = LogManager.getLogger("MidnightLib"); public static final System.Logger logger = System.getLogger("MidnightLib");
private final static String HATS_URL = "https://raw.githubusercontent.com/TeamMidnightDust/MidnightHats/master/hats.json"; private final static String HATS_URL = "https://raw.githubusercontent.com/TeamMidnightDust/MidnightHats/master/hats.json";
public static final Type HAT_TYPE = new TypeToken<Map<UUID, PlayerHatData>>(){}.getType(); public static final Type HAT_TYPE = new TypeToken<Map<UUID, PlayerHatData>>(){}.getType();
public static Map<UUID, PlayerHatData> PLAYER_HATS; public static Map<UUID, PlayerHatData> PLAYER_HATS;
@@ -31,19 +28,19 @@ public class HatLoader {
try (Reader reader = new InputStreamReader(new URL(HATS_URL).openStream())) { try (Reader reader = new InputStreamReader(new URL(HATS_URL).openStream())) {
return GSON.<Map<UUID, PlayerHatData>>fromJson(reader, HAT_TYPE); return GSON.<Map<UUID, PlayerHatData>>fromJson(reader, HAT_TYPE);
} catch (MalformedURLException error) { } catch (MalformedURLException error) {
logger.log(Level.ERROR, "Unable to load player hats because of connection problems: " + error.getMessage()); logger.log(System.Logger.Level.ERROR, "Unable to load player hats because of connection problems: " + error.getMessage());
} catch (IOException error) { } catch (IOException error) {
logger.log(Level.ERROR, "Unable to load player hats because of an I/O Exception: " + error.getMessage()); logger.log(System.Logger.Level.ERROR, "Unable to load player hats because of an I/O Exception: " + error.getMessage());
} }
return null; return null;
}).thenAcceptAsync(playerData -> { }).thenAcceptAsync(playerData -> {
if (playerData != null) { if (playerData != null) {
PLAYER_HATS = playerData; PLAYER_HATS = playerData;
logger.log(Level.INFO, "Player hats successfully loaded!"); System.out.println("(MidnightLib) Player hats successfully loaded!");
} else { } else {
PLAYER_HATS = Collections.emptyMap(); PLAYER_HATS = Collections.emptyMap();
logger.log(Level.WARN, "A problem with the database occurred, the hats could not be initialized."); logger.log(System.Logger.Level.WARNING, "A problem with the database occurred, the hats could not be initialized.");
} }
}, MinecraftClient.getInstance()); }, MinecraftClient.getInstance());
} }

1
src/main/java/eu/midnightdust/hats/witch/WitchHatFeatureRenderer.java
View File

@@ -1,7 +1,6 @@
package eu.midnightdust.hats.witch; package eu.midnightdust.hats.witch;
import eu.midnightdust.hats.web.HatLoader; import eu.midnightdust.hats.web.HatLoader;
import eu.midnightdust.lib.config.MidnightConfig;
import eu.midnightdust.lib.util.MidnightColorUtil; import eu.midnightdust.lib.util.MidnightColorUtil;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;