diff --git a/CHANGELOG.md b/CHANGELOG.md index 399a4486a..12d8b25fb 100755 --- a/CHANGELOG.md +++ b/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) diff --git a/build.gradle b/build.gradle index ea4801e43..c7ccfec43 100755 --- a/build.gradle +++ b/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" } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java index e6ae239c1..838094f7c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java +++ b/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 { } } } -*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java index bf0cb9bad..f3806a0fb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java +++ b/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()); } } -}*/ +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java index c5a30d639..d73603a5f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java +++ b/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()); } -}*/ +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java index 9bf9898db..40682b367 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java +++ b/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()}; } -}*/ +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java index fa1e9a1d4..fc60b44ee 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java +++ b/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();