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

[web] Use config compiler plugin v2
ci/woodpecker/push/docs Pipeline was successful Details
ci/woodpecker/push/jfmod Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2022-12-29 13:18:59 +01:00
parent 87591ecc67
commit 05de1a67dd
Signed by: Johannes
GPG Key ID: E76429612C2929F4
5 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libjf-config-compiler-plugin-v2/build.gradle.kts
View File

@ -18,7 +18,7 @@ repositories {
dependencies {
implementation("io.gitlab.jfronny.gson:gson-compile-processor-core:${prop("gson_compile_version")}")
implementation(project(":libjf-config-core-v1")) { isTransitive = false }
implementation(devProject(":libjf-config-core-v1"))
implementation("org.jetbrains:annotations:23.0.0")
implementation("io.gitlab.jfronny:commons:${prop("commons_version")}")
implementation("io.gitlab.jfronny:commons-gson:${prop("commons_version")}")

3
libjf-config-compiler-plugin-v2/src/main/java/io/gitlab/jfronny/libjf/config/plugin/ConfigProcessor.java
View File

@ -4,8 +4,7 @@ import com.squareup.javapoet.*;
import io.gitlab.jfronny.commons.StringFormatter;
import io.gitlab.jfronny.commons.throwable.Coerce;
import io.gitlab.jfronny.gson.compile.processor.core.*;
import io.gitlab.jfronny.gson.compile.processor.core.value.*;
import io.gitlab.jfronny.gson.compile.processor.core.value.Properties;
import io.gitlab.jfronny.gson.compile.processor.core.value.ElementException;
import io.gitlab.jfronny.gson.reflect.TypeToken;
import io.gitlab.jfronny.libjf.config.api.v1.*;
import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL;

6
libjf-web-v0/build.gradle.kts
View File

@ -8,4 +8,10 @@ dependencies {
api(devProject(":libjf-base"))
api(devProject(":libjf-config-core-v1"))
include(modImplementation(fabricApi.module("fabric-command-api-v2", prop("fabric_version")))!!)
annotationProcessor(project(":libjf-config-compiler-plugin-v2"))
}
tasks.compileJava {
options.compilerArgs.add("-AmodId=" + base.archivesName.get())
}

25
libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWebConfig.java
View File

@ -2,17 +2,17 @@ package io.gitlab.jfronny.libjf.web.impl;
import io.gitlab.jfronny.libjf.LibJf;
import io.gitlab.jfronny.libjf.config.api.v1.*;
import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL;
import java.io.IOException;
import java.net.ServerSocket;
public class JfWebConfig implements JfCustomConfig {
public static String serverIp = "http://127.0.0.1";
public static int port = 0;
public static int portOverride = -1;
public static int maxConnections = 20;
public static boolean enableFileHost = false;
@JfConfig
public class JfWebConfig {
@Entry public static String serverIp = "http://127.0.0.1";
@Entry(min = 0, max = 35535) public static int port = 0;
@Entry(min = -1, max = 35535) public static int portOverride = -1;
@Entry(min = 8, max = 64) public static int maxConnections = 20;
@Entry public static boolean enableFileHost = false;
public static void ensureValidPort() {
if (port == 0) {
@ -24,15 +24,4 @@ public class JfWebConfig implements JfCustomConfig {
ConfigHolder.getInstance().getRegistered().get("libjf-web-v0").write();
}
}
@Override
public void register(DSL.Defaulted dsl) {
dsl.register(b -> b
.value("serverIp", serverIp, () -> serverIp, v -> serverIp = v)
.value("port", port, 0, 35535, () -> port, v -> port = v)
.value("portOverride", portOverride, -1, 35535, () -> portOverride, v -> portOverride = v)
.value("maxConnections", maxConnections, 8, 64, () -> maxConnections, v -> maxConnections = v)
.value("enableFileHost", enableFileHost, () -> enableFileHost, v -> enableFileHost = v)
);
}
}

2
libjf-web-v0/src/main/resources/fabric.mod.json
View File

@ -17,7 +17,7 @@
"entrypoints": {
"main": ["io.gitlab.jfronny.libjf.web.impl.JfWeb"],
"libjf:coprocess": ["io.gitlab.jfronny.libjf.web.impl.JfWeb"],
"libjf:config": ["io.gitlab.jfronny.libjf.web.impl.JfWebConfig"]
"libjf:config": ["io.gitlab.jfronny.libjf.web.impl.JFC_JfWebConfig"]
},
"depends": {
"fabricloader": ">=0.12.0",