diff --git a/gradle.properties b/gradle.properties index ff9723dfd..1a8549f8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,7 @@ org.gradle.caching=true # Dependencies graal_version=25.2.4 -cyclopscore_version=1.25.5-643 +cyclopscore_version=1.30.0-1205 integrateddynamics_version=1.24.1-1004 jei_version=19.16.0.152 commoncapabilities_version=2.9.3-147 diff --git a/src/main/java/org/cyclops/integratedscripting/blockentity/BlockEntityScriptingDrive.java b/src/main/java/org/cyclops/integratedscripting/blockentity/BlockEntityScriptingDrive.java index 7aec35dbb..c62b64881 100644 --- a/src/main/java/org/cyclops/integratedscripting/blockentity/BlockEntityScriptingDrive.java +++ b/src/main/java/org/cyclops/integratedscripting/blockentity/BlockEntityScriptingDrive.java @@ -102,9 +102,11 @@ public void setExposedDiskId(int exposedDiskId) { this.onDirty(); ScriptingNetworkHelpers.getScriptingNetwork(getNetwork()) .ifPresent(scriptingNetwork -> { - if (exposedDiskId == -1) { + // Also remove the old disk when it is directly replaced by another one + if (oldExposedDiskId >= 0) { scriptingNetwork.removeDisk(oldExposedDiskId); - } else { + } + if (exposedDiskId >= 0) { scriptingNetwork.addDisk(exposedDiskId); } }); diff --git a/src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenTerminalScripting.java b/src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenTerminalScripting.java index 2daa56804..71d89643d 100644 --- a/src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenTerminalScripting.java +++ b/src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenTerminalScripting.java @@ -3,7 +3,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.mojang.blaze3d.systems.RenderSystem; import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.KeyMapping; @@ -87,6 +86,8 @@ public class ContainerScreenTerminalScripting extends ContainerScreenExtended