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

Author: rubensworks

CHANGELOG-1.21.1.md

@@ -1,8 +1,15 @@
 # Changelog for Minecraft 1.21.1
 All notable changes to this project will be documented in this file.
 
+<a name="1.21.1-1.4.6"></a>
+## [1.21.1-1.4.6](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.5...1.21.1-1.4.6) - 2026-04-26 13:55:40
+
+
+### Fixed
+* Fix channel mixup in crafting interface settings
+
 <a name="1.21.1-1.4.5"></a>
-## [1.21.1-1.4.5](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.4...1.21.1-1.4.5) - 2026-03-09 16:17:51
+## [1.21.1-1.4.5](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.4...1.21.1-1.4.5) - 2026-03-09 16:17:51 +0100
 
 
 ### Added

resources/changelog/1.21.1-1.4.6.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.26.2 or higher.
+
+Fixes:
+* Fix channel mixup in crafting interface settings

src/main/java/org/cyclops/integratedcrafting/core/part/PartTypeInterfaceCraftingBase.java

@@ -82,9 +82,9 @@ protected NetworkCapability<ICraftingNetwork> getNetworkCapability() {
     protected void addTargetToNetwork(INetwork network, PartTarget pos, S state, boolean initialize) {
         network.getCapability(getNetworkCapability())
                 .ifPresent(craftingNetwork -> {
-                    int channelCrafting = state.getChannelCrafting();
+                    int channel = state.getChannel();
                     state.setTarget(pos);
-                    state.setNetworks(network, craftingNetwork, NetworkHelpers.getPartNetworkChecked(network), channelCrafting, ValueDeseralizationContext.of(pos.getCenter().getPos().getLevel(true)), initialize);
+                    state.setNetworks(network, craftingNetwork, NetworkHelpers.getPartNetworkChecked(network), channel, ValueDeseralizationContext.of(pos.getCenter().getPos().getLevel(true)), initialize);
                     state.setShouldAddToCraftingNetwork(true);
                 });
     }
@@ -138,12 +138,12 @@ public void update(INetwork network, IPartNetwork partNetwork, PartTarget target
             addTargetToNetwork(network, target, state, false);
         }
 
-        int channel = state.getChannelCrafting();
+        int channelCrafting = state.getChannelCrafting();
 
         // Update the network data in the part state
         if (state.shouldAddToCraftingNetwork()) {
             ICraftingNetwork craftingNetwork = network.getCapability(getNetworkCapability()).orElse(null);
-            craftingNetwork.addCraftingInterface(channel, state);
+            craftingNetwork.addCraftingInterface(channelCrafting, state);
             state.setShouldAddToCraftingNetwork(false);
         }
 
@@ -154,7 +154,7 @@ public void update(INetwork network, IPartNetwork partNetwork, PartTarget target
         if (state.getInventoryOutputBuffer().isEmpty()) {
             // Tick the job handler
             PartPos targetPos = state.getTarget().getTarget();
-            state.getCraftingJobHandler().update(network, channel, targetPos);
+            state.getCraftingJobHandler().update(network, channelCrafting, targetPos);
         }
     }
 
@@ -189,7 +189,6 @@ public static abstract class State<P extends PartTypeInterfaceCraftingBase<P, S>
         protected INetwork network = null;
         protected IPartNetwork partNetwork = null;
         protected ICraftingNetwork craftingNetwork = null;
-        private int channel = -1;
         protected ValueDeseralizationContext valueDeseralizationContext;
         private boolean shouldAddToCraftingNetwork = false;
         protected Player lastPlayer;
@@ -274,7 +273,7 @@ public void setNetworks(@Nullable INetwork network, @Nullable ICraftingNetwork c
             this.network = network;
             this.craftingNetwork = craftingNetwork;
             this.partNetwork = partNetwork;
-            this.channel = channel;
+            this.setChannel(channel);
             this.valueDeseralizationContext = valueDeseralizationContext;
             reloadRecipes(initialize);
         }
@@ -291,11 +290,6 @@ public ICraftingNetwork getCraftingNetwork() {
             return craftingNetwork;
         }
 
-        @Override
-        public int getChannel() {
-            return channel;
-        }
-
         @Override
         public boolean canScheduleCraftingJobs() {
             return getCraftingJobHandler().canScheduleCraftingJobs();