Re-added support for OpenComputers, fixes #1423

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.5.17
+- Re-added support for OpenComputers (raoulvdberge)
+
 ### 1.5.16
 - Fixed crash when placing a Controller (raoulvdberge)
 - Fixed crash when configuring an Exporter (raoulvdberge)

build.gradle

@@ -57,7 +57,7 @@ dependencies {
     deobfCompile "mezz.jei:jei_1.12:4.7.5.84:api"
     runtime "mezz.jei:jei_1.12:4.7.5.84"
     deobfCompile "MCMultiPart2:MCMultiPart:2.2.2"
-    // deobfCompile "li.cil.oc:OpenComputers:MC1.11.2-1.7.0.28:api"
+    deobfCompile "li.cil.oc:OpenComputers:MC1.12.1-1.7.0.4:api"
     deobfCompile "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12-5.2.9:api"
     compile "inventory-tweaks:InventoryTweaks:1.63+beta.107:api"
 }

src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java

@@ -1,4 +1,4 @@
-/*package com.raoulvdberge.refinedstorage.integration.oc;
+package com.raoulvdberge.refinedstorage.integration.oc;
 
 import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
 import li.cil.oc.api.driver.Converter;
@@ -17,4 +17,3 @@ public class ConverterCraftingPattern implements Converter {
         }
     }
 }
-*/

src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java

@@ -1,4 +1,4 @@
-/*package com.raoulvdberge.refinedstorage.integration.oc;
+package com.raoulvdberge.refinedstorage.integration.oc;
 
 import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
 import li.cil.oc.api.driver.Converter;
@@ -17,4 +17,4 @@ public class ConverterCraftingTask implements Converter {
             output.put("quantity", task.getQuantity());
         }
     }
-}*/
+}

src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java

@@ -1,6 +1,6 @@
-/*package com.raoulvdberge.refinedstorage.integration.oc;
+package com.raoulvdberge.refinedstorage.integration.oc;
 
-import com.raoulvdberge.refinedstorage.proxy.CapabilityNetworkNodeProxy;
+import com.raoulvdberge.refinedstorage.capability.CapabilityNetworkNodeProxy;
 import li.cil.oc.api.Driver;
 import li.cil.oc.api.driver.DriverBlock;
 import li.cil.oc.api.network.ManagedEnvironment;
@@ -28,4 +28,4 @@ public class DriverNetwork implements DriverBlock {
         Driver.add(new ConverterCraftingPattern());
         Driver.add(new ConverterCraftingTask());
     }
-}*/
+}

src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java

@@ -1,4 +1,4 @@
-/*package com.raoulvdberge.refinedstorage.integration.oc;
+package com.raoulvdberge.refinedstorage.integration.oc;
 
 import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
 import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
@@ -312,4 +312,4 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment {
 
         return new Object[]{node.getNetwork().getItemStorageCache().getList().getStacks()};
     }
-}*/
+}

src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java

@@ -24,6 +24,8 @@ import com.raoulvdberge.refinedstorage.capability.CapabilityNetworkNodeProxy;
 import com.raoulvdberge.refinedstorage.gui.GuiHandler;
 import com.raoulvdberge.refinedstorage.integration.craftingtweaks.IntegrationCraftingTweaks;
 import com.raoulvdberge.refinedstorage.integration.forgeenergy.ReaderWriterHandlerForgeEnergy;
+import com.raoulvdberge.refinedstorage.integration.oc.DriverNetwork;
+import com.raoulvdberge.refinedstorage.integration.oc.IntegrationOC;
 import com.raoulvdberge.refinedstorage.network.*;
 import com.raoulvdberge.refinedstorage.tile.*;
 import com.raoulvdberge.refinedstorage.tile.craftingmonitor.TileCraftingMonitor;
@@ -243,9 +245,9 @@ public class ProxyCommon {
 
         SoldererRecipeLoader.load();
 
-        /*if (IntegrationOC.isLoaded()) {
+        if (IntegrationOC.isLoaded()) {
             DriverNetwork.register();
-        }*/
+        }
 
         if (IntegrationCraftingTweaks.isLoaded()) {
             IntegrationCraftingTweaks.register();