From 9431b6356b55dc2f02f59c86521fdf4d11c204f5 Mon Sep 17 00:00:00 2001
From: JFronny <jo.frohnmeyer@protonmail.com>
Date: Fri, 19 Nov 2021 15:23:07 +0100
Subject: [PATCH] Update to pre4

---
 build.gradle                                  |  2 +-
 gradle.properties                             |  6 ++--
 .../jfronny/libjf/devutil/NoOpUserApi.java    | 20 ++-----------
 .../gitlab/jfronny/libjf/web/impl/JfWeb.java  | 29 +++----------------
 4 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/build.gradle b/build.gradle
index 14c40d4..f7fccc3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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 {
diff --git a/gradle.properties b/gradle.properties
index 320d0e6..75083f8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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
diff --git a/libjf-devutil-v0/src/main/java/io/gitlab/jfronny/libjf/devutil/NoOpUserApi.java b/libjf-devutil-v0/src/main/java/io/gitlab/jfronny/libjf/devutil/NoOpUserApi.java
index b84b0f1..93dd6fd 100644
--- a/libjf-devutil-v0/src/main/java/io/gitlab/jfronny/libjf/devutil/NoOpUserApi.java
+++ b/libjf-devutil-v0/src/main/java/io/gitlab/jfronny/libjf/devutil/NoOpUserApi.java
@@ -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
diff --git a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWeb.java b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWeb.java
index f34765e..274ce43 100644
--- a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWeb.java
+++ b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWeb.java
@@ -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());
         }
     }