diff options
Diffstat (limited to 'src/Java')
5 files changed, 68 insertions, 15 deletions
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index f5ffc86e89..7d0eb4dac0 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -176,6 +176,20 @@ public final class ModItems { public static BaseItemBackpack backpack_Yellow; public static BaseItemBackpack backpack_Purple; public static BaseItemBackpack backpack_Cyan; + + + public static BaseItemBackpack backpack_Maroon; + public static BaseItemBackpack backpack_Olive; + public static BaseItemBackpack backpack_DarkGreen; + public static BaseItemBackpack backpack_DarkPurple; + public static BaseItemBackpack backpack_Teal; + public static BaseItemBackpack backpack_Navy; + + + public static BaseItemBackpack backpack_Silver; + public static BaseItemBackpack backpack_Gray; + public static BaseItemBackpack backpack_Black; + public static BaseItemBackpack backpack_White; //@SuppressWarnings("unused") @@ -190,12 +204,26 @@ public final class ModItems { //Make some backpacks - backpack_Red = new BaseItemBackpack("backpackRed", Utils.rgbtoHexValue(255, 0, 0)); - backpack_Green = new BaseItemBackpack("backpackGreen", Utils.rgbtoHexValue(0, 255, 0)); - backpack_Blue = new BaseItemBackpack("backpackBlue", Utils.rgbtoHexValue(0, 0, 255)); - backpack_Yellow = new BaseItemBackpack("backpackYellow", Utils.rgbtoHexValue(255, 255, 0)); - backpack_Purple = new BaseItemBackpack("backpackPurple", Utils.rgbtoHexValue(255, 0, 255)); - backpack_Cyan = new BaseItemBackpack("backpackCyan", Utils.rgbtoHexValue(0, 255, 255)); + //Primary colours + backpack_Red = new BaseItemBackpack("backpackRed", Utils.rgbtoHexValue(200, 0, 0)); + backpack_Green = new BaseItemBackpack("backpackGreen", Utils.rgbtoHexValue(0, 200, 0)); + backpack_Blue = new BaseItemBackpack("backpackBlue", Utils.rgbtoHexValue(0, 0, 200)); + //Secondary Colours + backpack_Yellow = new BaseItemBackpack("backpackYellow", Utils.rgbtoHexValue(200, 200, 0)); + backpack_Purple = new BaseItemBackpack("backpackPurple", Utils.rgbtoHexValue(200, 0, 200)); + backpack_Cyan = new BaseItemBackpack("backpackCyan", Utils.rgbtoHexValue(0, 200, 200)); + //Tertiary Colours + backpack_Maroon = new BaseItemBackpack("backpackMaroon", Utils.rgbtoHexValue(128, 0, 0)); + backpack_Olive = new BaseItemBackpack("backpackOlive", Utils.rgbtoHexValue(128, 128, 0)); + backpack_DarkGreen = new BaseItemBackpack("backpackDarkGreen", Utils.rgbtoHexValue(0, 128, 0)); + backpack_DarkPurple = new BaseItemBackpack("backpackDarkPurple", Utils.rgbtoHexValue(128, 0, 128)); + backpack_Teal = new BaseItemBackpack("backpackTeal", Utils.rgbtoHexValue(0, 128, 128)); + backpack_Navy = new BaseItemBackpack("backpackNavy", Utils.rgbtoHexValue(0, 0, 128)); + //Shades + backpack_Silver = new BaseItemBackpack("backpackSilver", Utils.rgbtoHexValue(192, 192, 192)); + backpack_Gray = new BaseItemBackpack("backpackGray", Utils.rgbtoHexValue(128, 128, 128)); + backpack_Black = new BaseItemBackpack("backpackBlack", Utils.rgbtoHexValue(20, 20, 20)); + backpack_White = new BaseItemBackpack("backpackWhite", Utils.rgbtoHexValue(240, 240, 240)); /*ItemsIngots.load(); diff --git a/src/Java/miscutil/core/item/base/BaseItemBackpack.java b/src/Java/miscutil/core/item/base/BaseItemBackpack.java index 2b65c4ec03..f8a44b76c8 100644 --- a/src/Java/miscutil/core/item/base/BaseItemBackpack.java +++ b/src/Java/miscutil/core/item/base/BaseItemBackpack.java @@ -5,7 +5,6 @@ import miscutil.MiscUtils; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.handler.GuiHandler; import miscutil.core.lib.CORE; -import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; import miscutil.core.util.math.MathUtils; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,15 +19,16 @@ import cpw.mods.fml.relauncher.SideOnly; public class BaseItemBackpack extends Item{ protected final int colourValue; + protected final String unlocalName; public BaseItemBackpack(String unlocalizedName, int colour){ - + this.unlocalName = unlocalizedName; this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + "itemBackpack"); this.colourValue = colour; GameRegistry.registerItem(this, unlocalizedName); - GT_OreDictUnificator.registerOre(unlocalizedName.replace("itemB", "b"), UtilsItems.getSimpleStack(this)); + GT_OreDictUnificator.registerOre("storageBackpack", UtilsItems.getSimpleStack(this)); setMaxStackSize(1); setCreativeTab(AddToCreativeTab.tabOther); } @@ -44,10 +44,8 @@ public class BaseItemBackpack extends Item{ { if (!world.isRemote) { - Utils.LOG_INFO("Tried to use a Backpack."); // If player not sneaking, open the inventory gui if (!player.isSneaking()) { - Utils.LOG_INFO("Player is not sneaking."); player.openGui(MiscUtils.instance, GuiHandler.GUI3, world, 0, 0, 0); } @@ -72,8 +70,14 @@ public class BaseItemBackpack extends Item{ @Override public String getItemStackDisplayName(ItemStack p_77653_1_) { - - return ("Backpack"); + //Name Formatting. + String temp = unlocalName.replace("backpack", ""); + //Lets find the colour. + if (temp.toLowerCase().contains("dark")){ + temp = unlocalName.substring(12, unlocalName.length()); + temp = "Dark "+ temp; + } + return (temp+" Backpack"); } @Override diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java index d79f727560..bb29207d87 100644 --- a/src/Java/miscutil/core/lib/LoadedMods.java +++ b/src/Java/miscutil/core/lib/LoadedMods.java @@ -31,6 +31,8 @@ public class LoadedMods { public static boolean ExtraBees = false; public static boolean Psychedelicraft = false; public static boolean MiscUtils = true; //Dummy For MetaData Lookups in MT Wrapper + public static boolean ThermalFoundation = false; + private static int totalMods; @@ -149,6 +151,16 @@ public class LoadedMods { Utils.LOG_INFO("Components enabled for: ExtraBees"); totalMods++; } + if (Loader.isModLoaded("ThermalFoundation") == false){ + ThermalFoundation = false; + Utils.LOG_INFO("Components enabled for: ThermalFoundation"); + totalMods++; + } + else if (Loader.isModLoaded("ThermalFoundation") == true){ + ThermalFoundation = true; + Utils.LOG_INFO("Components disabled for: ThermalFoundation"); + //totalMods++; + } Utils.LOG_INFO("Content found for "+totalMods+" mods"); diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index ff6f3ae01a..6c3cdcad87 100644 --- a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -3,6 +3,7 @@ package miscutil.xmod.gregtech.common.blocks.fluid; import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.xmod.gregtech.common.Meta_GT_Proxy; @@ -29,11 +30,13 @@ public class GregtechFluidHandler { Meta_GT_Proxy.addFluid("mcguffium", "Mc Guffium 239", Materials.McGuffium239, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); Meta_GT_Proxy.addFluid("glue", "Glue", Materials.Glue, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); */ + + if (!LoadedMods.ThermalFoundation){ Utils.LOG_INFO("Adding Gregtech versions of Gelic Cryotheum and Blazing Pyrotheum."); Meta_GT_Proxy.addFluid("cryotheum", "Gelid Cryotheum", GT_Materials.Cryotheum, 4, -1200, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); Meta_GT_Proxy.addFluid("pyrotheum", "Blazing Pyrotheum", GT_Materials.Pyrotheum, 4, 4000, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); - + } } } diff --git a/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java index f0b3cff7aa..92396f558b 100644 --- a/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java @@ -1,5 +1,6 @@ package miscutil.xmod.thermalfoundation.fluid; +import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.xmod.thermalfoundation.item.TF_Items; import net.minecraft.block.BlockDispenser; @@ -17,7 +18,8 @@ public class TF_Fluids public static void preInit() { - Utils.LOG_INFO("Loading TF Fluids"); + if (!LoadedMods.ThermalFoundation){ + Utils.LOG_INFO("Adding in our own versions of Thermal Foundation Fluids"); Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); Fluid cryotheum = FluidRegistry.getFluid("cryotheum"); @@ -39,6 +41,10 @@ public class TF_Fluids Utils.LOG_INFO("Registering Gelid Cryotheum as it an already existing Fluid."); fluidCryotheum = cryotheum; } + } + else { + Utils.LOG_INFO("Thermal Foundation is already loaded, no need to add our own Cryotheum/Pyrotheum."); + } } public static void init() {} |