From 52967febe749a83054fc88041178455e79a85767 Mon Sep 17 00:00:00 2001 From: Tombenpotter Date: Sun, 26 Oct 2014 09:37:31 +0100 Subject: [PATCH] Fixed Nut's derps... Tile entities work now >.> --- build.properties | 2 +- .../emt/common/modules/ModuleRegistry.java | 50 ++++++++++--------- ...C2TERegistry.java => IC2TileRegistry.java} | 2 +- 3 files changed, 28 insertions(+), 26 deletions(-) rename src/main/java/tombenpotter/emt/common/modules/ic2/tile/{IC2TERegistry.java => IC2TileRegistry.java} (99%) diff --git a/build.properties b/build.properties index b0f787a..4638ff8 100644 --- a/build.properties +++ b/build.properties @@ -2,6 +2,6 @@ #Sat Sep 27 14:31:53 PDT 2014 package_group=com.tombenpotter.emt mc_version=1.7.10 -forge_version=10.13.1.1219 +forge_version=10.13.2.1232 mod_version=2.0.0Alpha mod_name=ElectroMagicTools diff --git a/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java index 10c9470..a458783 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java @@ -7,6 +7,7 @@ import tombenpotter.emt.common.modules.base.items.BaseItemRegistry; import tombenpotter.emt.common.modules.ic2.IC2RecipeRegistry; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; +import tombenpotter.emt.common.modules.ic2.tile.IC2TileRegistry; import tombenpotter.emt.common.modules.te.TERecipeRegistry; import tombenpotter.emt.common.modules.te.blocks.TEBlockRegistry; import tombenpotter.emt.common.modules.te.items.TEItemRegistry; @@ -19,34 +20,35 @@ public class ModuleRegistry { public static void registerModules() { BaseBlockRegistry.registerBaseBlocks(); - BaseItemRegistry.registerItems(); - BaseRecipeRegistry.registerRecipes(); + BaseItemRegistry.registerItems(); + BaseRecipeRegistry.registerRecipes(); - if (ConfigHandler.enableIC2Module) { - IC2BlockRegistry.registerBlocks(); - IC2ItemRegistry.registerItems(); - ElectroMagicTools.logger.info(localize("console.EMT.init.recipes")); - IC2RecipeRegistry.registerEarlyRecipes(); - } + if (ConfigHandler.enableIC2Module) { + IC2BlockRegistry.registerBlocks(); + IC2ItemRegistry.registerItems(); + IC2TileRegistry.registerTEs(); + ElectroMagicTools.logger.info(localize("console.EMT.init.recipes")); + IC2RecipeRegistry.registerEarlyRecipes(); + } - if (ConfigHandler.enableTEModule) { - TEBlockRegistry.registerTEBlocks(); - TEItemRegistry.registerTEItems(); - TERecipeRegistry.registerTERecipes(); - } + if (ConfigHandler.enableTEModule) { + TEBlockRegistry.registerTEBlocks(); + TEItemRegistry.registerTEItems(); + TERecipeRegistry.registerTERecipes(); + } } - public static void registerLateModules() { + public static void registerLateModules() { - if (ConfigHandler.enableIC2Module) { - ElectroMagicTools.logger.info(localize("console.EMT.postInit.recipes")); - IC2RecipeRegistry.registerLateRecipes(); - ElectroMagicTools.logger.info(localize("console.EMT.postInit.recipes.uumatter")); - IC2RecipeRegistry.registerUUMInfusionRecipes(); - } + if (ConfigHandler.enableIC2Module) { + ElectroMagicTools.logger.info(localize("console.EMT.postInit.recipes")); + IC2RecipeRegistry.registerLateRecipes(); + ElectroMagicTools.logger.info(localize("console.EMT.postInit.recipes.uumatter")); + IC2RecipeRegistry.registerUUMInfusionRecipes(); + } - if (ConfigHandler.enableTEModule) { - // do stuff - } - } + if (ConfigHandler.enableTEModule) { + // do stuff + } + } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TERegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TERegistry.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java index 812dad1..068cd28 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TERegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java @@ -39,7 +39,7 @@ import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityDoubleWate import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityTripleWaterSolar; import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityWaterSolar; -public class IC2TERegistry { +public class IC2TileRegistry { public static void registerTEs() {