Merge branch 'gui'

KasugaLibGroup · Nov 30, 2024 · e687697 · e687697
2 parents 84c6e57 + 0bd0529
commit e687697
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 13 deletions.
diff --git a/src/main/java/kasuga/lib/core/addons/node/AssetReader.java b/src/main/java/kasuga/lib/core/addons/node/AssetReader.java
@@ -47,16 +47,18 @@ public String apply(String path, String resourceType){
                     )
             );
         }
-        path = PackageScanner.joinPath(
-                PackageScanner.resolve(
-                        PackageScanner.splitPath(
-                                assetRoot
-                        ),
-                        PackageScanner.splitPath(
-                                path
-                        )
-                )
-        );
+        if(assetRoot != null && !assetRoot.equals("")){
+            path = PackageScanner.joinPath(
+                    PackageScanner.resolve(
+                            PackageScanner.splitPath(
+                                    assetRoot
+                            ),
+                            PackageScanner.splitPath(
+                                    path
+                            )
+                    )
+            );
+        }
         UUID uuid;
         do{
             uuid = UUID.randomUUID();

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,6 +55,9 @@ protected void createRuntime(NodePackage nodePackage){
             case CLIENT:
                 createRuntimeForEntryType(nodePackage, nodePackage.minecraft.commonEntries());
                 createRuntimeForEntryType(nodePackage, nodePackage.minecraft.clientEntries());
+            case SERVER:
+                createRuntimeForEntryType(nodePackage, nodePackage.minecraft.commonEntries());
+                createRuntimeForEntryType(nodePackage, nodePackage.minecraft.serverEntries());
         }
     }
 

diff --git a/src/main/java/kasuga/lib/core/channel/network/NetworkDuplexer.java b/src/main/java/kasuga/lib/core/channel/network/NetworkDuplexer.java
@@ -5,6 +5,7 @@
 import kasuga.lib.core.channel.peer.ChannelStatus;
 import net.minecraft.nbt.CompoundTag;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -65,7 +66,8 @@ public void onExistedConnectionEstablished(long networkId, NetworkChannelSocket
     }
 
     public void close(){
-        for(Channel channel : channels.values()){
+        ArrayList<Channel> currentChannels = new ArrayList<>(channels.values());
+        for(Channel channel : currentChannels){
             channel.close();
         }
         channels.clear();

diff --git a/src/main/java/kasuga/lib/core/client/frontend/commands/MetroModuleLoader.java b/src/main/java/kasuga/lib/core/client/frontend/commands/MetroModuleLoader.java
@@ -107,7 +107,7 @@ protected JavascriptEngineModule load(
                     javascriptContext,
                     moduleInfo.getProvider(),
                     KasugaLib.STACKS.JAVASCRIPT.ASSETS.get(),
-                    "/"));
+                    ""));
             return module;
 
         }catch (IOException e){

diff --git a/src/main/java/kasuga/lib/core/events/server/ServerStartingEvents.java b/src/main/java/kasuga/lib/core/events/server/ServerStartingEvents.java
@@ -1,5 +1,7 @@
 package kasuga.lib.core.events.server;
 
+import kasuga.lib.KasugaLib;
+import kasuga.lib.core.addons.minecraft.ServerAddon;
 import kasuga.lib.core.util.Start;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.dedicated.DedicatedServer;
@@ -17,6 +19,8 @@ public class ServerStartingEvents {
     public static void serverStarting(ServerStartingEvent event) {
         MinecraftServer server = event.getServer();
         CloseableResourceManager manager = server.getServerResources().resourceManager();
+        KasugaLib.STACKS.JAVASCRIPT.setupServer();
+        ServerAddon.init(event.getServer());
     }
 
     @SubscribeEvent
@@ -26,4 +30,9 @@ 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/engine/javet/JavetJavascriptModule.java b/src/main/java/kasuga/lib/core/javascript/engine/javet/JavetJavascriptModule.java
@@ -38,7 +38,7 @@ public JavetJavascriptModule(
               context,
               nodePackage.reader,
               KasugaLib.STACKS.JAVASCRIPT.ASSETS.get(),
-              nodePackage.minecraft.assetsFolder()
+              nodePackage.minecraft != null ? nodePackage.minecraft.assetsFolder() : ""
       ): null, absolutePath, directoryName, context);
     }
     public JavetJavascriptModule(

diff --git a/src/main/java/kasuga/lib/core/menu/javascript/JavascriptMenu.java b/src/main/java/kasuga/lib/core/menu/javascript/JavascriptMenu.java
@@ -103,6 +103,9 @@ public void reload() {
                 openJavascriptServer();
             });
         } else {
+            for(ChannelHandle handle : handles.values()){
+                handle.close();
+            }
             openJavascriptServer();
         }
     }