Merge branch 'gui'

KasugaLibGroup · Dec 2, 2024 · 599c8b9 · 599c8b9
2 parents 20d13ef + b38f945
commit 599c8b9
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 15 deletions.
diff --git a/src/main/java/kasuga/lib/core/KasugaLibStacks.java b/src/main/java/kasuga/lib/core/KasugaLibStacks.java
@@ -101,6 +101,7 @@ public KasugaLibStacks(IEventBus bus) {
 
             MinecraftForge.EVENT_BUS.addListener(PlayLogEvent::playerLogout);
             MinecraftForge.EVENT_BUS.addListener(PlayLogEvent::playerLogin);
+            MinecraftForge.EVENT_BUS.addListener(ClientConnection::onClientConnect);
             MinecraftForge.EVENT_BUS.addListener(ClientConnection::onClientDisconnect);
 
             bus.addListener(ModelRegistryEvent::registerAdditionalModels);

diff --git a/src/main/java/kasuga/lib/core/addons/node/NodePackageLoader.java b/src/main/java/kasuga/lib/core/addons/node/NodePackageLoader.java
@@ -55,9 +55,11 @@ protected void createRuntime(NodePackage nodePackage){
             case CLIENT:
                 createRuntimeForEntryType(nodePackage, nodePackage.minecraft.commonEntries());
                 createRuntimeForEntryType(nodePackage, nodePackage.minecraft.clientEntries());
+                break;
             case SERVER:
                 createRuntimeForEntryType(nodePackage, nodePackage.minecraft.commonEntries());
                 createRuntimeForEntryType(nodePackage, nodePackage.minecraft.serverEntries());
+                break;
         }
     }
 

