diff options
Diffstat (limited to 'src/main/java')
97 files changed, 7754 insertions, 11418 deletions
diff --git a/src/main/java/com/github/technus/tectech/Reference.java b/src/main/java/com/github/technus/tectech/Reference.java index 2db595d5c2..e343b9fc77 100644 --- a/src/main/java/com/github/technus/tectech/Reference.java +++ b/src/main/java/com/github/technus/tectech/Reference.java @@ -1,19 +1,15 @@ package com.github.technus.tectech; +import gregtech.api.enums.Mods; + public final class Reference { - public static final String MODID = "tectech"; + public static final String MODID = Mods.Names.TECTECH; public static final String NAME = "TecTech - Tec Technology!"; public static final String VERSION = "GRADLETOKEN_VERSION"; public static final String COLLECTIONNAME = "TecTech"; public static final String CLIENTSIDE = "com.github.technus.tectech.proxy.ClientProxy"; public static final String SERVERSIDE = "com.github.technus.tectech.proxy.CommonProxy"; - public static final String COFHCORE = "CoFHCore"; - public static final String THAUMCRAFT = "Thaumcraft"; - public static final String DREAMCRAFT = "dreamcraft"; - public static final String GTPLUSPLUS = "miscutils"; - public static final String SPARTAKCORE = "spartakcore"; - private Reference() {} } diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 17b5c88828..ae49064f64 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -1,6 +1,7 @@ package com.github.technus.tectech; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; +import static gregtech.api.enums.Mods.COFHCore; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -32,10 +33,14 @@ 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; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; import eu.usrv.yamcore.auxiliary.IngameErrorLog; import eu.usrv.yamcore.auxiliary.LogHelper; import gregtech.GT_Mod; @@ -132,7 +137,7 @@ public class TecTech { @Mod.EventHandler public void Load(FMLInitializationEvent event) { - hasCOFH = Loader.isModLoaded(Reference.COFHCORE); + hasCOFH = COFHCore.isModLoaded(); if (configTecTech.DISABLE_MATERIAL_LOADING_FFS) { try { diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java deleted file mode 100644 index 54c72a2da5..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ /dev/null @@ -1,6297 +0,0 @@ -package com.github.technus.tectech.compatibility.dreamcraft; - -import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault; -import static com.google.common.math.LongMath.pow; -import static gregtech.api.util.GT_ModHandler.getModItem; - -import java.lang.reflect.Method; - -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import vexatos.tgregworks.reference.PartTypes; -import vexatos.tgregworks.util.TGregUtils; - -import com.github.technus.tectech.Reference; -import com.github.technus.tectech.mechanics.el |