diff options
Diffstat (limited to 'src/Java/miscutil')
13 files changed, 276 insertions, 66 deletions
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index a4a08c90c8..b40d682f73 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -4,6 +4,14 @@ import static miscutil.core.lib.CORE.DEBUG; import static miscutil.core.lib.LoadedMods.Gregtech; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.block.ModBlocks; +import miscutil.core.common.compat.COMPAT_BigReactors; +import miscutil.core.common.compat.COMPAT_EnderIO; +import miscutil.core.common.compat.COMPAT_ExtraUtils; +import miscutil.core.common.compat.COMPAT_MorePlanets; +import miscutil.core.common.compat.COMPAT_PneumaticCraft; +import miscutil.core.common.compat.COMPAT_RFTools; +import miscutil.core.common.compat.COMPAT_SimplyJetpacks; +import miscutil.core.common.compat.COMPAT_Thaumcraft; import miscutil.core.gui.ModGUI; import miscutil.core.handler.registration.RegistrationHandler; import miscutil.core.item.ModItems; @@ -72,8 +80,8 @@ public class CommonProxy { public void postInit(FMLPostInitializationEvent e) { - - + + } public void registerNetworkStuff(){ @@ -94,20 +102,15 @@ public class CommonProxy { } + @SuppressWarnings("static-method") public void registerOreDict(){ Utils.LOG_INFO("Registering Ingots & Plates with OreDict."); //In-house - + //tools GT_OreDictUnificator.registerOre("craftingToolSandHammer", new ItemStack(ModItems.itemSandstoneHammer)); - - //Ingots - - - //OreDictionary.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel)); GT_OreDictUnificator.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel)); - //OreDictionary.registerOre("ingotStaballoy", new ItemStack(ModItems.itemIngotStaballoy)); GT_OreDictUnificator.registerOre("ingotStaballoy", new ItemStack(ModItems.itemIngotStaballoy)); //Plates @@ -117,43 +120,66 @@ public class CommonProxy { //Blocks GT_OreDictUnificator.registerOre("blockStaballoy", new ItemStack(Item.getItemFromBlock(ModBlocks.blockStaballoy))); OreDictionary.registerOre("blockBloodSteel", new ItemStack(ModBlocks.blockBloodSteel)); - - + + for(int i=1; i<=10; i++){ - GT_OreDictUnificator.registerOre("bufferCore_"+CORE.VOLTAGES[i-1], new ItemStack(Utils.getItem("miscutils:item.itemBufferCore"+i))); + GT_OreDictUnificator.registerOre("bufferCore_"+CORE.VOLTAGES[i-1], new ItemStack(Utils.getItem("miscutils:item.itemBufferCore"+i))); } //InterMod if (LoadedMods.Big_Reactors){ - GT_OreDictUnificator.registerOre("plateBlutonium", new ItemStack(ModItems.itemPlateBlutonium)); - GT_OreDictUnificator.registerOre("plateCyanite", new ItemStack(ModItems.itemPlateCyanite)); - GT_OreDictUnificator.registerOre("plateLudicrite", new ItemStack(ModItems.itemPlateLudicrite)); + COMPAT_BigReactors.OreDict(); } if (LoadedMods.EnderIO){ - GT_OreDictUnificator.registerOre("plateConductiveIron", new ItemStack(ModItems.itemPlateConductiveIron)); - GT_OreDictUnificator.registerOre("plateDarkSteel", new ItemStack(ModItems.itemPlateDarkSteel)); - GT_OreDictUnificator.registerOre("plateElectricalSteel", new ItemStack(ModItems.itemPlateElectricalSteel)); - GT_OreDictUnificator.registerOre("plateEnergeticAlloy", new ItemStack(ModItems.itemPlateEnergeticAlloy)); - GT_OreDictUnificator.registerOre("platePulsatingIron", new ItemStack(ModItems.itemPlatePulsatingIron)); - GT_OreDictUnificator.registerOre("plateRedstoneAlloy", new ItemStack(ModItems.itemPlateRedstoneAlloy)); - GT_OreDictUnificator.registerOre("plateSoularium", new ItemStack(ModItems.itemPlateSoularium)); - GT_OreDictUnificator.registerOre("plateVibrantAlloy", new ItemStack(ModItems.itemPlateVibrantAlloy)); + COMPAT_EnderIO.OreDict(); + } + if (LoadedMods.MorePlanets){ + COMPAT_MorePlanets.OreDict(); } if (LoadedMods.Simply_Jetpacks){ - GT_OreDictUnificator.registerOre("plateEnrichedSoularium", new ItemStack(ModItems.itemPlateEnrichedSoularium)); - + COMPAT_SimplyJetpacks.OreDict(); } if (LoadedMods.RFTools){ - GT_OreDictUnificator.registerOre("plateDimensionShard", new ItemStack(ModItems.itemPlateDimensionShard)); - + COMPAT_RFTools.OreDict(); } if (LoadedMods.Thaumcraft){ - try{ + COMPAT_Thaumcraft.OreDict(); + } + if (LoadedMods.Extra_Utils){ + COMPAT_ExtraUtils.OreDict(); + } + if (LoadedMods.PneumaticCraft){ + COMPAT_PneumaticCraft.OreDict(); + } + } + + + + + + + + + + + + + @SuppressWarnings("static-method") + public int addArmor(String armor) { + return 0; + } + +} + + +/* + * + * try{ Item em = null; //Item em1 = GameRegistry.findItem("ThaumCraft", "ItemResource:16"); //Item em2 = GameRegistry.findItem("ThaumCraft", "<ItemResource:16>"); - + Item em1 = Utils.getItem("Thaumcraft:ItemResource:16"); Utils.LOG_WARNING("Found: "+em1.toString()); if (!em1.equals(null)){ @@ -174,38 +200,20 @@ public class CommonProxy { } catch (NullPointerException e) { Utils.LOG_ERROR("Void Metal Ingot not found. [NULL]"); } - GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); - //System.exit(0); - - } - if (LoadedMods.Extra_Utils){ - try { - Item em = null; - Item em1 = Utils.getItem("ExtraUtilities:bedrockiumIngot"); - Utils.LOG_WARNING("Found: "+em1.toString()); - if (!em1.equals(null)){ - em = em1; - } - if (!em.equals(null)){ - GT_OreDictUnificator.registerOre("ingotBedrockium", new ItemStack(em)); - } - else { - Utils.LOG_WARNING("Bedrockium Ingot not found."); - } - } catch (NullPointerException e) { - Utils.LOG_ERROR("Bedrockium Ingot not found. [NULL]"); - } - - GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium)); - } - if (LoadedMods.PneumaticCraft){ - GT_OreDictUnificator.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron)); - } - //Misc - } - - public int addArmor(String armor) { - return 0; - } + try { +Item em = null; +Item em1 = Utils.getItem("ExtraUtilities:bedrockiumIngot"); +Utils.LOG_WARNING("Found: "+em1.toString()); +if (!em1.equals(null)){ + em = em1; +} +if (!em.equals(null)){ + GT_OreDictUnificator.registerOre("ingotBedrockium", new ItemStack(em)); +} +else { + Utils.LOG_WARNING("Bedrockium Ingot not found."); } +} catch (NullPointerException e) { + Utils.LOG_ERROR("Bedrockium Ingot not found. [NULL]"); +}*/ diff --git a/src/Java/miscutil/core/common/compat/COMPAT_BigReactors.java b/src/Java/miscutil/core/common/compat/COMPAT_BigReactors.java new file mode 100644 index 0000000000..a5f2b9021a --- /dev/null +++ b/src/Java/miscutil/core/common/compat/COMPAT_BigReactors.java @@ -0,0 +1,19 @@ +package miscutil.core.common.compat; + +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.item.ModItems; +import net.minecraft.item.ItemStack; + +public class COMPAT_BigReactors { + + public static void OreDict(){ + run(); + } + + private static final void run(){ + GT_OreDictUnificator.registerOre("plateBlutonium", new ItemStack(ModItems.itemPlateBlutonium)); + GT_OreDictUnificator.registerOre("plateCyanite", new ItemStack(ModItems.itemPlateCyanite)); + GT_OreDictUnificator.registerOre("plateLudicrite", new ItemStack(ModItems.itemPlateLudicrite)); + } + +} diff --git a/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java b/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java new file mode 100644 index 0000000000..af7afcc452 --- /dev/null +++ b/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java @@ -0,0 +1,26 @@ +package miscutil.core.common.compat; + +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.item.ModItems; +import miscutil.core.util.ItemUtils; +import net.minecraft.item.ItemStack; + +public class COMPAT_EnderIO { + + public static void OreDict(){ + run(); + } + + private static final void run(){ + ItemUtils.getItemForOreDict("EnderIO:itemAlloy", "ingotVibrantAlloy", "Vibrant Alloy Ingot", 2); + GT_OreDictUnificator.registerOre("plateConductiveIron", new ItemStack(ModItems.itemPlateConductiveIron)); + GT_OreDictUnificator.registerOre("plateDarkSteel", new ItemStack(ModItems.itemPlateDarkSteel)); + GT_OreDictUnificator.registerOre("plateElectricalSteel", new ItemStack(ModItems.itemPlateElectricalSteel)); + GT_OreDictUnificator.registerOre("plateEnergeticAlloy", new ItemStack(ModItems.itemPlateEnergeticAlloy)); + GT_OreDictUnificator.registerOre("platePulsatingIron", new ItemStack(ModItems.itemPlatePulsatingIron)); + GT_OreDictUnificator.registerOre("plateRedstoneAlloy", new ItemStack(ModItems.itemPlateRedstoneAlloy)); + GT_OreDictUnificator.registerOre("plateSoularium", new ItemStack(ModItems.itemPlateSoularium)); + GT_OreDictUnificator.registerOre("plateVibrantAlloy", new ItemStack(ModItems.itemPlateVibrantAlloy)); + } + +} diff --git a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java new file mode 100644 index 0000000000..031c11e337 --- /dev/null +++ b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java @@ -0,0 +1,19 @@ +package miscutil.core.common.compat; + +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.item.ModItems; +import miscutil.core.util.ItemUtils; +import net.minecraft.item.ItemStack; + +public class COMPAT_ExtraUtils { + + public static void OreDict(){ + run(); + } + + private static final void run(){ + ItemUtils.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0); + GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium)); + } + +} diff --git a/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java b/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java new file mode 100644 index 0000000000..adfafdebea --- /dev/null +++ b/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java @@ -0,0 +1,37 @@ +package miscutil.core.common.compat; + +import miscutil.core.util.ItemUtils; + +public class COMPAT_MorePlanets { + + + public static void OreDict(){ + run(); + } + + private final static void run(){ + //Metals + ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotFrozenIron", "Frozen Iron Ingot", 0); + ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotAnyIron", "Frozen Iron Ingot", 0); + ItemUtils.getItemForOreDict("MorePlanet:polongnius_item", "ingotPalladium", "Palladium Ingot", 5); + ItemUtils.getItemForOreDict("MorePlanet:fronos_item", "ingotIridium", "Iridium Ingot", 3); + ItemUtils.getItemForOreDict("MorePlanet:nibiru_item", "ingotNorium", "Norium Ingot", 1); + ItemUtils.getItemForOreDict("MorePlanet:venus_item", "ingotLead", "Lead Ingot", 0); + ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotQuontonium", "Quontonium Ingot", 0); + ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotFronisium", "Fronisium Ingot", 1); + ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "ingotSulfur", "Sulfur Ingot", 3); + ItemUtils.getItemForOreDict("MorePlanet:koentus_item", "ingotKoentusMeteoricIron", "Koentus Meteoric Iron Ingot", 4); + ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMetallic", "Metallic Ingot", 2); + ItemUtils.getItemForOreDict("MorePlanet:polongnius_item", "ingotPolongiusMeteoricIron", "Polongius Meteoric Iron Ingot", 4); + ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMeteoricSteel", "Meteoric Steel Ingot", 3); + ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "dustSulfur", "Sulfur Dust", 2); + + //Gems + ItemUtils.getItemForOreDict("MorePlanet:fronos_item", "gemBlackDiamond", "Black Diamond Gem", 2); + ItemUtils.getItemForOreDict("MorePlanet:koentus_item", "gemWhiteCrystal", "White Crystal", 0); + ItemUtils.getItemForOreDict("MorePlanet:nibiru_item", "gemRedCrystal", "Red Crystal", 0); + ItemUtils.getItemForOreDict("MorePlanet:pluto_item", "gemXeonius", "Xeonius Gem", 0); + ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "gemUranium", "Uranium Gem", 1); + } + +} diff --git a/src/Java/miscutil/core/common/compat/COMPAT_PneumaticCraft.java b/src/Java/miscutil/core/common/compat/COMPAT_PneumaticCraft.java new file mode 100644 index 0000000000..1e79d7a9f1 --- /dev/null +++ b/src/Java/miscutil/core/common/compat/COMPAT_PneumaticCraft.java @@ -0,0 +1,17 @@ +package miscutil.core.common.compat; + +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.item.ModItems; +import net.minecraft.item.ItemStack; + +public class COMPAT_PneumaticCraft { + + public static void OreDict(){ + run(); + } + + private static final void run(){ + GT_OreDictUnificator.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron)); + } + +} diff --git a/src/Java/miscutil/core/common/compat/COMPAT_RFTools.java b/src/Java/miscutil/core/common/compat/COMPAT_RFTools.java new file mode 100644 index 0000000000..c8ee0c0618 --- /dev/null +++ b/src/Java/miscutil/core/common/compat/COMPAT_RFTools.java @@ -0,0 +1,18 @@ +package miscutil.core.common.compat; + +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.item.ModItems; +import net.minecraft.item.ItemStack; + +public class COMPAT_RFTools { + + public static void OreDict(){ + run(); + } + + private static final void run(){ + GT_OreDictUnificator.registerOre("plateDimensionShard", new ItemStack(ModItems.itemPlateDimensionShard)); + + } + +} diff --git a/src/Java/miscutil/core/common/compat/COMPAT_SimplyJetpacks.java b/src/Java/miscutil/core/common/compat/COMPAT_SimplyJetpacks.java new file mode 100644 index 0000000000..c000be9aa8 --- /dev/null +++ b/src/Java/miscutil/core/common/compat/COMPAT_SimplyJetpacks.java @@ -0,0 +1,18 @@ +package miscutil.core.common.compat; + +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.item.ModItems; +import net.minecraft.item.ItemStack; + +public class COMPAT_SimplyJetpacks { + + public static void OreDict(){ + run(); + } + + private static final void run(){ + GT_OreDictUnificator.registerOre("plateEnrichedSoularium", new ItemStack(ModItems.itemPlateEnrichedSoularium)); + + } + +} diff --git a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java new file mode 100644 index 0000000000..5d2ba0cb92 --- /dev/null +++ b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java @@ -0,0 +1,19 @@ +package miscutil.core.common.compat; + +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.item.ModItems; +import miscutil.core.util.ItemUtils; +import net.minecraft.item.ItemStack; + +public class COMPAT_Thaumcraft { + + public static void OreDict(){ + run(); + } + + private static final void run(){ + ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16); + GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); + } + +} diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index 28b3f83458..1e7beec454 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -8,8 +8,8 @@ public class CORE { public static final String name = "Misc. Utils"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.0.0"; - public static final boolean DEBUG = false; + public static final String VERSION = "1.0.1"; + public static final boolean DEBUG = true; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; public static Map PlayerCache; diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java index 22f9129346..3dae546efc 100644 --- a/src/Java/miscutil/core/lib/LoadedMods.java +++ b/src/Java/miscutil/core/lib/LoadedMods.java @@ -15,8 +15,10 @@ public class LoadedMods { public static boolean Thaumcraft = false; public static boolean Extra_Utils = false; public static boolean PneumaticCraft = false; - private static int totalMods; + public static boolean MorePlanets = false; + + private static int totalMods; public static void checkLoaded(){ Utils.LOG_INFO("Looking for optional mod prereqs."); if (Loader.isModLoaded("gregtech") == true ){ @@ -55,6 +57,10 @@ public class LoadedMods { PneumaticCraft = true; totalMods++; } + if (Loader.isModLoaded("MorePlanet") == true){ + MorePlanets = true; + totalMods++; + } Utils.LOG_INFO("Content found for "+totalMods+" mods"); diff --git a/src/Java/miscutil/core/util/ItemUtils.java b/src/Java/miscutil/core/util/ItemUtils.java index f6403f8d2e..fa7fb5f969 100644 --- a/src/Java/miscutil/core/util/ItemUtils.java +++ b/src/Java/miscutil/core/util/ItemUtils.java @@ -1,5 +1,7 @@ package miscutil.core.util; +import gregtech.api.util.GT_OreDictUnificator; + import java.util.ArrayList; import miscutil.core.handler.registration.RegistrationHandler; @@ -37,6 +39,27 @@ public class ItemUtils { } return null; } + + public static void getItemForOreDict(String FQRN, String oreDictName, String itemName, int meta){ + try { + Item em = null; + Item em1 = Utils.getItem(FQRN); + Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); + if (em1 != null){ + em = em1; + } + if (em != null){ + + ItemStack metaStack = new ItemStack(em,1,meta); + GT_OreDictUnificator.registerOre(oreDictName, metaStack); + + /*ItemStack itemStackWithMeta = new ItemStack(em,1,meta); + GT_OreDictUnificator.registerOre(oreDictName, new ItemStack(itemStackWithMeta.getItem()));*/ + } + } catch (NullPointerException e) { + Utils.LOG_ERROR(itemName+" not found. [NULL]"); + } + } public static void recipeBuilder(Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9, ItemStack resultItem){ diff --git a/src/Java/miscutil/mcmod.info b/src/Java/miscutil/mcmod.info index 194b5a644e..ac0db7cfd9 100644 --- a/src/Java/miscutil/mcmod.info +++ b/src/Java/miscutil/mcmod.info @@ -6,7 +6,7 @@ [ { "modid" : "miscutil" , "name" : "miscutils" , "description" : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks." - , "version" : "1.0.0" + , "version" : "1.0.1" , "mcversion" : "1.7.10" , "url" : "" , "updateUrl" : "" |