From 5b408de422aec3a9dc004a47f7a8de5d9b709352 Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 1 Sep 2022 16:59:32 +0200 Subject: [PATCH] some plant related recipes --- src/main/java/com/hbm/items/ModItems.java | 3 +++ src/main/java/com/hbm/items/food/ItemPill.java | 9 +++++++++ src/main/java/com/hbm/main/CraftingManager.java | 4 +++- .../assets/hbm/textures/items/pill_herbal.png | Bin 0 -> 394 bytes 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/hbm/textures/items/pill_herbal.png diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 9b54ad396..9de70bc27 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -924,6 +924,7 @@ public class ModItems { public static Item radaway_flush; public static Item radx; public static Item siox; + public static Item pill_herbal; public static Item pirfenidone; public static Item xanax; public static Item fmn; @@ -3435,6 +3436,7 @@ public class ModItems { med_bag = new ItemSyringe().setUnlocalizedName("med_bag").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":med_bag"); radx = new ItemPill(0).setUnlocalizedName("radx").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radx"); siox = new ItemPill(0).setUnlocalizedName("siox").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":siox"); + pill_herbal = new ItemPill(0).setUnlocalizedName("pill_herbal").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_herbal"); pirfenidone = new ItemPill(0).setUnlocalizedName("pirfenidone").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pirfenidone"); xanax = new ItemPill(0).setUnlocalizedName("xanax").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":xanax_2"); fmn = new ItemPill(0).setUnlocalizedName("fmn").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":tablet"); @@ -7666,6 +7668,7 @@ public class ModItems { GameRegistry.registerItem(radaway_flush, radaway_flush.getUnlocalizedName()); GameRegistry.registerItem(radx, radx.getUnlocalizedName()); GameRegistry.registerItem(siox, siox.getUnlocalizedName()); + GameRegistry.registerItem(pill_herbal, pill_herbal.getUnlocalizedName()); GameRegistry.registerItem(pirfenidone, pirfenidone.getUnlocalizedName()); GameRegistry.registerItem(pill_iodine, pill_iodine.getUnlocalizedName()); GameRegistry.registerItem(xanax, xanax.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/food/ItemPill.java b/src/main/java/com/hbm/items/food/ItemPill.java index 5ddbf2feb..6e1144e57 100644 --- a/src/main/java/com/hbm/items/food/ItemPill.java +++ b/src/main/java/com/hbm/items/food/ItemPill.java @@ -56,6 +56,15 @@ public class ItemPill extends ItemFood { HbmLivingProps.setAsbestos(player, 0); HbmLivingProps.setBlackLung(player, Math.min(HbmLivingProps.getBlackLung(player), HbmLivingProps.maxBlacklung / 5)); } + + if(this == ModItems.pill_herbal) { + HbmLivingProps.setAsbestos(player, 0); + HbmLivingProps.setBlackLung(player, Math.min(HbmLivingProps.getBlackLung(player), HbmLivingProps.maxBlacklung / 5)); + player.addPotionEffect(new PotionEffect(Potion.confusion.id, 10 * 20, 0)); + player.addPotionEffect(new PotionEffect(Potion.weakness.id, 10 * 60 * 20, 2)); + player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 10 * 60 * 20, 2)); + player.addPotionEffect(new PotionEffect(Potion.poison.id, 5 * 20, 2)); + } if(this == ModItems.xanax) { float digamma = HbmLivingProps.getDigamma(player); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index dd73cdd3e..09117cd8e 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -213,7 +213,9 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.turbine_tungsten, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_tungsten, 'S', DURA.ingot() }); addRecipeAuto(new ItemStack(ModItems.ring_starmetal, 1), new Object[] { " S ", "S S", " S ", 'S', STAR.ingot() }); addRecipeAuto(new ItemStack(ModItems.flywheel_beryllium, 1), new Object[] { "BBB", "BTB", "BBB", 'B', BE.block(), 'T', ModItems.bolt_compound }); - + + addShapelessAuto(new ItemStack(ModItems.powder_poison), new Object[] { DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.NIGHTSHADE) }); + addShapelessAuto(new ItemStack(ModItems.syringe_metal_stimpak), new Object[] { ModItems.syringe_metal_empty, Items.carrot, DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.FOXGLOVE) }); //xander root and broc flower addShapelessAuto(DictFrame.fromOne(ModItems.plant_item, EnumPlantType.ROPE, 1), new Object[] { Items.string, Items.string, Items.string }); addRecipeAuto(DictFrame.fromOne(ModItems.plant_item, EnumPlantType.ROPE, 4), new Object[] { "W", "W", "W", 'W', DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.WEED) }); addRecipeAuto(new ItemStack(ModItems.rag, 16), new Object[] { "WW", "WW", 'W', DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.WEED) }); diff --git a/src/main/resources/assets/hbm/textures/items/pill_herbal.png b/src/main/resources/assets/hbm/textures/items/pill_herbal.png new file mode 100644 index 0000000000000000000000000000000000000000..fbb4dd0ed3d9e2efa8ce1f7390d30c217c766570 GIT binary patch literal 394 zcmV;50d@X~P)yy8-|V;}{_n)L;ZP7(w^~T$$%G zDMQ`FN2@{Vb(M;-4}hkP12BC#&r$25e*nOX^Gu3m0MyYC0N0M?tpR{(TRgov0O*d^ z;bf5RAW@28*K64I8m4Vw+7^jY%zFcXg>n+Ve;9yfv%zQM-FpLoo!tXAHn%!+FGw5Q z74OMyXF3gXD;XZvs@?-a{t-@>P5_vjngu`)YjES%N>4c(O}7^(ljvcMh&Bd5vAoXS o0f6nGye;|07EcYTaZrCumAu607*qoM6N<$f)2i&`Tzg` literal 0 HcmV?d00001