diff options
| -rw-r--r-- | src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java | 30 | ||||
| -rw-r--r-- | src/Java/miscutil/core/item/ModItems.java | 16 | ||||
| -rw-r--r-- | src/Java/miscutil/core/lib/LoadedMods.java | 5 | ||||
| -rw-r--r-- | src/resources/assets/miscutils/textures/items/itemDefault.png | bin | 2976 -> 2963 bytes |
4 files changed, 43 insertions, 8 deletions
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java index ae5844bbfc..17741af194 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java @@ -2,6 +2,8 @@ package miscutil.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.item.ModItems; +import miscutil.core.lib.LoadedMods; +import miscutil.core.util.Utils; import miscutil.core.util.UtilsItems; import net.minecraft.item.ItemStack; @@ -10,10 +12,34 @@ public class COMPAT_Thaumcraft { public static void OreDict(){ run(); } - + private static final void run(){ UtilsItems.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16); GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); + + for(int i=0; i<=6; i++){ + Utils.LOG_INFO(""+i); + UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard "+i, i); + GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1)); + UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard "+i, i); + GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1)); + System.out.println("TC Shard registration count is: "+i); + } + + if (LoadedMods.ForbiddenMagic){ + for(int i=0; i<=6; i++){ + Utils.LOG_INFO(""+i); + UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard "+i, i); + GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1)); + UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard "+i, i); + GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1)); + System.out.println("TC Shard registration count is: "+i); + } + UtilsItems.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0); + GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:GluttonyShard", 1)); + UtilsItems.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0); + GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("ForbiddenMagic:GluttonyShard", 1)); + } } - + } diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index fb8230b682..0d7f4c2542 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -124,8 +124,8 @@ public final class ModItems { //Material related public static Item itemStickyRubber; - public static Item item_PLEASE_FACTOR_ME_1; - public static Item item_PLEASE_FACTOR_ME_2; + public static Item itemIngotBatteryAlloy; + public static Item itemPlateBatteryAlloy; public static Item item_PLEASE_FACTOR_ME_3; public static Item item_PLEASE_FACTOR_ME_4; @@ -324,11 +324,15 @@ public final class ModItems { //Dev Items itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber"); + + //Battery Alloy For cheap Niggers + itemIngotBatteryAlloy = new Item().setUnlocalizedName("itemIngotBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); + GameRegistry.registerItem(itemIngotBatteryAlloy, "itemIngotBatteryAlloy"); + itemPlateBatteryAlloy = new Item().setUnlocalizedName("itemPlateBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); + GameRegistry.registerItem(itemPlateBatteryAlloy, "itemPlateBatteryAlloy"); + + /* - item_PLEASE_FACTOR_ME_1 = new Item().setUnlocalizedName("unlocalName1").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); - GameRegistry.registerItem(item_PLEASE_FACTOR_ME_1, "localName1"); - item_PLEASE_FACTOR_ME_2 = new Item().setUnlocalizedName("unlocalName2").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); - GameRegistry.registerItem(item_PLEASE_FACTOR_ME_2, "localName2"); item_PLEASE_FACTOR_ME_3 = new Item().setUnlocalizedName("unlocalName3").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); GameRegistry.registerItem(item_PLEASE_FACTOR_ME_3, "localName3"); item_PLEASE_FACTOR_ME_4 = new Item().setUnlocalizedName("unlocalName4").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java index 3dae546efc..cb6c206c1b 100644 --- a/src/Java/miscutil/core/lib/LoadedMods.java +++ b/src/Java/miscutil/core/lib/LoadedMods.java @@ -16,6 +16,7 @@ public class LoadedMods { public static boolean Extra_Utils = false; public static boolean PneumaticCraft = false; public static boolean MorePlanets = false; + public static boolean ForbiddenMagic = false; private static int totalMods; @@ -61,6 +62,10 @@ public class LoadedMods { MorePlanets = true; totalMods++; } + if (Loader.isModLoaded("ForbiddenMagic") == true){ + ForbiddenMagic = true; + totalMods++; + } Utils.LOG_INFO("Content found for "+totalMods+" mods"); diff --git a/src/resources/assets/miscutils/textures/items/itemDefault.png b/src/resources/assets/miscutils/textures/items/itemDefault.png Binary files differindex af251b7711..fbf4503b26 100644 --- a/src/resources/assets/miscutils/textures/items/itemDefault.png +++ b/src/resources/assets/miscutils/textures/items/itemDefault.png |
