dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-added support for OpenComputers, fixes #1423

Browse Source
This commit is contained in:
raoulvdberge
2017-08-19 14:58:29 +02:00
parent 7c0839863e
commit fccd96f3e6
7 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

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

2
build.gradle
View File

@@ -57,7 +57,7 @@ dependencies {
deobfCompile "mezz.jei:jei_1.12:4.7.5.84:api" deobfCompile "mezz.jei:jei_1.12:4.7.5.84:api"
runtime "mezz.jei:jei_1.12:4.7.5.84" runtime "mezz.jei:jei_1.12:4.7.5.84"
deobfCompile "MCMultiPart2:MCMultiPart:2.2.2" 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" deobfCompile "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12-5.2.9:api"
compile "inventory-tweaks:InventoryTweaks:1.63+beta.107:api" compile "inventory-tweaks:InventoryTweaks:1.63+beta.107:api"
} }

3
src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java
View File

@@ -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.ICraftingPattern;
import li.cil.oc.api.driver.Converter; import li.cil.oc.api.driver.Converter;
@@ -17,4 +17,3 @@ public class ConverterCraftingPattern implements Converter {
} }
} }
} }
*/

4
src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java
View File

@@ -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 com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
import li.cil.oc.api.driver.Converter; import li.cil.oc.api.driver.Converter;
@@ -17,4 +17,4 @@ public class ConverterCraftingTask implements Converter {
output.put("quantity", task.getQuantity()); output.put("quantity", task.getQuantity());
} }
} }
}*/ }

6
src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java
View File

@@ -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;
import li.cil.oc.api.driver.DriverBlock; import li.cil.oc.api.driver.DriverBlock;
import li.cil.oc.api.network.ManagedEnvironment; import li.cil.oc.api.network.ManagedEnvironment;
@@ -28,4 +28,4 @@ public class DriverNetwork implements DriverBlock {
Driver.add(new ConverterCraftingPattern()); Driver.add(new ConverterCraftingPattern());
Driver.add(new ConverterCraftingTask()); Driver.add(new ConverterCraftingTask());
} }
}*/ }

4
src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java
View File

@@ -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.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; 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()}; return new Object[]{node.getNetwork().getItemStorageCache().getList().getStacks()};
} }
}*/ }

6
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
View File

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