diff options
Diffstat (limited to 'src/Java/miscutil')
5 files changed, 28 insertions, 7 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 diff --git a/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java b/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java index 2cde6be1ad..90f61b2560 100644 --- a/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java +++ b/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java @@ -13,7 +13,7 @@ public class AddToCreativeTab { public static void initialiseTabs(){ tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); - //tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); + tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); //tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab"); tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); } diff --git a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMachines.java b/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMachines.java index 620648d6c0..02a0069a38 100644 --- a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMachines.java +++ b/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMachines.java @@ -12,7 +12,7 @@ public class MiscUtilCreativeTabMachines extends CreativeTabs { @Override public Item getTabIconItem() { - return Item.getItemFromBlock(ModBlocks.blockToolBuilder); + return Item.getItemFromBlock(ModBlocks.blockGriefSaver); } } diff --git a/src/Java/miscutil/core/lib/Strings.java b/src/Java/miscutil/core/lib/Strings.java index a26d697065..fa8714dc08 100644 --- a/src/Java/miscutil/core/lib/Strings.java +++ b/src/Java/miscutil/core/lib/Strings.java @@ -7,7 +7,7 @@ public class Strings { public static final String name = "Misc. Utils"; public static final String MODID = "miscutils"; public static final String VERSION = "0.9.2-gtu"; - public static final boolean DEBUG = false; + public static final boolean DEBUG = true; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; diff --git a/src/Java/miscutil/gregtech/enums/ExtraOreDictNames.java b/src/Java/miscutil/gregtech/enums/ExtraOreDictNames.java index aca2b63434..192cc898ca 100644 --- a/src/Java/miscutil/gregtech/enums/ExtraOreDictNames.java +++ b/src/Java/miscutil/gregtech/enums/ExtraOreDictNames.java @@ -1,5 +1,18 @@ package miscutil.gregtech.enums; +/** + * + * + * @author Jordan + *Adds in extra names for items (No idea yet why anyone does this in such a fashion..) + */ public enum ExtraOreDictNames { - buffer_core + buffer_core, itemGregConduit; + +public String unlocalisedName; + +private void ModObject() { + unlocalisedName = name(); } + +}
\ No newline at end of file |