mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2025-08-16 08:15:50 +00:00
move loading message to debug
This commit is contained in:
parent
cc49b0f540
commit
94c5782490
@ -52,6 +52,7 @@ import com.volmit.iris.util.io.JarScanner;
|
|||||||
import com.volmit.iris.util.math.M;
|
import com.volmit.iris.util.math.M;
|
||||||
import com.volmit.iris.util.math.RNG;
|
import com.volmit.iris.util.math.RNG;
|
||||||
import com.volmit.iris.util.misc.Bindings;
|
import com.volmit.iris.util.misc.Bindings;
|
||||||
|
import com.volmit.iris.util.misc.SlimJar;
|
||||||
import com.volmit.iris.util.misc.getHardware;
|
import com.volmit.iris.util.misc.getHardware;
|
||||||
import com.volmit.iris.util.parallel.MultiBurst;
|
import com.volmit.iris.util.parallel.MultiBurst;
|
||||||
import com.volmit.iris.util.plugin.IrisService;
|
import com.volmit.iris.util.plugin.IrisService;
|
||||||
@ -60,7 +61,6 @@ import com.volmit.iris.util.plugin.VolmitSender;
|
|||||||
import com.volmit.iris.util.scheduling.J;
|
import com.volmit.iris.util.scheduling.J;
|
||||||
import com.volmit.iris.util.scheduling.Queue;
|
import com.volmit.iris.util.scheduling.Queue;
|
||||||
import com.volmit.iris.util.scheduling.ShurikenQueue;
|
import com.volmit.iris.util.scheduling.ShurikenQueue;
|
||||||
import io.github.slimjar.app.builder.ApplicationBuilder;
|
|
||||||
import lombok.NonNull;
|
import lombok.NonNull;
|
||||||
import org.bukkit.*;
|
import org.bukkit.*;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
@ -437,17 +437,12 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Iris() {
|
public Iris() {
|
||||||
ApplicationBuilder.appending("Iris")
|
instance = this;
|
||||||
.downloadDirectoryPath(getDataFolder("cache", "libraries").toPath())
|
SlimJar.debug(IrisSettings.get().getSentry().isDebug());
|
||||||
.logger((message, args) -> {
|
SlimJar.load(getDataFolder("cache", "libraries"));
|
||||||
if (!message.startsWith("Loaded library ")) return;
|
|
||||||
getLogger().info(message.formatted(args));
|
|
||||||
})
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void enable() {
|
private void enable() {
|
||||||
instance = this;
|
|
||||||
services = new KMap<>();
|
services = new KMap<>();
|
||||||
setupAudience();
|
setupAudience();
|
||||||
Bindings.setupSentry();
|
Bindings.setupSentry();
|
||||||
|
@ -23,6 +23,7 @@ import com.volmit.iris.Iris;
|
|||||||
import com.volmit.iris.util.io.IO;
|
import com.volmit.iris.util.io.IO;
|
||||||
import com.volmit.iris.util.json.JSONException;
|
import com.volmit.iris.util.json.JSONException;
|
||||||
import com.volmit.iris.util.json.JSONObject;
|
import com.volmit.iris.util.json.JSONObject;
|
||||||
|
import com.volmit.iris.util.misc.SlimJar;
|
||||||
import com.volmit.iris.util.misc.getHardware;
|
import com.volmit.iris.util.misc.getHardware;
|
||||||
import com.volmit.iris.util.plugin.VolmitSender;
|
import com.volmit.iris.util.plugin.VolmitSender;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
@ -86,6 +87,7 @@ public class IrisSettings {
|
|||||||
Iris.error("Configuration Error in settings.json! " + ee.getClass().getSimpleName() + ": " + ee.getMessage());
|
Iris.error("Configuration Error in settings.json! " + ee.getClass().getSimpleName() + ": " + ee.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
SlimJar.debug(settings.general.debug);
|
||||||
|
|
||||||
return settings;
|
return settings;
|
||||||
}
|
}
|
||||||
|
58
core/src/main/java/com/volmit/iris/util/misc/SlimJar.java
Normal file
58
core/src/main/java/com/volmit/iris/util/misc/SlimJar.java
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
package com.volmit.iris.util.misc;
|
||||||
|
|
||||||
|
import io.github.slimjar.app.builder.ApplicationBuilder;
|
||||||
|
import io.github.slimjar.logging.ProcessLogger;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
|
public class SlimJar {
|
||||||
|
private static final Logger LOGGER = Logger.getLogger("Iris");
|
||||||
|
private static final ReentrantLock lock = new ReentrantLock();
|
||||||
|
private static final AtomicBoolean loaded = new AtomicBoolean();
|
||||||
|
|
||||||
|
public static void debug(boolean debug) {
|
||||||
|
LOGGER.setLevel(debug ? Level.FINE : Level.INFO);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void load(@Nullable File localRepository) {
|
||||||
|
if (loaded.get()) return;
|
||||||
|
lock.lock();
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (loaded.getAndSet(true)) return;
|
||||||
|
if (localRepository == null) {
|
||||||
|
localRepository = new File(".iris/libraries");
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGGER.info("Loading libraries...");
|
||||||
|
ApplicationBuilder.appending("Iris")
|
||||||
|
.downloadDirectoryPath(localRepository.toPath())
|
||||||
|
.logger(new ProcessLogger() {
|
||||||
|
@Override
|
||||||
|
public void info(@NotNull String message, @Nullable Object... args) {
|
||||||
|
LOGGER.fine(message.formatted(args));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void error(@NotNull String message, @Nullable Object... args) {
|
||||||
|
LOGGER.severe(message.formatted(args));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void debug(@NotNull String message, @Nullable Object... args) {
|
||||||
|
LOGGER.fine(message.formatted(args));
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.build();
|
||||||
|
LOGGER.info("Libraries loaded successfully!");
|
||||||
|
} finally {
|
||||||
|
lock.unlock();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -5,7 +5,7 @@
|
|||||||
[versions]
|
[versions]
|
||||||
# Plugins
|
# Plugins
|
||||||
shadow = "9.0.0-rc1" # https://plugins.gradle.org/plugin/com.gradleup.shadow
|
shadow = "9.0.0-rc1" # https://plugins.gradle.org/plugin/com.gradleup.shadow
|
||||||
slimjar = "2.0.6" # https://plugins.gradle.org/plugin/de.crazydev22.slimjar
|
slimjar = "2.0.7" # https://plugins.gradle.org/plugin/de.crazydev22.slimjar
|
||||||
download = "5.6.0" # https://plugins.gradle.org/plugin/de.undercouch.download
|
download = "5.6.0" # https://plugins.gradle.org/plugin/de.undercouch.download
|
||||||
runPaper = "2.3.1" # https://plugins.gradle.org/plugin/xyz.jpenilla.run-paper
|
runPaper = "2.3.1" # https://plugins.gradle.org/plugin/xyz.jpenilla.run-paper
|
||||||
sentryPlugin = "5.8.0" # https://github.com/getsentry/sentry-android-gradle-plugin
|
sentryPlugin = "5.8.0" # https://github.com/getsentry/sentry-android-gradle-plugin
|
||||||
|
Loading…
x
Reference in New Issue
Block a user