JfMods/LibJF
JfMods
/
LibJF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[base] Upgrade commons

This commit is contained in:
Johannes Frohnmeyer 2022-09-15 14:57:26 +02:00
parent dbd0328b17
commit a45dd04faa
Signed by: Johannes
GPG Key ID: E76429612C2929F4
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -15,7 +15,7 @@ curseforge_id=482600
curseforge_optional_dependencies=fabric-api
fabric_version=0.60.0+1.19.2
commons_version=2022.7.4+11-13-3
commons_version=2022.9.15+12-51-21
modmenu_version=4.0.6
asm_version=9.3

8
libjf-base/src/main/java/io/gitlab/jfronny/libjf/LibJf.java
View File

@ -1,8 +1,7 @@
package io.gitlab.jfronny.libjf;
import io.gitlab.jfronny.commons.log.Logger;
import io.gitlab.jfronny.commons.log.*;
import io.gitlab.jfronny.commons.serialize.gson.api.GsonHolder;
import io.gitlab.jfronny.gson.GsonBuilder;
import io.gitlab.jfronny.libjf.gson.GsonAdapter;
import io.gitlab.jfronny.libjf.gson.HiddenAnnotationExclusionStrategy;
import net.fabricmc.api.ModInitializer;
@ -13,7 +12,7 @@ public class LibJf implements ModInitializer {
public static final Logger LOGGER = Logger.forName(MOD_ID);
static {
GsonHolder.modifyBuilder((final GsonBuilder builder) -> {
GsonHolder.modifyBuilder(builder -> {
builder.serializeSpecialFloatingPointValues();
builder.setOmitQuotes();
for (GsonAdapter adapter : FabricLoader.getInstance().getEntrypoints(MOD_ID + ":gson_adapter", GsonAdapter.class)) {
@ -26,6 +25,7 @@ public class LibJf implements ModInitializer {
@Override
public void onInitialize() {
Logger.resetFactory();
Logger.registerFactory(SLF4JLogger::new);
Logger.setMinimumLevel(FabricLoader.getInstance().isDevelopmentEnvironment() ? Level.TRACE : Level.INFO);
}
}

4
libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/JfLanguageAdapter.java
View File

@ -1,7 +1,8 @@
package io.gitlab.jfronny.libjf.unsafe;
import io.gitlab.jfronny.commons.log.Logger;
import io.gitlab.jfronny.commons.log.*;
import io.gitlab.jfronny.libjf.LibJf;
import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.LanguageAdapter;
public class JfLanguageAdapter implements LanguageAdapter {
@ -10,6 +11,7 @@ public class JfLanguageAdapter implements LanguageAdapter {
static {
Logger.registerFactory(FLLogger::new); // Reset in LibJf entrypoint
Logger.setMinimumLevel(FabricLoader.getInstance().isDevelopmentEnvironment() ? Level.TRACE : Level.INFO);
LibJf.LOGGER.info("Starting unsafe init"); // Also ensures LibJF.<clinit> is called and Gson is initialized
DynamicEntry.execute("libjf:preEarly", UltraEarlyInit.class, s -> s.instance().init());
DynamicEntry.execute("libjf:early", UltraEarlyInit.class, s -> s.instance().init());