mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-19 23:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make logging actually work

Browse Source 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
This commit is contained in:
solonovamax
2021-11-21 19:18:00 -05:00
parent 9d30130f85
commit dd259c4d8f
12 changed files with 85 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java
View File

@@ -94,45 +94,18 @@ public abstract class AbstractPlatform implements Platform {
private final Registry<BaseAddon> lockedAddonRegistry = new LockedRegistryImpl<>(addonRegistry);
@Override
public void register(TypeRegistry registry) {
loaders.register(registry);
public ConfigRegistry getRawConfigRegistry() {
return configRegistry;
}
@Override
public PluginConfig getTerraConfig() {
return config;
}
@Override
public Language getLanguage() {
return LangUtil.getLanguage();
}
@Override
public CheckedRegistry<ConfigPack> getConfigRegistry() {
return checkedConfigRegistry;
}
@Override
public Registry<BaseAddon> getAddons() {
return lockedAddonRegistry;
}
@Override
public EventManager getEventManager() {
return eventManager;
public CommandManager getManager() {
return manager;
}
protected Optional<BaseAddon> platformAddon() {
return Optional.empty();
}
@Override
public Profiler getProfiler() {
return profiler;
}
protected void load() {
if(LOADED.get()) {
throw new IllegalStateException(
@@ -257,11 +230,38 @@ public abstract class AbstractPlatform implements Platform {
return Optional.empty();
}
public ConfigRegistry getRawConfigRegistry() {
return configRegistry;
@Override
public void register(TypeRegistry registry) {
loaders.register(registry);
}
public CommandManager getManager() {
return manager;
@Override
public PluginConfig getTerraConfig() {
return config;
}
@Override
public Language getLanguage() {
return LangUtil.getLanguage();
}
@Override
public CheckedRegistry<ConfigPack> getConfigRegistry() {
return checkedConfigRegistry;
}
@Override
public Registry<BaseAddon> getAddons() {
return lockedAddonRegistry;
}
@Override
public EventManager getEventManager() {
return eventManager;
}
@Override
public Profiler getProfiler() {
return profiler;
}
}

1
common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
View File

@@ -33,7 +33,6 @@ import java.io.UncheckedIOException;
import java.time.Duration;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.util.Logger;
@SuppressWarnings("FieldMayBeFinal")

1
common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
View File

@@ -29,7 +29,6 @@ import java.util.Objects;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.lang.Language;
import com.dfsek.terra.api.util.Logger;
public final class LangUtil {

4
common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java
View File

@@ -65,8 +65,8 @@ public class FunctionalEventHandlerImpl implements FunctionalEventHandler {
if(context.isFailThrough() && event instanceof FailThroughEvent)
throw e; // Rethrow if it's fail-through.
// else warn
logger.warn("Exception occurred during event handling. Report this to the maintainers of {}, {}",
context.getAddon().getID(), context.getAddon().getAuthor(), e);
logger.warn("Exception occurred during event handling. Report this to the maintainers of {}@{}",
context.getAddon().getID(), context.getAddon().getVersion().getFormatted(), e);
}
});
}

19
common/loader/addon/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java
View File

@@ -17,6 +17,11 @@
package com.dfsek.terra.addon;
import ca.solostudios.strata.Versions;
import ca.solostudios.strata.version.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.lang.reflect.InvocationTargetException;
@@ -26,31 +31,29 @@ import java.nio.file.Path;
import java.util.jar.JarFile;
import java.util.stream.Collectors;
import ca.solostudios.strata.Versions;
import ca.solostudios.strata.version.Version;
import com.dfsek.terra.addon.exception.AddonLoadException;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon;
public class BootstrapAddonLoader implements BootstrapBaseAddon<BootstrapBaseAddon<?>> {
private final Platform platform;
private static final Logger logger = LoggerFactory.getLogger(BootstrapAddonLoader.class);
private static final Version VERSION = Versions.getVersion(1, 0, 0);
private final Platform platform;
public BootstrapAddonLoader(Platform platform) { this.platform = platform; }
@Override
public Iterable<BootstrapBaseAddon<?>> loadAddons(Path addonsFolder, ClassLoader parent) {
Path bootstrapAddons = addonsFolder.resolve("bootstrap");
platform.logger().info("Loading bootstrap addons from " + bootstrapAddons);
logger.info("Loading bootstrap addons from {}", bootstrapAddons);
try {
return Files.walk(bootstrapAddons, 1)
.filter(path -> path.toFile().isFile() && path.toString().endsWith(".jar"))
.map(path -> {
try {
platform.logger().info("Loading bootstrap addon from JAR " + path);
logger.info("Loading bootstrap addon from JAR {}", path);
JarFile jar = new JarFile(path.toFile());
String entry = jar.getManifest().getMainAttributes().getValue("Bootstrap-Addon-Entry-Point");
@@ -65,7 +68,7 @@ public class BootstrapAddonLoader implements BootstrapBaseAddon<BootstrapBaseAdd
if(!(in instanceof BootstrapBaseAddon)) {
throw new AddonLoadException(in.getClass() + " does not extend " + BootstrapBaseAddon.class);
}
platform.logger().info("Loaded bootstrap addon " + ((BootstrapBaseAddon<?>) in).getID());
logger.info("Loaded bootstrap addon {}", ((BootstrapBaseAddon<?>) in).getID());
return (BootstrapBaseAddon<?>) in;
} catch(InvocationTargetException e) {
throw new AddonLoadException("Exception occurred while instantiating addon: ", e);