diff options
Diffstat (limited to 'src/Java')
4 files changed, 7 insertions, 6 deletions
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java index 8b25360f1f..cff1e58c27 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java @@ -2,6 +2,7 @@ package miscutil.core.common.compat; import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; +import miscutil.core.lib.LoadedMods; import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; @@ -33,6 +34,7 @@ public class COMPAT_IC2 { } private static final void run(){ + if (LoadedMods.Gregtech){ //Fuck these right off. RemoveRecipeQueue.add("IC2:itemCable"); RemoveRecipeQueue.add("IC2:itemCable:1"); @@ -47,6 +49,7 @@ public class COMPAT_IC2 { //AddRecipeQueue.add(Cropnalyzer); //AddRecipeQueue.add(SolarHelmet); + } } } diff --git a/src/Java/miscutil/core/creative/AddToCreativeTab.java b/src/Java/miscutil/core/creative/AddToCreativeTab.java index 7655a639ad..f71de821dc 100644 --- a/src/Java/miscutil/core/creative/AddToCreativeTab.java +++ b/src/Java/miscutil/core/creative/AddToCreativeTab.java @@ -3,7 +3,6 @@ package miscutil.core.creative; import miscutil.core.creative.tabs.MiscUtilCreativeTabBlock; import miscutil.core.creative.tabs.MiscUtilCreativeTabMachines; import miscutil.core.creative.tabs.MiscUtilCreativeTabMisc; -import miscutil.core.creative.tabs.MiscUtilCreativeTabOther; import miscutil.core.creative.tabs.MiscUtilCreativeTabTools; import miscutil.core.lib.CORE; import net.minecraft.creativetab.CreativeTabs; @@ -22,7 +21,7 @@ public class AddToCreativeTab { tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); - tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab"); + //tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab"); if (CORE.DEBUG){ //tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab"); diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 131dd60293..ca10950d94 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -2,7 +2,6 @@ package miscutil.core.item; import static miscutil.core.creative.AddToCreativeTab.tabMachines; import static miscutil.core.creative.AddToCreativeTab.tabMisc; import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT; -import gregtech.api.GregTech_API; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.item.base.CoreItem; import miscutil.core.item.effects.RarityUncommon; @@ -17,7 +16,6 @@ import miscutil.core.util.Utils; import miscutil.core.util.debug.DEBUG_INIT; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; -import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.common.registry.GameRegistry; public final class ModItems { @@ -282,10 +280,11 @@ Gold Tool: 22*/ GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob"); itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit").setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit"); + GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); //Try some New Tools from GT //GT_Tool_Item x = null; //x = GregTech_API.constructHardHammerItem("rockBelter", "Sandstone Hammer", 5000 /**Max Damage**/,50 /**Entity Damage**/); //Item hardHammer = itemSandstoneHammer. - GregTech_API.registerHardHammer(new ItemStack(itemSandstoneHammer, 1)); + //GregTech_API.registerHardHammer(new ItemStack(itemSandstoneHammer, 1)); } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java index 02d64ba341..626f0fdfb3 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java @@ -220,7 +220,7 @@ public class RECIPES_Machines { private static void initModItems(){ if (LoadedMods.Gregtech){ - RECIPES_Shapeless.dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 1); + RECIPES_Shapeless.dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 2); machineCasing_ULV = ItemList.Casing_ULV.get(1); machineCasing_LV = ItemList.Casing_LV.get(1); machineCasing_MV = ItemList.Casing_MV.get(1); |