diff options
Diffstat (limited to 'src/Java/miscutil/core')
| -rw-r--r-- | src/Java/miscutil/core/handler/events/LoginEventHandler.java | 4 | ||||
| -rw-r--r-- | src/Java/miscutil/core/item/ModItems.java | 41 | ||||
| -rw-r--r-- | src/Java/miscutil/core/item/base/BaseItemHotFood.java | 5 |
3 files changed, 34 insertions, 16 deletions
diff --git a/src/Java/miscutil/core/handler/events/LoginEventHandler.java b/src/Java/miscutil/core/handler/events/LoginEventHandler.java index 4e8ac318ba..bfc331f5e3 100644 --- a/src/Java/miscutil/core/handler/events/LoginEventHandler.java +++ b/src/Java/miscutil/core/handler/events/LoginEventHandler.java @@ -31,7 +31,7 @@ public class LoginEventHandler { /*Utils.LOG_INFO("Engaging Log in protection."); localPlayerRef.*/ - if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009") || localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){ + if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009")/* || localPlayerRef.getCommandSenderName().toLowerCase().contains("player")*/){ Utils.LOG_INFO("Spawning a new Santa Thread."); @@ -58,7 +58,7 @@ public class LoginEventHandler { Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread."); localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, Utils.randInt(1, 5))); } - Thread.sleep(1000*60*1); + Thread.sleep(1000*60*Utils.randInt(15, 90)); } catch (InterruptedException ie) { Utils.LOG_INFO("Santa Mode Disabled."); } diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 5c5902206e..563e98a6fb 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -23,6 +23,7 @@ import miscutil.core.util.debug.DEBUG_INIT; import miscutil.core.util.item.UtilsItems; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemFood; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraftforge.common.util.EnumHelper; @@ -139,6 +140,11 @@ Gold Tool: 22*/ public static BaseItemIngot itemIngotTantalloy61; public static BaseItemIngotHot itemHotIngotTantalloy61; + public static ItemFood itemFoodRaisinToast; + public static BaseItemHotFood itemHotFoodRaisinToast; + public static BaseItemFood itemFoodCurriedSausages; + public static BaseItemHotFood itemHotFoodCurriedSausages; + //@SuppressWarnings("unused") public static final void init(){ @@ -323,13 +329,6 @@ Gold Tool: 22*/ itemHotIngotStaballoy = new BaseItemIngotHot("itemHotIngotStaballoy", "Staballoy", UtilsItems.getItemStack(CORE.MODID+":itemIngotStaballoy", 1)); GT_OreDictUnificator.registerOre("ingotHotStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotStaballoy", 1)); - //Raisin Bread - itemIngotRaisinBread = new BaseItemFood("itemIngotRaisinBread", 3, 1.5f, false, new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible(); - GT_OreDictUnificator.registerOre("itemIngotRaisinBread", UtilsItems.getItemStack(CORE.MODID+":itemIngotRaisinBread", 1)); - //Hot Raisin Bread - itemHotIngotRaisinBread = new BaseItemHotFood("itemHotIngotRaisinBread", 1, 0.5f, "Raisin Bread", 120, itemIngotRaisinBread); - GT_OreDictUnificator.registerOre("itemHotIngotRaisinBread", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotRaisinBread", 1)); - //Tantalloy Ingot/Plate itemIngotTantalloy60 = new BaseItemIngot("itemIngotTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); GT_OreDictUnificator.registerOre("ingotTantalloy-60", UtilsItems.getItemStack(CORE.MODID+":itemIngotTantalloy60", 1)); @@ -371,10 +370,28 @@ Gold Tool: 22*/ 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)); + + + + //Raisin Bread + itemIngotRaisinBread = new BaseItemFood("itemIngotRaisinBread", 3, 1.5f, false, new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible(); + GT_OreDictUnificator.registerOre("foodRaisinBread", UtilsItems.getItemStack(CORE.MODID+":itemIngotRaisinBread", 1)); + //Hot Raisin Bread + itemHotIngotRaisinBread = new BaseItemHotFood("itemHotIngotRaisinBread", 1, 0.5f, "Raisin Bread", 120, itemIngotRaisinBread); + GT_OreDictUnificator.registerOre("foodHotRaisinBread", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotRaisinBread", 1)); + + //Raisin Bread + itemFoodRaisinToast = new BaseItemFood("itemFoodRaisinToast", 1, 0.5f, false).setAlwaysEdible(); + GT_OreDictUnificator.registerOre("foodRaisinToast", UtilsItems.getItemStack(CORE.MODID+":itemFoodRaisinToast", 1)); + //Hot Raisin Bread + itemHotFoodRaisinToast = new BaseItemHotFood("itemHotFoodRaisinToast", 1, 0.5f, "Raisin Toast", 20, itemFoodRaisinToast); + GT_OreDictUnificator.registerOre("foodHotRaisinToast", UtilsItems.getItemStack(CORE.MODID+":itemHotFoodRaisinToast", 1)); + + //Raisin Bread + itemFoodCurriedSausages = new BaseItemFood("itemFoodCurriedSausages", 5, 2f, false); + GT_OreDictUnificator.registerOre("foodCurriedSausages", UtilsItems.getItemStack(CORE.MODID+":itemFoodCurriedSausages", 1)); + //Hot Raisin Bread + itemHotFoodCurriedSausages = new BaseItemHotFood("itemHotFoodCurriedSausages", 1, 0.5f, "Raisin Bread", 240, itemFoodCurriedSausages); + GT_OreDictUnificator.registerOre("foodHotCurriedSausages", UtilsItems.getItemStack(CORE.MODID+":itemHotFoodCurriedSausages", 1)); } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/item/base/BaseItemHotFood.java b/src/Java/miscutil/core/item/base/BaseItemHotFood.java index 1f60059fd9..b6751e8485 100644 --- a/src/Java/miscutil/core/item/base/BaseItemHotFood.java +++ b/src/Java/miscutil/core/item/base/BaseItemHotFood.java @@ -4,6 +4,7 @@ import java.util.List; import miscutil.core.item.base.foods.BaseItemFood; import miscutil.core.util.Utils; +import miscutil.core.util.UtilsText; import miscutil.core.util.item.UtilsItems; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -59,8 +60,8 @@ public class BaseItemHotFood extends BaseItemFood{ @Override public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { if (materialName != null && materialName != "" && !materialName.equals("")){ - list.add(EnumChatFormatting.GRAY+"Warning: Very hot! Avoid direct handling.."); - list.add(EnumChatFormatting.GRAY+"This food has "+(((int) stack.getMaxDamage()-(int) stack.getItemDamage())/20)+" seconds left."); + list.add(EnumChatFormatting.GRAY+"Warning: "+UtilsText.red.colour()+"Very hot!"+UtilsText.lightGray.colour()+" Avoid direct handling.."); + list.add(EnumChatFormatting.GRAY+"This food has "+((cooldownTime-(int) stack.getItemDamage())/20)+" seconds left, until it is cool."); } super.addInformation(stack, aPlayer, list, bool); } |