aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/core/common
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-03-13 13:41:20 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-03-13 13:41:20 +1000
commitddf4113b40bb683663bad2ebb9e372de97c98213 (patch)
treef0fd439df69978e143a347a758bc2ac6fdab5449 /src/Java/miscutil/core/common
parent6245b6a3eaf1ce475f6624da97ab3f04dcfd35f8 (diff)
downloadGT5-Unofficial-ddf4113b40bb683663bad2ebb9e372de97c98213.tar.gz
GT5-Unofficial-ddf4113b40bb683663bad2ebb9e372de97c98213.tar.bz2
GT5-Unofficial-ddf4113b40bb683663bad2ebb9e372de97c98213.zip
Saving an instance of my workspace and relevant files so I can once again, Strip out dev code for a stable .jar compile.
Diffstat (limited to 'src/Java/miscutil/core/common')
-rw-r--r--src/Java/miscutil/core/common/CommonProxy.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java
index ef46570f38..a7eb0bbcfd 100644
--- a/src/Java/miscutil/core/common/CommonProxy.java
+++ b/src/Java/miscutil/core/common/CommonProxy.java
@@ -7,8 +7,10 @@ import miscutil.core.block.ModBlocks;
import miscutil.core.gui.ModGUI;
import miscutil.core.item.ModItems;
import miscutil.core.lib.LoadedMods;
+import miscutil.core.lib.Strings;
import miscutil.core.tileentities.ModTileEntities;
import miscutil.core.util.Utils;
+import miscutil.enderio.init.InitEnderIO;
import miscutil.gregtech.init.InitGregtech;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -26,7 +28,7 @@ public class CommonProxy {
*/
//Logs
if (!DEBUG){
- Utils.LOG_INFO("Development mode not enabled.");
+ Utils.LOG_WARNING("Development mode not enabled.");
}
else if (DEBUG){
Utils.LOG_INFO("Development mode enabled.");
@@ -40,11 +42,17 @@ public class CommonProxy {
ModItems.init();
ModBlocks.init();
+ /**
+ * Enable Dev mode related content
+ */
+ if (Strings.DEBUG){
+ InitEnderIO.run();
+ }
//Register Gregtech related items
if (Gregtech) {
Utils.LOG_INFO("Gregtech Found - Loading Resources.");
- Utils.LOG_INFO("Begining initialization of Gregtech related content.");
+ //Utils.LOG_INFO("Begining initialization of Gregtech related content.");
// Init Gregtech
InitGregtech.run();
@@ -133,7 +141,7 @@ public class CommonProxy {
//Blocks
- OreDictionary.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel));
+ //OreDictionary.registerOre("blockBloodSteel", new ItemStack(ModBlocks.blockBloodSteel.ge)));
//Misc