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

Update to pre4

This commit is contained in:
JFronny 2021-11-19 15:23:07 +01:00
parent e6fc101712
commit 9431b6356b
No known key found for this signature in database
GPG Key ID: BEC5ACBBD4EE17E5
4 changed files with 11 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -105,7 +105,7 @@ allprojects {
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modRuntimeOnly modCompileOnly("com.terraformersmc:modmenu:2.0.14")
modRuntime("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
}
configurations {

6
gradle.properties
View File

@ -2,12 +2,12 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=1.18-pre2
yarn_mappings=build.1
minecraft_version=1.18-pre4
yarn_mappings=build.9
loader_version=0.12.5
# Mod Properties
mod_version=2.1.4
maven_group=io.gitlab.jfronny
archives_base_name=libjf
fabric_version=0.42.5+1.18
fabric_version=0.42.7+1.18

20
libjf-devutil-v0/src/main/java/io/gitlab/jfronny/libjf/devutil/NoOpUserApi.java
View File

@ -5,29 +5,15 @@ import com.mojang.authlib.minecraft.TelemetryPropertyContainer;
import com.mojang.authlib.minecraft.TelemetrySession;
import com.mojang.authlib.minecraft.UserApiService;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.Executor;
import java.util.function.Consumer;
public class NoOpUserApi implements UserApiService {
@Override
public boolean serversAllowed() {
return true;
}
@Override
public boolean realmsAllowed() {
return false;
}
@Override
public boolean chatAllowed() {
return true;
}
@Override
public boolean telemetryAllowed() {
return false;
public UserProperties properties() {
return new UserProperties(Set.of(UserFlag.CHAT_ALLOWED, UserFlag.SERVERS_ALLOWED));
}
@Override

29
libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWeb.java
View File

@ -15,11 +15,8 @@ import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.LiteralText;
import java.util.concurrent.atomic.AtomicBoolean;
public class JfWeb implements ClientModInitializer, DedicatedServerModInitializer, ModInitializer {
public static final WebServer SERVER;
private static final AtomicBoolean SERVER_STARTED = new AtomicBoolean(false);
static {
JfWebConfig.ensureValidPort();
SERVER = new JfWebServer(JfWebConfig.port, JfWebConfig.maxConnections);
@ -28,34 +25,16 @@ public class JfWeb implements ClientModInitializer, DedicatedServerModInitialize
@Override
public void onInitializeClient() {
if (isEnabled()) {
ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
if (!SERVER_STARTED.get()) {
SERVER.restart();
SERVER_STARTED.set(true);
}
});
ClientLifecycleEvents.CLIENT_STOPPING.register(client -> {
if (SERVER_STARTED.get()) {
SERVER.stop();
}
});
ClientLifecycleEvents.CLIENT_STARTED.register(client -> SERVER.restart());
ClientLifecycleEvents.CLIENT_STOPPING.register(client -> SERVER.stop());
}
}
@Override
public void onInitializeServer() {
if (isEnabled()) {
ServerLifecycleEvents.SERVER_STARTED.register(server -> {
if (!SERVER_STARTED.get()) {
SERVER.restart();
SERVER_STARTED.set(true);
}
});
ServerLifecycleEvents.SERVER_STOPPED.register(server -> {
if (SERVER_STARTED.get()) {
SERVER.stop();
}
});
ServerLifecycleEvents.SERVER_STARTED.register(server -> SERVER.restart());
ServerLifecycleEvents.SERVER_STOPPED.register(server -> SERVER.stop());
}
}