Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21-lts

Author: rubensworks

CHANGELOG-1.19.2.md

@@ -1,8 +1,18 @@
 # Changelog for Minecraft 1.19.2
 All notable changes to this project will be documented in this file.
 
+<a name="1.19.2-1.6.13"></a>
+## [1.19.2-1.6.13](/compare/1.19.2-1.6.12...1.19.2-1.6.13) - 2025-11-16 15:22:42
+
+
+### Fixed
+* Fix serialize threads not closing after terminal is closed
+  This makes sure that thread pools are localized per container, and
+  is closed once the container is closed.
+  Closes #185
+
 <a name="1.19.2-1.6.12"></a>
-## [1.19.2-1.6.12](/compare/1.19.2-1.6.11...1.19.2-1.6.12) - 2025-11-11 14:55:56
+## [1.19.2-1.6.12](/compare/1.19.2-1.6.11...1.19.2-1.6.12) - 2025-11-11 14:55:56 +0100
 
 
 ### Fixed

CHANGELOG-1.20.1.md

@@ -1,8 +1,18 @@
 # Changelog for Minecraft 1.20.1
 All notable changes to this project will be documented in this file.
 
+<a name="1.20.1-1.6.13"></a>
+## [1.20.1-1.6.13](/compare/1.20.1-1.6.12...1.20.1-1.6.13) - 2025-11-16 15:28:48
+
+
+### Fixed
+* Fix serialize threads not closing after terminal is closed
+  This makes sure that thread pools are localized per container, and
+  is closed once the container is closed.
+  Closes #185
+
 <a name="1.20.1-1.6.12"></a>
-## [1.20.1-1.6.12](/compare/1.20.1-1.6.11...1.20.1-1.6.12) - 2025-11-11 15:05:04
+## [1.20.1-1.6.12](/compare/1.20.1-1.6.11...1.20.1-1.6.12) - 2025-11-11 15:05:04 +0100
 
 
 ### Fixed

resources/changelog/1.19.2-1.6.13.txt

@@ -0,0 +1,8 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Fixes:
+* Fix serialize threads not closing after terminal is closed
+  This makes sure that thread pools are localized per container, and
+  is closed once the container is closed.
+  Closes #185

resources/changelog/1.20.1-1.6.13.txt

@@ -0,0 +1,8 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Fixes:
+* Fix serialize threads not closing after terminal is closed
+  This makes sure that thread pools are localized per container, and
+  is closed once the container is closed.
+  Closes #185

src/main/java/org/cyclops/integratedterminals/IntegratedTerminals.java

@@ -7,8 +7,6 @@
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.neoforged.neoforge.event.server.ServerStartingEvent;
-import net.neoforged.neoforge.event.server.ServerStoppingEvent;
 import net.neoforged.neoforge.registries.NewRegistryEvent;
 import org.apache.logging.log4j.Level;
 import org.cyclops.cyclopscore.config.ConfigHandler;
@@ -28,7 +26,6 @@
 import org.cyclops.integratedterminals.capability.ingredient.TerminalIngredientComponentCapabilities;
 import org.cyclops.integratedterminals.component.DataComponentTerminalStorageInventoriesConfig;
 import org.cyclops.integratedterminals.component.DataComponentTerminalStorageStateConfig;
-import org.cyclops.integratedterminals.core.terminalstorage.TerminalStorageTabIngredientComponentServer;
 import org.cyclops.integratedterminals.core.terminalstorage.TerminalStorageTabRegistry;
 import org.cyclops.integratedterminals.core.terminalstorage.TerminalStorageTabs;
 import org.cyclops.integratedterminals.core.terminalstorage.crafting.TerminalStorageTabIngredientCraftingHandlerRegistry;
@@ -42,9 +39,6 @@
 import org.cyclops.integratedterminals.proxy.ClientProxy;
 import org.cyclops.integratedterminals.proxy.CommonProxy;
 
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
 /**
  * The main mod class of this mod.
  * @author rubensworks (aka kroeserr)
@@ -141,23 +135,6 @@ protected ICommonProxy constructCommonProxy() {
         return new CommonProxy();
     }
 
-    public void onServerStarting(ServerStartingEvent event) {
-        TerminalStorageTabIngredientComponentServer.PACKET_SERIALIZER = Executors.newFixedThreadPool(1);
-    }
-
-    public void onServerStopping(ServerStoppingEvent event) {
-        TerminalStorageTabIngredientComponentServer.PACKET_SERIALIZER.shutdown();
-        try {
-            if (!TerminalStorageTabIngredientComponentServer.PACKET_SERIALIZER.awaitTermination(5, TimeUnit.SECONDS)) {
-                TerminalStorageTabIngredientComponentServer.PACKET_SERIALIZER.shutdownNow();
-            }
-        } catch (InterruptedException ex) {
-            TerminalStorageTabIngredientComponentServer.PACKET_SERIALIZER.shutdownNow();
-            Thread.currentThread().interrupt();
-        }
-        TerminalStorageTabIngredientComponentServer.PACKET_SERIALIZER = null;
-    }
-
     /**
      * Log a new info message for this mod.
      * @param message The message to show.

src/main/java/org/cyclops/integratedterminals/core/terminalstorage/TerminalStorageTabIngredientComponentServer.java

@@ -67,8 +67,7 @@
 public class TerminalStorageTabIngredientComponentServer<T, M> implements ITerminalStorageTabServer,
         IIngredientComponentStorageObservable.IIndexChangeObserver<T, M> {
 
-    public static ExecutorService PACKET_SERIALIZER = Executors.newFixedThreadPool(1);
-
+    private final ExecutorService packetSerializer = Executors.newFixedThreadPool(1);
     private final ResourceLocation name;
     private final INetwork network;
     private final IngredientComponent<T, M> ingredientComponent;
@@ -165,6 +164,7 @@ protected void initChannel(int channel) {
 
     @Override
     public void deInit() {
+        this.packetSerializer.shutdownNow();
         this.ingredientNetwork.removeObserver(this);
     }
 
@@ -367,7 +367,7 @@ protected void sendToClient(IIngredientComponentStorageObservable.StorageChangeE
 
             for (IngredientArrayList<T, M> chunk : chunks) {
                 if (GeneralConfig.packetSerializationEnableMultithreading) {
-                    PACKET_SERIALIZER.execute(() -> sendToClient(new IIngredientComponentStorageObservable.StorageChangeEvent<>(
+                    packetSerializer.execute(() -> sendToClient(new IIngredientComponentStorageObservable.StorageChangeEvent<>(
                             event.getChannel(), event.getPos(), event.getChangeType(), event.isCompleteChange(), chunk, false
                     )));
                 } else {
@@ -407,7 +407,7 @@ private void sendCraftingOptionsToClient(int channel, Collection<HandlerWrappedT
 
             for (Pair<Boolean, List<HandlerWrappedTerminalCraftingOption<T>>> chunk : chunks) {
                 if (GeneralConfig.packetSerializationEnableMultithreading) {
-                    PACKET_SERIALIZER.execute(() -> sendCraftingOptionsToClient(channel, chunk.getRight(), chunk.getLeft(), firstChannel));
+                    packetSerializer.execute(() -> sendCraftingOptionsToClient(channel, chunk.getRight(), chunk.getLeft(), firstChannel));
                 } else {
                     sendCraftingOptionsToClient(channel, chunk.getRight(), chunk.getLeft(), firstChannel);
                 }