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

Fix crash in Funky Locomotion integration

Browse Source
This commit is contained in:
raoulvdberge
2017-12-09 12:33:50 +01:00
parent 20d3174006
commit 50eaa4f4ce
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/IntegrationFunkyLocomotion.java
View File

@@ -1,9 +1,9 @@
package com.raoulvdberge.refinedstorage.integration.funkylocomotion;
import com.rwtema.funkylocomotion.api.FunkyRegistry;
import net.minecraftforge.fml.common.Loader;
public final class IntegrationFunkyLocomotion {
public static boolean isLoaded() {
return FunkyRegistry.INSTANCE != null;
return Loader.isModLoaded("funkylocomotion");
}
}

18
src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryRegisterer.java Normal file
View File

@@ -0,0 +1,18 @@
package com.raoulvdberge.refinedstorage.integration.funkylocomotion;
import com.raoulvdberge.refinedstorage.block.BlockBase;
import com.raoulvdberge.refinedstorage.block.BlockNode;
import com.rwtema.funkylocomotion.api.FunkyRegistry;
import net.minecraft.block.Block;
import java.util.List;
public class MoveFactoryRegisterer {
public static void register(List<BlockBase> blocks) {
for (Block block : blocks) {
if (block instanceof BlockNode) {
FunkyRegistry.INSTANCE.registerMoveFactoryBlock(block, new MoveFactoryNetworkNode());
}
}
}
}

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

@@ -20,13 +20,12 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriter
import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerRedstone;
import com.raoulvdberge.refinedstorage.apiimpl.solderer.SoldererRecipeLoader;
import com.raoulvdberge.refinedstorage.block.BlockBase;
import com.raoulvdberge.refinedstorage.block.BlockNode;
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.funkylocomotion.IntegrationFunkyLocomotion;
import com.raoulvdberge.refinedstorage.integration.funkylocomotion.MoveFactoryNetworkNode;
import com.raoulvdberge.refinedstorage.integration.funkylocomotion.MoveFactoryRegisterer;
import com.raoulvdberge.refinedstorage.integration.oc.DriverNetwork;
import com.raoulvdberge.refinedstorage.integration.oc.IntegrationOC;
import com.raoulvdberge.refinedstorage.integration.projecte.IntegrationProjectE;
@@ -40,7 +39,6 @@ import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid;
import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid;
import com.raoulvdberge.refinedstorage.tile.grid.portable.TilePortableGrid;
import com.raoulvdberge.refinedstorage.util.StackUtils;
import com.rwtema.funkylocomotion.api.FunkyRegistry;
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentData;
@@ -268,13 +266,11 @@ public class ProxyCommon {
@SubscribeEvent
public void registerBlocks(RegistryEvent.Register<Block> e) {
blocksToRegister.forEach(b -> {
if (b instanceof BlockNode && IntegrationFunkyLocomotion.isLoaded()) {
FunkyRegistry.INSTANCE.registerMoveFactoryBlock(b, new MoveFactoryNetworkNode());
}
blocksToRegister.forEach(e.getRegistry()::register);
e.getRegistry().register(b);
});
if (IntegrationFunkyLocomotion.isLoaded()) {
MoveFactoryRegisterer.register(blocksToRegister);
}
}
@SubscribeEvent