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

Fixed MC not starting up without OC

Browse Source
This commit is contained in:
raoulvdberge
2017-05-14 13:55:47 +02:00
parent 8e7ab3b587
commit 64571f5f64
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package com.raoulvdberge.refinedstorage.integration.oc; package com.raoulvdberge.refinedstorage.integration.oc;
import com.raoulvdberge.refinedstorage.proxy.CapabilityNetworkNodeProxy; import com.raoulvdberge.refinedstorage.proxy.CapabilityNetworkNodeProxy;
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;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
@@ -20,4 +21,11 @@ public class DriverNetwork implements DriverBlock {
public ManagedEnvironment createEnvironment(World world, BlockPos pos, EnumFacing facing) { public ManagedEnvironment createEnvironment(World world, BlockPos pos, EnumFacing facing) {
return new EnvironmentNetwork(world.getTileEntity(pos).getCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, facing).getNode()); return new EnvironmentNetwork(world.getTileEntity(pos).getCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, facing).getNode());
} }
public static void register() {
Driver.add(new DriverNetwork());
Driver.add(new ConverterCraftingPattern());
Driver.add(new ConverterCraftingTask());
}
} }

8
src/main/java/com/raoulvdberge/refinedstorage/integration/oc/IntegrationOC.java
View File

@@ -1,6 +1,5 @@
package com.raoulvdberge.refinedstorage.integration.oc; package com.raoulvdberge.refinedstorage.integration.oc;
import li.cil.oc.api.Driver;
import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Loader;
public final class IntegrationOC { public final class IntegrationOC {
@@ -9,11 +8,4 @@ public final class IntegrationOC {
public static boolean isLoaded() { public static boolean isLoaded() {
return Loader.isModLoaded(ID); return Loader.isModLoaded(ID);
} }
public static void register() {
Driver.add(new DriverNetwork());
Driver.add(new ConverterCraftingPattern());
Driver.add(new ConverterCraftingTask());
}
} }

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

@@ -21,6 +21,7 @@ import com.raoulvdberge.refinedstorage.block.*;
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.integration.oc.IntegrationOC;
import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla; import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla;
import com.raoulvdberge.refinedstorage.item.*; import com.raoulvdberge.refinedstorage.item.*;
@@ -831,7 +832,7 @@ public class ProxyCommon {
public void init(FMLInitializationEvent e) { public void init(FMLInitializationEvent e) {
if (IntegrationOC.isLoaded()) { if (IntegrationOC.isLoaded()) {
IntegrationOC.register(); DriverNetwork.register();
} }
} }