diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 07e785c6e..1598a11c9 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -1528,12 +1528,14 @@ item.bottle2_korl.name=Korl item.bottle2_fritz.name=Fritz-Kola item.bottle2_korl_special.name=Das erste Korl item.bottle2_fritz_special.name=Die erste Fritz-Kola +item.bottle2_sunset.name=Sunset Saraparilla item.chocolate_milk.name=Schokomilch item.cap_nuka.name=Nuka-Cola Kronkorken item.cap_quantum.name=Nuka Cola Quantum Kronkorken item.cap_sparkle.name=S~Cola Kronkorken item.cap_korl.name=Korl Kronkorken item.cap_fritz.name=Fritz-Kola Kronkorken +item.cap_sunset.name=Sunset Saraparilla Kronkorken item.ring_pull.name=Dosenring item.bottle_opener.name=Hbms eigener selbstgebauter Flaschenöffner diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 497dd2843..4a00110f8 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -1528,12 +1528,14 @@ item.bottle2_korl.name=Korl item.bottle2_fritz.name=Fritz Cola item.bottle2_korl_special.name=The First Korl item.bottle2_fritz_special.name=The First Fritz Cola +item.bottle2_sunset.name=Sunset Saraparilla item.chocolate_milk.name=Chocolate Milk item.cap_nuka.name=Nuka Cola Bottle Cap item.cap_quantum.name=Nuka Cola Quantum Bottle Cap item.cap_sparkle.name=S~Cola Bottle Cap item.cap_korl.name=Korl Bottle Cap item.cap_fritz.name=Fritz Cola Bottle Cap +item.cap_sunset.name=Sunset Saraparilla Bottle Cap item.ring_pull.name=Ring Pull item.bottle_opener.name=Hbm's Own Self-Made Bottle Opener diff --git a/assets/hbm/textures/items/bottle2_sunset.png b/assets/hbm/textures/items/bottle2_sunset.png new file mode 100644 index 000000000..f07cbdee8 Binary files /dev/null and b/assets/hbm/textures/items/bottle2_sunset.png differ diff --git a/assets/hbm/textures/items/cap_sunset.png b/assets/hbm/textures/items/cap_sunset.png new file mode 100644 index 000000000..e7f07f5ff Binary files /dev/null and b/assets/hbm/textures/items/cap_sunset.png differ diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 71bb76ed0..1dd03e33c 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -536,12 +536,14 @@ public class ModItems { public static Item bottle2_fritz; public static Item bottle2_korl_special; public static Item bottle2_fritz_special; + public static Item bottle2_sunset; public static Item chocolate_milk; public static Item cap_nuka; public static Item cap_quantum; public static Item cap_sparkle; public static Item cap_korl; public static Item cap_fritz; + public static Item cap_sunset; public static Item ring_pull; public static Item rod_empty; @@ -1726,12 +1728,14 @@ public class ModItems { bottle2_fritz = new ItemEnergy().setUnlocalizedName("bottle2_fritz").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle2_fritz"); bottle2_korl_special = new ItemEnergy().setUnlocalizedName("bottle2_korl_special").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle2_korl"); bottle2_fritz_special = new ItemEnergy().setUnlocalizedName("bottle2_fritz_special").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle2_fritz"); + bottle2_sunset = new ItemEnergy().setUnlocalizedName("bottle2_sunset").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle2_sunset"); chocolate_milk = new ItemEnergy().setUnlocalizedName("chocolate_milk").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":chocolate_milk"); cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_nuka"); cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_quantum"); cap_sparkle = new Item().setUnlocalizedName("cap_sparkle").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_sparkle"); cap_korl = new Item().setUnlocalizedName("cap_korl").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_korl"); cap_fritz = new Item().setUnlocalizedName("cap_fritz").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_fritz"); + cap_sunset = new Item().setUnlocalizedName("cap_sunset").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_sunset"); ring_pull = new Item().setUnlocalizedName("ring_pull").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":ring_pull"); rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_empty"); @@ -3500,6 +3504,7 @@ public class ModItems { GameRegistry.registerItem(bottle2_fritz, bottle2_fritz.getUnlocalizedName()); GameRegistry.registerItem(bottle2_korl_special, bottle2_korl_special.getUnlocalizedName()); GameRegistry.registerItem(bottle2_fritz_special, bottle2_fritz_special.getUnlocalizedName()); + GameRegistry.registerItem(bottle2_sunset, bottle2_sunset.getUnlocalizedName()); GameRegistry.registerItem(bottle_opener, bottle_opener.getUnlocalizedName()); //Money @@ -3508,6 +3513,7 @@ public class ModItems { GameRegistry.registerItem(cap_sparkle, cap_sparkle.getUnlocalizedName()); GameRegistry.registerItem(cap_korl, cap_korl.getUnlocalizedName()); GameRegistry.registerItem(cap_fritz, cap_fritz.getUnlocalizedName()); + GameRegistry.registerItem(cap_sunset, cap_sunset.getUnlocalizedName()); GameRegistry.registerItem(ring_pull, ring_pull.getUnlocalizedName()); //Chaos diff --git a/com/hbm/items/food/ItemEnergy.java b/com/hbm/items/food/ItemEnergy.java index e678bffcc..555d8ade0 100644 --- a/com/hbm/items/food/ItemEnergy.java +++ b/com/hbm/items/food/ItemEnergy.java @@ -124,6 +124,14 @@ public class ItemEnergy extends Item { p_77654_3_.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 120 * 20, 2)); p_77654_3_.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 120 * 20, 1)); } + if(this == ModItems.bottle2_sunset) + { + p_77654_3_.heal(6); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 60 * 20, 1)); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.resistance.id, 60 * 20, 2)); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 60 * 20, 2)); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 60 * 20, 2)); + } } if (!p_77654_3_.capabilities.isCreativeMode && this != ModItems.chocolate_milk) @@ -180,7 +188,7 @@ public class ItemEnergy extends Item { p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle2_empty)); } - if(this == ModItems.bottle_sparkle || this == ModItems.bottle_sparkle) { + if(this == ModItems.bottle_sparkle) { p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_sparkle)); if (p_77654_1_.stackSize <= 0) { @@ -189,6 +197,16 @@ public class ItemEnergy extends Item { p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_empty)); } + + if(this == ModItems.bottle2_sunset) { + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_sunset)); + if (p_77654_1_.stackSize <= 0) + { + return new ItemStack(ModItems.bottle2_empty); + } + + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle2_empty)); + } } return p_77654_1_; @@ -295,5 +313,20 @@ public class ItemEnergy extends Item { else list.add("The most delicious beverage in the wasteland!"); } + if(this == ModItems.bottle2_sunset) + { + if(MainRegistry.polaroidID == 11) { + list.add("\"Authentic Sunset Juice\""); + list.add(""); + list.add("This smells like fish."); + list.add("*sip*"); + list.add("Yup, that's pretty disugsting."); + list.add("..."); + list.add("..."); + list.add("*sip*"); + } else { + list.add("The eternal #2. Screw you, Bradberton!"); + } + } } }