diff options
| -rw-r--r-- | src/main/java/com/github/technus/tectech/TecTech.java | 9 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 18 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 0a1aef7763..4e9d36eee8 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -7,6 +7,7 @@ import java.lang.reflect.Modifier; import java.util.Collection; import java.util.Iterator; +import cpw.mods.fml.common.eventhandler.EventPriority; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -52,6 +53,7 @@ import gregtech.common.GT_Proxy; + "required-after:structurelib;" + "after:ComputerCraft;" + "after:OpenComputers;" + + "required-after:gtneioreplugin;" + "required-after:gregtech;" + "after:dreamcraft;" + "after:appliedenergistics2;" @@ -247,12 +249,11 @@ public class TecTech { pEvent.registerServerCommand(new ChargeCommand()); pEvent.registerServerCommand(new MassCommand()); } + } - // This must be done after game load otherwise it fails. + @Mod.EventHandler + public void onLoadCompleted(FMLLoadCompleteEvent event) { eyeOfHarmonyRecipeStorage = new EyeOfHarmonyRecipeStorage(); - // The reason we do this is to force the fields inside the class to instantiate at world load so NEI - // displays properly. - eyeOfHarmonyRecipeStorage.recipeLookUp(new ItemStack(ModBlocks.blocks.get("Ow"))); } public static EyeOfHarmonyRecipeStorage eyeOfHarmonyRecipeStorage = null; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index ea0141dd2d..8c11063d2b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -692,7 +692,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl .addElement( 'H', buildHatchAdder(GT_MetaTileEntity_EM_EyeOfHarmony.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance) + .atLeast(InputHatch, OutputHatch, InputBus, OutputBus) .casingIndex(texturePage << 7).dot(1).buildAndChain(sBlockCasingsBA0, 12)) .addElement( 'E', @@ -842,8 +842,13 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl return false; } - // 1 Maintenance hatch, as usual. - return (mMaintenanceHatches.size() == 1); + mHardHammer = true; + mSoftHammer = true; + mScrewdriver = true; + mCrowbar = true; + mSolderingTool = true; + mWrench = true; + return true; } @Override @@ -915,7 +920,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl + EnumChatFormatting.GRAY + " Reinforced Temporal Structure Casing.") .addStructureInfo( - EnumChatFormatting.GOLD + "31" + EnumChatFormatting.GOLD + "32" + EnumChatFormatting.GRAY + " Infinite SpaceTime Energy Boundary Casing.") .addStructureInfo( @@ -928,8 +933,6 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl + " Spacetime Compression Field Generator.") .addStructureInfo("--------------------------------------------") .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " maintenance hatch.") - .addStructureInfo( "Requires " + EnumChatFormatting.GOLD + 2 + EnumChatFormatting.GRAY + " input hatches.") .addStructureInfo( "Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " ME output hatch.") @@ -1011,6 +1014,9 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl // No item in multi gui slot. currentRecipe = eyeOfHarmonyRecipeStorage.recipeLookUp(aStack); + if (currentRecipe == null) { + return false; + } if (processRecipe(currentRecipe)) { return true; } |