From 88ccb54fe3cd9e3fbeba430df25888762f2e0814 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Tue, 23 Aug 2022 10:07:01 +0800 Subject: [PATCH] fix oc driver register crash --- src/main/java/com/glodblock/github/FluidCraft.java | 4 ++++ .../glodblock/github/common/block/BlockOCPatternEditor.java | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index f731c1cb..e79af60a 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -4,6 +4,7 @@ import appeng.api.AEApi; import appeng.api.config.Upgrades; import com.glodblock.github.common.Config; import com.glodblock.github.common.storage.FluidCellHandler; +import com.glodblock.github.crossmod.opencomputers.OCDriverInit; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.loader.ChannelLoader; import com.glodblock.github.loader.ItemAndBlockHolder; @@ -43,6 +44,9 @@ public class FluidCraft { @Mod.EventHandler public static void init(FMLInitializationEvent event) { ModAndClassUtil.init(); + if (ModAndClassUtil.OC) { + OCDriverInit.run(); + } proxy.init(event); } diff --git a/src/main/java/com/glodblock/github/common/block/BlockOCPatternEditor.java b/src/main/java/com/glodblock/github/common/block/BlockOCPatternEditor.java index c0bcdc8d..e64f29e8 100644 --- a/src/main/java/com/glodblock/github/common/block/BlockOCPatternEditor.java +++ b/src/main/java/com/glodblock/github/common/block/BlockOCPatternEditor.java @@ -3,7 +3,6 @@ package com.glodblock.github.common.block; import appeng.block.AEBaseItemBlock; import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.common.tile.TileOCPatternEditor; -import com.glodblock.github.crossmod.opencomputers.OCDriverInit; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; @@ -44,7 +43,6 @@ public class BlockOCPatternEditor extends FCBaseBlock { if (ModAndClassUtil.OC) { GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_OC_PATTERN_EDITOR); GameRegistry.registerTileEntity(TileOCPatternEditor.class, NameConst.BLOCK_OC_PATTERN_EDITOR); - OCDriverInit.run(); setCreativeTab(FluidCraftingTabs.INSTANCE); return this; }