From c40f41227010d166b7d87739dfe98f203537fb6d Mon Sep 17 00:00:00 2001 From: Bob Date: Fri, 12 Feb 2021 22:33:32 +0100 Subject: [PATCH] 5htp --- src/main/java/assets/hbm/lang/de_DE.lang | 2 ++ src/main/java/assets/hbm/lang/en_US.lang | 2 ++ .../java/assets/hbm/textures/gui/potions.png | Bin 3336 -> 3589 bytes .../java/assets/hbm/textures/items/5htp.png | Bin 0 -> 269 bytes .../java/com/hbm/config/PotionConfig.java | 2 ++ .../com/hbm/crafting/ConsumableRecipes.java | 3 +++ .../java/com/hbm/extprop/HbmLivingProps.java | 6 ++++++ src/main/java/com/hbm/items/ModItems.java | 3 +++ .../java/com/hbm/items/food/ItemPill.java | 8 ++++++++ src/main/java/com/hbm/main/ClientProxy.java | 2 +- .../java/com/hbm/main/ModEventHandler.java | 5 +++-- src/main/java/com/hbm/potion/HbmPotion.java | 2 ++ 12 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 src/main/java/assets/hbm/textures/items/5htp.png diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index a0ba81593..f76db9a60 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -1007,6 +1007,7 @@ item.fins_flat.name=Flache Stahlabdeckung item.fins_quad_titanium.name=Kleine Titanflossen item.fins_small_steel.name=Kleine Stahlgitterfinnen item.fins_tri_steel.name=Große Stahlflossen +item.five_htp.name=Enteramintabletten item.flame_conspiracy.name=Verschwörungstheorie item.flame_opinion.name=Eigene Meinung item.flame_politics.name=Politisches Thema @@ -2215,6 +2216,7 @@ potion.hbm_phosphorus=Phosphorverbrennung potion.hbm_radaway=Radaway potion.hbm_radiation=Kontaminiert potion.hbm_radx=Rad-X +potion.hbm_stability=Stabilität potion.hbm_taint=Verdorben potion.hbm_telekinesis=! ! ! diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index db70a7c02..db2f16561 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -1013,6 +1013,7 @@ item.fins_flat.name=Flat Steel Casing item.fins_quad_titanium.name=Small Titanium Fins item.fins_small_steel.name=Small Steel Grid Fins item.fins_tri_steel.name=Large Steel Fins +item.five_htp.name=Enteramine Pills item.flame_conspiracy.name=Conspiracy Theory item.flame_opinion.name=Own Opinion item.flame_politics.name=Political Topic @@ -2221,6 +2222,7 @@ potion.hbm_phosphorus=Phosphorus Burns potion.hbm_radaway=Radaway potion.hbm_radiation=Contaminated potion.hbm_radx=Rad-X +potion.hbm_stability=Stability potion.hbm_taint=Tainted potion.hbm_telekinesis=! ! ! diff --git a/src/main/java/assets/hbm/textures/gui/potions.png b/src/main/java/assets/hbm/textures/gui/potions.png index b9c1dd0d12adea086b09533cb60f8717c85808c2..b82b2e1d4e0547a5a5b0d76c1a0e9e5e144fdcdc 100644 GIT binary patch delta 3268 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 XwT`3MO$H*&00000NkvXXu0mjf6UHa{ diff --git a/src/main/java/assets/hbm/textures/items/5htp.png b/src/main/java/assets/hbm/textures/items/5htp.png new file mode 100644 index 0000000000000000000000000000000000000000..26a90732245a119117101f0f16afe55b34100413 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf-`V?{I39NHjOZH?QFHI?5ImM+Rof-YThRgTXi2Pt*bYPRt@;lpZC?Am(m>BgTn4LjD&cCJR z{`t3lQ61NoOv!p}ZJazy?W5@`Gppwedt@0FMBRLQ==%9Br3O6Br`{goE>7|E`NuTl QHPAl{p00i_>zopr0FrcTx&QzG literal 0 HcmV?d00001 diff --git a/src/main/java/com/hbm/config/PotionConfig.java b/src/main/java/com/hbm/config/PotionConfig.java index 195e48ca3..66020734f 100644 --- a/src/main/java/com/hbm/config/PotionConfig.java +++ b/src/main/java/com/hbm/config/PotionConfig.java @@ -13,6 +13,7 @@ public class PotionConfig { public static int radawayID = 68; public static int telekinesisID = 69; public static int phosphorusID = 70; + public static int stabilityID = 71; public static void loadFromConfig(Configuration config) { @@ -26,5 +27,6 @@ public class PotionConfig { radawayID = CommonConfig.createConfigInt(config, CATEGORY_POTION, "8.06_radawayPotionID", "What potion ID the radaway effect will have", 68); telekinesisID = CommonConfig.createConfigInt(config, CATEGORY_POTION, "8.07_telekinesisPotionID", "What potion ID the telekinesis effect will have", 69); phosphorusID = CommonConfig.createConfigInt(config, CATEGORY_POTION, "8.08_phosphorusPotionID", "What potion ID the phosphorus effect will have", 70); + stabilityID = CommonConfig.createConfigInt(config, CATEGORY_POTION, "8.09_stabilityPotionID", "What potion ID the stability effect will have", 71); } } diff --git a/src/main/java/com/hbm/crafting/ConsumableRecipes.java b/src/main/java/com/hbm/crafting/ConsumableRecipes.java index 56d52104b..d6e871289 100644 --- a/src/main/java/com/hbm/crafting/ConsumableRecipes.java +++ b/src/main/java/com/hbm/crafting/ConsumableRecipes.java @@ -109,6 +109,9 @@ public class ConsumableRecipes { GameRegistry.addRecipe(new ItemStack(ModItems.pill_iodine, 8), new Object[] { "IF", 'I', ModItems.powder_iodine, 'F', ModItems.fluorite }); GameRegistry.addRecipe(new ItemStack(ModItems.plan_c, 1), new Object[] { "PFP", 'P', ModItems.powder_poison, 'F', ModItems.fluorite }); GameRegistry.addRecipe(new ItemStack(ModItems.radx, 1), new Object[] { "P", "F", 'P', ModItems.powder_coal, 'F', ModItems.fluorite }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.xanax, 1), new Object[] { ModItems.powder_coal, ModItems.niter, ModItems.powder_bromine }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fmn, 1), new Object[] { ModItems.powder_coal, ModItems.powder_polonium, ModItems.powder_strontium }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.five_htp, 1), new Object[] { ModItems.powder_coal, ModItems.powder_euphemium, ModItems.canteen_fab }); //Med bags GameRegistry.addRecipe(new ItemStack(ModItems.med_bag, 1), new Object[] { "LLL", "SIS", "LLL", 'L', Items.leather, 'S', ModItems.syringe_metal_stimpak, 'I', ModItems.syringe_antidote }); diff --git a/src/main/java/com/hbm/extprop/HbmLivingProps.java b/src/main/java/com/hbm/extprop/HbmLivingProps.java index b820c5cff..724147e4d 100644 --- a/src/main/java/com/hbm/extprop/HbmLivingProps.java +++ b/src/main/java/com/hbm/extprop/HbmLivingProps.java @@ -4,6 +4,7 @@ import java.util.UUID; import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; +import com.hbm.potion.HbmPotion; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -68,7 +69,12 @@ public class HbmLivingProps implements IExtendedEntityProperties { return getData(entity).digamma; } + //TODO: move all the checking into the contamination util public static void setDigamma(EntityLivingBase entity, float digamma) { + + if(entity.isPotionActive(HbmPotion.stability.id)) + return; + getData(entity).digamma = digamma; float healthMod = (float)Math.pow(0.5, digamma) - 1F; diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index f6ef5c291..2e11e21b7 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -708,6 +708,7 @@ public class ModItems { public static Item radx; public static Item xanax; public static Item fmn; + public static Item five_htp; public static Item med_bag; public static Item pill_iodine; public static Item plan_c; @@ -2775,6 +2776,7 @@ public class ModItems { radx = new ItemPill(0).setUnlocalizedName("radx").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radx"); 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"); + five_htp = new ItemPill(0).setUnlocalizedName("five_htp").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":5htp"); pill_iodine = new ItemPill(0).setUnlocalizedName("pill_iodine").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_iodine"); plan_c = new ItemPill(0).setUnlocalizedName("plan_c").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":plan_c"); stealth_boy = new ItemStarterKit().setUnlocalizedName("stealth_boy").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":stealth_boy"); @@ -6168,6 +6170,7 @@ public class ModItems { GameRegistry.registerItem(pill_iodine, pill_iodine.getUnlocalizedName()); GameRegistry.registerItem(xanax, xanax.getUnlocalizedName()); GameRegistry.registerItem(fmn, fmn.getUnlocalizedName()); + GameRegistry.registerItem(five_htp, five_htp.getUnlocalizedName()); GameRegistry.registerItem(plan_c, plan_c.getUnlocalizedName()); GameRegistry.registerItem(stealth_boy, stealth_boy.getUnlocalizedName()); GameRegistry.registerItem(gas_mask_filter, gas_mask_filter.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/food/ItemPill.java b/src/main/java/com/hbm/items/food/ItemPill.java index 97f971fb2..8932959ab 100644 --- a/src/main/java/com/hbm/items/food/ItemPill.java +++ b/src/main/java/com/hbm/items/food/ItemPill.java @@ -58,6 +58,11 @@ public class ItemPill extends ItemFood { HbmLivingProps.setDigamma(player, Math.min(digamma, 2F)); player.addPotionEffect(new PotionEffect(Potion.blindness.id, 60, 0)); } + + if(this == ModItems.five_htp) { + HbmLivingProps.setDigamma(player, 0); + player.addPotionEffect(new PotionEffect(HbmPotion.stability.id, 10 * 60 * 20, 0)); + } } } @@ -78,6 +83,9 @@ public class ItemPill extends ItemFood { if(this == ModItems.fmn) { list.add("Removes all DRX above 2,000mDRX"); } + if(this == ModItems.five_htp) { + list.add("Removes all DRX, Stability for 10 minutes"); + } } @Override diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 60c14710f..b76cd358c 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -1154,7 +1154,7 @@ public class ClientProxy extends ServerProxy { if("anim".equals(type)) { - if("crucible".equals(data.getString("mode"))) { + if("crucible".equals(data.getString("mode")) && player.getHeldItem() != null) { BusAnimation animation = new BusAnimation() .addBus("GUARD_ROT", new BusAnimationSequence() diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index fee470a65..4868fb4bd 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -306,8 +306,9 @@ public class ModEventHandler prevArmor = (ItemStack[]) ReflectionHelper.findField(EntityLivingBase.class, "field_82180_bT", "previousEquipment").get(event.entityLiving); } catch(Exception e) { } - if(event.entityLiving instanceof EntityPlayer && prevArmor != null && (prevArmor[0] == null || !ItemStack.areItemStacksEqual(prevArmor[0], event.entityLiving.getHeldItem())) - && event.entityLiving.getHeldItem() != null && event.entityLiving.getHeldItem().getItem() instanceof IEquipReceiver) { + if(event.entityLiving instanceof EntityPlayer && prevArmor != null && event.entityLiving.getHeldItem() != null + && (prevArmor[0] == null || prevArmor[0].getItem() != event.entityLiving.getHeldItem().getItem()) + && event.entityLiving.getHeldItem().getItem() instanceof IEquipReceiver) { ((IEquipReceiver)event.entityLiving.getHeldItem().getItem()).onEquip((EntityPlayer) event.entityLiving); } diff --git a/src/main/java/com/hbm/potion/HbmPotion.java b/src/main/java/com/hbm/potion/HbmPotion.java index 7613cb3a2..84b8b557a 100644 --- a/src/main/java/com/hbm/potion/HbmPotion.java +++ b/src/main/java/com/hbm/potion/HbmPotion.java @@ -33,6 +33,7 @@ public class HbmPotion extends Potion { public static HbmPotion radaway; public static HbmPotion telekinesis; public static HbmPotion phosphorus; + public static HbmPotion stability; public HbmPotion(int id, boolean isBad, int color) { super(id, isBad, color); @@ -48,6 +49,7 @@ public class HbmPotion extends Potion { radaway = registerPotion(PotionConfig.radawayID, false, 0xBB4B00, "potion.hbm_radaway", 7, 0); telekinesis = registerPotion(PotionConfig.telekinesisID, true, 0x00F3FF, "potion.hbm_telekinesis", 0, 1); phosphorus = registerPotion(PotionConfig.phosphorusID, true, 0xFFFF00, "potion.hbm_phosphorus", 1, 1); + stability = registerPotion(PotionConfig.stabilityID, false, 0xD0D0D0, "potion.hbm_stability", 2, 1); } public static HbmPotion registerPotion(int id, boolean isBad, int color, String name, int x, int y) {