diff options
Diffstat (limited to 'src')
110 files changed, 85075 insertions, 2775 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 6640949617..cd51a532d3 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -19,7 +19,9 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMList import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; import com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData; +import com.github.technus.tectech.nei.IMCForNEI; import com.github.technus.tectech.proxy.CommonProxy; +import com.github.technus.tectech.recipe.EyeOfHarmonyRecipeStorage; import com.github.technus.tectech.util.XSTR; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; @@ -209,6 +211,7 @@ public class TecTech { MainLoader.load(definitionsRegistry); MainLoader.addAfterGregTechPostLoadRunner(); + IMCForNEI.IMCSender(); } @Mod.EventHandler @@ -231,9 +234,14 @@ public class TecTech { } } + public static EyeOfHarmonyRecipeStorage eyeOfHarmonyRecipeStorage = null; + @Mod.EventHandler public void onServerAboutToStart(FMLServerAboutToStartEvent aEvent) { chunkDataHandler.clearData(); playerPersistence.clearData(); + + // This must be done after game load otherwise it fails. + eyeOfHarmonyRecipeStorage = new EyeOfHarmonyRecipeStorage(); } } diff --git a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java index f69941cb63..c27fd95bd3 100644 --- a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java +++ b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java @@ -46,6 +46,7 @@ public class TecTechConfig extends ConfigManager { */ @Override protected void PreInit() { + DISABLE_MATERIAL_LOADING_FFS = false; BOOM_ENABLE = true; diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 436c806da2..89230fa4e1 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -844,8 +844,8 @@ public class MachineLoader implements Runnable { Machine_Multi_Annihilation.set( new GT_MetaTileEntity_EM_annihilation(15405, "multimachine.em.annihilation", "Annihilation Generator") .getStackForm(1L)); - Machine_Multi_BHG.set( - new GT_MetaTileEntity_EM_bhg(15410, "multimachine.em.blackholegenerator", "Black Hole Generator") + Machine_Multi_EyeOfHarmony.set( + new GT_MetaTileEntity_EM_EyeOfHarmony(15410, "multimachine.em.eye_of_harmony", "Eye of Harmony") .getStackForm(1L)); // =================================================================================================== diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index bf02479fc2..53389d6fa5 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.loader.thing; +import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.TecTech.tectechTexturePage1; import com.github.technus.tectech.Reference; @@ -9,12 +10,11 @@ import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turret import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.block.QuantumStuffBlock; import com.github.technus.tectech.thing.block.ReactorSimBlock; -import com.github.technus.tectech.thing.casing.GT_Block_CasingsBA0; -import com.github.technus.tectech.thing.casing.GT_Block_CasingsNH; -import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT; -import com.github.technus.tectech.thing.casing.TT_Container_Casings; +import com.github.technus.tectech.thing.block.TileEyeOfHarmony; +import com.github.technus.tectech.thing.casing.*; import com.github.technus.tectech.thing.item.*; import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -24,6 +24,9 @@ import gregtech.api.interfaces.ITexture; public class ThingsLoader implements Runnable { |