Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update sedna, fix reboot.

Browse Source
This commit is contained in:
Florian Nücke
2021-05-24 13:15:24 +02:00
parent 88193d1d4d
commit 1efc505269
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@@ -53,18 +53,18 @@ dependencies {
compileOnly 'org.jetbrains:annotations:16.0.2'
implementation 'li.cil.oc2:oc2-sedna:0.0.1+265'
implementation 'li.cil.oc2:oc2-sedna:0.0.1+267'
// These three will be provided by oc2-sedna in standalone.
implementation 'li.cil.ceres:ceres:0.0.2+19'
implementation 'li.cil.sedna:sedna:0.0.1+95'
implementation 'li.cil.sedna:sedna-buildroot:0.0.1+10'
implementation 'li.cil.ceres:ceres:0.0.2+20'
implementation 'li.cil.sedna:sedna:0.0.1+99'
implementation 'li.cil.sedna:sedna-buildroot:0.0.1+12'
compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}:api")
runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")
testImplementation 'li.cil.ceres:ceres:0.0.2+19'
testImplementation 'li.cil.sedna:sedna:0.0.1+88'
testImplementation 'li.cil.ceres:ceres:0.0.2+20'
testImplementation 'li.cil.sedna:sedna:0.0.1+99'
testImplementation "org.mockito:mockito-core:2.+"
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'

5
src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java
View File

@@ -214,6 +214,11 @@ public abstract class AbstractVirtualMachine implements VirtualMachine {
return;
}
if (state.board.isRestarting()) {
stop();
start();
}
switch (runState) {
case LOADING_DEVICES:
load();