diff --git a/src/main/java/kasuga/lib/core/channel/ChannelNetworkManager.java b/src/main/java/kasuga/lib/core/channel/ChannelNetworkManager.java
@@ -17,6 +17,7 @@ public class ChannelNetworkManager {
     public HashMap<ServerPlayer, NetworkServerManager> SERVER = new HashMap<>();
     public SimpleRouter CLIENT_ROUTER = new SimpleRouter();
     public NetworkManager CLIENT = new NetworkManager(CLIENT_ROUTER);
+    private boolean clientConnectionExisted = false;
 
     public NetworkManager server(ServerPlayer player){
         return SERVER.computeIfAbsent(player, k -> new NetworkServerManager(SERVER_ROUTER, player));
@@ -41,4 +42,16 @@ public void reloadClient(){
     public NetworkManager client(){
         return CLIENT;
     }
+
+    public void disableClient() {
+        this.clientConnectionExisted = false;
+    }
+
+    public void enableClient() {
+        this.clientConnectionExisted = true;
+    }
+
+    public boolean clientIsEnabled() {
+        return clientConnectionExisted;
+    }
 }
diff --git a/src/main/java/kasuga/lib/core/channel/network/NetworkDuplexer.java b/src/main/java/kasuga/lib/core/channel/network/NetworkDuplexer.java
@@ -7,6 +7,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 
 public class NetworkDuplexer {
@@ -66,7 +67,7 @@ public void onExistedConnectionEstablished(long networkId, NetworkChannelSocket
     }
 
     public void close(){
-        ArrayList<Channel> currentChannels = new ArrayList<>(channels.values());
+        List<Channel> currentChannels = List.copyOf(channels.values());
         for(Channel channel : currentChannels){
             channel.close();
         }

diff --git a/src/main/java/kasuga/lib/core/channel/network/NetworkManager.java b/src/main/java/kasuga/lib/core/channel/network/NetworkManager.java
@@ -98,6 +98,10 @@ public void sendClose(NetworkChannelSocket socket) {
     }
 
     protected void sendNetworkConnecitonPacket(Channel channel, long networkId) {
+        if(!KasugaLib.STACKS.CHANNEL.clientIsEnabled()){
+            channel.close();
+            return;
+        }
         KasugaLib.STACKS.CHANNEL.packet.channelReg.sendToServer(new C2SChannelConnectionPacket(
                 channel.source(),
                 channel.destination(),
@@ -106,12 +110,16 @@ protected void sendNetworkConnecitonPacket(Channel channel, long networkId) {
     }
 
     protected void sendMessagePacket(long networkId, CompoundTag message, boolean isOwn){
+        if(!KasugaLib.STACKS.CHANNEL.clientIsEnabled())
+            return;
         KasugaLib.STACKS.CHANNEL.packet.channelReg.sendToServer(
                 new C2SChannelMessagePacket(networkId, message, isOwn)
         );
     }
 
     protected void sendStatePacket(long networkId, ChannelStatus state, boolean isOwn){
+        if(!KasugaLib.STACKS.CHANNEL.clientIsEnabled())
+            return;
         KasugaLib.STACKS.CHANNEL.packet.channelReg.sendToServer(
                 new C2SChannelStateChangePacket(networkId, state, isOwn)
         );

diff --git a/src/main/java/kasuga/lib/core/events/client/ClientConnection.java b/src/main/java/kasuga/lib/core/events/client/ClientConnection.java
@@ -5,7 +5,12 @@
 import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
 
 public class ClientConnection {
+
+    public static void onClientConnect(ClientPlayerNetworkEvent.LoggingIn loggingIn){
+        KasugaLib.STACKS.CHANNEL.enableClient();
+    }
     public static void onClientDisconnect(ClientPlayerNetworkEvent.LoggingOut loggingOut){
+        KasugaLib.STACKS.CHANNEL.disableClient();
         KasugaLib.STACKS.CHANNEL.reloadClient();
     }
 }
diff --git a/src/main/java/kasuga/lib/core/events/server/ServerStartingEvents.java b/src/main/java/kasuga/lib/core/events/server/ServerStartingEvents.java
@@ -16,12 +16,7 @@
 public class ServerStartingEvents {
 
     @SubscribeEvent
-    public static void serverStarting(ServerStartingEvent event) {
-        MinecraftServer server = event.getServer();
-        CloseableResourceManager manager = server.getServerResources().resourceManager();
-        KasugaLib.STACKS.JAVASCRIPT.setupServer();
-        ServerAddon.init(event.getServer());
-    }
+    public static void serverStarting(ServerStartingEvent event) {}
 
     @SubscribeEvent
     public static void serverAboutToStart(ServerAboutToStartEvent event) {
@@ -30,9 +25,4 @@ public static void serverAboutToStart(ServerAboutToStartEvent event) {
             Start.printLogo();
         }
     }
-
-    public static void serverStopping(ServerStoppingEvent event) {
-        ServerAddon.unload();
-        KasugaLib.STACKS.JAVASCRIPT.destoryServer();
-    }
 }
diff --git a/src/main/java/kasuga/lib/core/javascript/JavascriptContext.java b/src/main/java/kasuga/lib/core/javascript/JavascriptContext.java
@@ -10,6 +10,7 @@
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.FutureTask;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -37,9 +38,10 @@ public void close(){
         effect.close();
     }
 
-    Set<Tickable> tickables = new HashSet<>();
+    Set<Tickable> tickables = new CopyOnWriteArraySet<>();
 
     public void tick(){
+        List<Tickable> tickables = List.copyOf(this.tickables); // @TODO: Improve performance
         tickables.forEach(Tickable::tick);
         this.context.tick();
     }

diff --git a/src/main/java/kasuga/lib/core/menu/GuiMenuManager.java b/src/main/java/kasuga/lib/core/menu/GuiMenuManager.java
@@ -112,4 +112,12 @@ public void clientTick(){
             menu.clientTick();
         }
     }
+
+    public void reset(){
+        List<GuiMenu> menus = List.copyOf(tickables);
+        for(GuiMenu menu : menus){
+            menu.close();
+        }
+        tickables.clear();
+    }
 }
diff --git a/src/main/java/kasuga/lib/core/menu/base/GuiMenu.java b/src/main/java/kasuga/lib/core/menu/base/GuiMenu.java
@@ -14,7 +14,9 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.DistExecutor;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
 
 public class GuiMenu {
@@ -124,6 +126,10 @@ private ChannelHandler createClientHandler() {
             @Override
             public void onChannelEstabilished(ChannelHandle channel) {
                 connectionFailure = false;
+                if(!isDifferentiated){
+                    channel.close();
+                    return;
+                }
                 setChannelHandle(channel);
                 createGuiInstance();
             }
@@ -139,6 +145,10 @@ public void onChannelClose(ChannelHandle channel) {
 
             @Override
             public void onChannelMessage(ChannelHandle channel, CompoundTag payload) {
+                if(!isDifferentiated){
+                    channel.close();
+                    return;
+                }
                 clientForwardMessageToGuiInstance(payload);
             }
         };
@@ -148,6 +158,10 @@ private ChannelHandler createServerHandler(Channel channel){
         return new ChannelHandler() {
             @Override
             public void onChannelEstabilished(ChannelHandle handle) {
+                if(!isDifferentiated || !isServer){
+                    channel.close();
+                    return;
+                }
                 handles.put(channel, handle);
                 onInit(channel, handle);
             }
@@ -186,14 +200,24 @@ public void onMesssage(Channel channel, ChannelHandle handle, CompoundTag payloa
     public void close(){
         KasugaLib.STACKS.MENU.removeMenuTickInstance(this);
         if(isDifferentiated){
+            isDifferentiated = false;
+            isServer = false;
             if(isServer){
-                for(ChannelHandle handle : handles.values()){
+                List<ChannelHandle> handles$value = List.copyOf(handles.values());
+                for(ChannelHandle handle : handles$value){
                     handle.close();
                 }
+                GuiMenuNetworking.getServerSwitcher().removePeer(peer);
             }else{
+                connectionFailure = false;
+                reconnection = 20;
+                if(isGuiInstanceCreated){
+                    closeGuiInstance();
+                }
                 if(handle != null){
                     handle.close();
                 }
+                GuiMenuNetworking.getClientSwitcher().removePeer(peer);
             }
         }
     }
@@ -224,16 +248,18 @@ public UUID getServerId() {
         return serverId;
     }
 
-
     int reconnection = 0;
     public void clientTick(){
         if(isDifferentiated && !isServer){
             if(connectionFailure){
                 if(--reconnection > 0){
                     return;
                 }
+                reconnection = 20;
                 connectionFailure = false;
                 peer.createSocket(remoteInfo, this.createClientHandler());
+            } else {
+                reconnection = 20;
             }
         }
     }

diff --git a/src/main/java/kasuga/lib/core/menu/locator/GuiMenuHolder.java b/src/main/java/kasuga/lib/core/menu/locator/GuiMenuHolder.java
@@ -47,6 +47,8 @@ public void enableClient(MenuLocator locator) {
     }
 
     public void enable(LevelAccessor level) {
+        if(isEnabled)
+            return;
         if(level.isClientSide()) {
             enableClient(locator);
         } else {