peas, beans, orbs

src/main/java/assets/hbm/lang/de_DE.lang

@@ -914,6 +914,8 @@ item.custom_tnt.name=AB - Sprengladung
 item.cyclotron_tower.name=Zyklotronenturm
 item.definitelyfood.name=GarantiertKeinDreck-Marken Feldration
 item.defuser.name=High-Tech Bombenentschärfungsgerät
+item.demon_core_closed.name=Bedeckter Dämonenkern
+item.demon_core_open.name=Gehobener Dämonenkern
 item.desh_axe.name=Arbeitslegierungsaxt
 item.desh_hoe.name=Arbeitslegierungsfeldhacke
 item.desh_pickaxe.name=Arbeitslegierungsspitzhacke
@@ -1604,6 +1606,7 @@ item.particle_lead.name=Bleiionenkapsel
 item.particle_muon.name=Myonenkapsel
 item.particle_sparkticle.name=Sparktikelkapsel
 item.particle_strange.name=Strange-Quark-Kapsel
+item.peas.name=Erbsen
 item.pedestal_steel.name=Stahlsockel
 item.pellet_advanced.name=Fortgeschrittenes Watzaufwertugspellet
 item.pellet_antimatter.name=Antimateriencluster

src/main/java/assets/hbm/lang/en_US.lang

@@ -914,6 +914,8 @@ item.custom_tnt.name=Custom Nuke Explosive Charge
 item.cyclotron_tower.name=Cyclotron Tower
 item.definitelyfood.name=TotallyNotDirt-Brand MRE
 item.defuser.name=High-Tech Bomb Defusing Device
+item.demon_core_closed.name=Closed Demon Core
+item.demon_core_open.name=Suspended Demon Core
 item.desh_axe.name=Worker's Alloy Axe
 item.desh_hoe.name=Worker's Alloy Hoe
 item.desh_pickaxe.name=Worker's Alloy Pickaxe
@@ -1604,6 +1606,7 @@ item.particle_lead.name=Lead Ion Capsule
 item.particle_muon.name=Muon Capsule
 item.particle_sparkticle.name=Sparkticle Capsule
 item.particle_strange.name=Strange Quark Capsule
+item.peas.name=Peas
 item.pedestal_steel.name=Steel Pedestal
 item.pellet_advanced.name=Advanced Watz Performance Improver
 item.pellet_antimatter.name=Antimatter Cluster

src/main/java/assets/hbm/textures/items/demon_core_closed.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 10
+  }
+}

src/main/java/com/hbm/crafting/ConsumableRecipes.java

@@ -51,6 +51,9 @@ public class ConsumableRecipes {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.loops), new Object[] { ModItems.flame_pony, Items.wheat, Items.sugar });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.loop_stew), new Object[] { ModItems.loops, ModItems.can_smart, Items.bowl });
 		
+		//Peas
+		GameRegistry.addRecipe(new ItemStack(ModItems.peas), new Object[] { " S ", "SNS", " S ", 'S', Items.wheat_seeds, 'N', Items.gold_nugget });
+		
 		//Cans
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.can_empty, 1), new Object[] { "P", "P", 'P', "plateAluminum" }));
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.can_smart, 1), new Object[] { ModItems.can_empty, Items.potionitem, Items.sugar, ModItems.niter });

src/main/java/com/hbm/crafting/WeaponRecipes.java

@@ -424,5 +424,7 @@ public class WeaponRecipes {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_amat, 1), new Object[] { " C ", "MMM", "AAA", 'C', "plateCopper", 'A', "plateAluminum", 'M', ModItems.cell_antimatter }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_dirty, 1), new Object[] { " C ", "WLW", "WLW", 'C', "plateCopper", 'L', "plateLead", 'W', ModItems.nuclear_waste }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_schrab, 1), new Object[] { " C ", "LUL", "LUL", 'C', "plateCopper", 'L', "plateLead", 'U', "ingotSchrabidium" }));
+
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.demon_core_open, 1), new Object[] { "PRP", " CS", "PRP", 'P', "plateTitanium", 'R', "plateDenseLead", 'C', ModItems.man_core, 'S', ModItems.screwdriver }));
 	}
 }

src/main/java/com/hbm/entity/mob/EntityQuackos.java

@@ -1,5 +1,8 @@
 package com.hbm.entity.mob;
 
+import com.hbm.entity.particle.EntityBSmokeFX;
+import com.hbm.items.ModItems;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.EntityAgeable;
@@ -10,94 +13,124 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
 /**
- *  BOW
+ * BOW
  */
 public class EntityQuackos extends EntityDuck implements IBossDisplayData {
 
-    /**
-     *  BOW
-     */
+	/**
+	 * BOW
+	 */
 	public EntityQuackos(World world) {
 		super(world);
-        this.setSize(0.3F * 25, 0.7F * 25);
+		this.setSize(0.3F * 25, 0.7F * 25);
 	}
-    
-    /**
-     *  BOW
-     */
-    protected String getLivingSound() {
-        return "hbm:entity.megaquacc";
-    }
-    
-    /**
-     *  BOW
-     */
-    protected String getHurtSound() {
-        return "hbm:entity.megaquacc";
-    }
-    
-    /**
-     *  BOW
-     */
-    protected String getDeathSound() {
-        return "hbm:entity.megaquacc";
-    }
-    
-    /**
-     *  BOW
-     */
-    public EntityQuackos createChild(EntityAgeable entity)
-    {
-        return new EntityQuackos(this.worldObj);
-    }
-    
-    /**
-     *  BOW
-     */
-    public boolean isEntityInvulnerable() {
-        return true;
-    }
-    
-    /**
-     *  BOW
-     */
+
+	/**
+	 * BOW
+	 */
+	protected String getLivingSound() {
+		return "hbm:entity.megaquacc";
+	}
+
+	/**
+	 * BOW
+	 */
+	protected String getHurtSound() {
+		return "hbm:entity.megaquacc";
+	}
+
+	/**
+	 * BOW
+	 */
+	protected String getDeathSound() {
+		return "hbm:entity.megaquacc";
+	}
+
+	/**
+	 * BOW
+	 */
+	public EntityQuackos createChild(EntityAgeable entity) {
+		return new EntityQuackos(this.worldObj);
+	}
+
+	/**
+	 * BOW
+	 */
+	public boolean isEntityInvulnerable() {
+		return true;
+	}
+
+	/**
+	 * BOW
+	 */
+	public void setDead() { } //prank'd
+
+	/**
+	 * BOW
+	 */
+	public void setHealth(float f) {
+		super.setHealth(this.getMaxHealth());
+	} //prank'd
+
+	/**
+	 * BOW
+	 */
 	public boolean interact(EntityPlayer player) {
-		
+
 		if(super.interact(player)) {
 			return true;
-			
-		} else if(!this.worldObj.isRemote && (this.riddenByEntity == null || this.riddenByEntity == player)) {
-			player.mountEntity(this);
-			return true;
-			
+
 		} else {
+			
+			if(player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.peas) {
+				
+				if(worldObj.isRemote) {
+					for(int i = 0; i < 150; i++) {
+						
+						EntityBSmokeFX fx = new EntityBSmokeFX(worldObj);
+						fx.setPositionAndRotation(posX + rand.nextDouble() * width * 2 - width, posY + rand.nextDouble() * height * 1.5, posZ + rand.nextDouble() * width * 2 - width, 0, 0);
+						worldObj.spawnEntityInWorld(fx);
+					}
+				}
+				
+				player.getHeldItem().stackSize--;
+				player.swingItem();
+				
+				this.isDead = true;
+				return true;
+			}
+
+			if(!this.worldObj.isRemote && (this.riddenByEntity == null || this.riddenByEntity == player)) {
+				player.mountEntity(this);
+				return true;
+			}
+
 			return false;
 		}
-    }
-    
-    /**
-     *  BOW
-     */
-    public void updateRiderPosition() {
-    	
-        super.updateRiderPosition();
-        float f = MathHelper.sin(this.renderYawOffset * (float)Math.PI / 180.0F);
-        float f1 = MathHelper.cos(this.renderYawOffset * (float)Math.PI / 180.0F);
-        float f2 = 0.1F;
-        float f3 = 0.0F;
-        this.riddenByEntity.setPosition(this.posX + (double)(f2 * f), this.posY + (double)(this.height - 0.125F) + this.riddenByEntity.getYOffset() + (double)f3, this.posZ - (double)(f2 * f1));
+	}
 
-        if (this.riddenByEntity instanceof EntityLivingBase) {
-            ((EntityLivingBase)this.riddenByEntity).renderYawOffset = this.renderYawOffset;
-        }
-    }
+	/**
+	 * BOW
+	 */
+	public void updateRiderPosition() {
 
-    /**
-     *  BOW
-     */
-    @SideOnly(Side.CLIENT)
-    public float getShadowSize()
-    {
-        return 7.5F;
-    }
+		super.updateRiderPosition();
+		float f = MathHelper.sin(this.renderYawOffset * (float) Math.PI / 180.0F);
+		float f1 = MathHelper.cos(this.renderYawOffset * (float) Math.PI / 180.0F);
+		float f2 = 0.1F;
+		float f3 = 0.0F;
+		this.riddenByEntity.setPosition(this.posX + (double) (f2 * f), this.posY + (double) (this.height - 0.125F) + this.riddenByEntity.getYOffset() + (double) f3, this.posZ - (double) (f2 * f1));
+
+		if(this.riddenByEntity instanceof EntityLivingBase) {
+			((EntityLivingBase) this.riddenByEntity).renderYawOffset = this.renderYawOffset;
+		}
+	}
+
+	/**
+	 * BOW
+	 */
+	@SideOnly(Side.CLIENT)
+	public float getShadowSize() {
+		return 7.5F;
+	}
 }

src/main/java/com/hbm/items/ModItems.java

@@ -610,6 +610,9 @@ public class ModItems {
 	public static Item cell_antimatter;
 	public static Item cell_anti_schrabidium;
 
+	public static Item demon_core_open;
+	public static Item demon_core_closed;
+
 	public static Item particle_empty;
 	public static Item particle_hydrogen;
 	public static Item particle_copper;
@@ -1351,6 +1354,7 @@ public class ModItems {
 	public static Item gun_cryolator_ammo;
 	public static Item gun_mp;
 	public static Item gun_bolter;
+	public static Item gun_bolter_digamma;
 	public static Item gun_brimstone;
 	public static Item gun_zomg;
 	public static Item gun_super_shotgun;
@@ -1444,6 +1448,7 @@ public class ModItems {
 	public static Item pudding;
 	public static Item pancake;
 	public static Item nugget;
+	public static Item peas;
 
 	public static Item med_ipecac;
 	public static Item med_ptsd;
@@ -2567,6 +2572,9 @@ public class ModItems {
 		cell_sas3 = new ItemRadioactive(10F, false, true).setUnlocalizedName("cell_sas3").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_sas3");
 		cell_anti_schrabidium = new ItemDrop().setUnlocalizedName("cell_anti_schrabidium").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_anti_schrabidium");
 
+		demon_core_open = new ItemDemonCore().setUnlocalizedName("demon_core_open").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":demon_core_open");
+		demon_core_closed = new ItemRadioactive(100000F).setUnlocalizedName("demon_core_closed").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":demon_core_closed");
+
 		particle_empty = new Item().setUnlocalizedName("particle_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":particle_empty");
 		particle_hydrogen = new Item().setUnlocalizedName("particle_hydrogen").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_hydrogen");
 		particle_copper = new Item().setUnlocalizedName("particle_copper").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_copper");
@@ -3344,6 +3352,7 @@ public class ModItems {
 		ammo_566_gold = new ItemCustomLore().setUnlocalizedName("gun_mp_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_pm_ammo");
 		gun_mp = new ItemGunBase(Gun556mmFactory.getEuphieConfig()).setUnlocalizedName("gun_mp").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_pm");
 		gun_bolter = new ItemGunBase(Gun75BoltFactory.getBolterConfig()).setUnlocalizedName("gun_bolter").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_bolter");
+		gun_bolter_digamma = new ItemGunBase(Gun75BoltFactory.getBolterConfig()).setUnlocalizedName("gun_bolter_digamma").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_bolter_digamma");
 		gun_brimstone = new GunBrimstone().setUnlocalizedName("gun_brimstone").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_brimstone");
 		gun_zomg = new ItemGunBase(GunEnergyFactory.getZOMGConfig()).setUnlocalizedName("gun_zomg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_zomg");
 		gun_revolver_inverted = new GunSuicide().setUnlocalizedName("gun_revolver_inverted").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_inverted");
@@ -3442,6 +3451,7 @@ public class ModItems {
 		canteen_fab = new ItemCanteen(2 * 60).setUnlocalizedName("canteen_fab").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_fab");
 		pancake = new ItemPancake(20, 20, false).setUnlocalizedName("pancake").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pancake");
 		nugget = new ItemLemon(200, 200, false).setUnlocalizedName("nugget").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nugget");
+		peas = new ItemLemon(2, 4, false).setUnlocalizedName("peas").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":peas");
 
 		defuser = new Item().setUnlocalizedName("defuser").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":defuser");
 		
@@ -4892,6 +4902,10 @@ public class ModItems {
 		GameRegistry.registerItem(cell_sas3, cell_sas3.getUnlocalizedName());
 		GameRegistry.registerItem(cell_antimatter, cell_antimatter.getUnlocalizedName());
 		GameRegistry.registerItem(cell_anti_schrabidium, cell_anti_schrabidium.getUnlocalizedName());
+
+		//DEMON CORE
+		GameRegistry.registerItem(demon_core_open, demon_core_open.getUnlocalizedName());
+		GameRegistry.registerItem(demon_core_closed, demon_core_closed.getUnlocalizedName());
 		
 		//Particle Containers
 		GameRegistry.registerItem(particle_empty, particle_empty.getUnlocalizedName());
@@ -5595,6 +5609,7 @@ public class ModItems {
 		GameRegistry.registerItem(gun_cryolator, gun_cryolator.getUnlocalizedName());
 		GameRegistry.registerItem(gun_mp, gun_mp.getUnlocalizedName());
 		GameRegistry.registerItem(gun_bolter, gun_bolter.getUnlocalizedName());
+		GameRegistry.registerItem(gun_bolter_digamma, gun_bolter_digamma.getUnlocalizedName());
 		GameRegistry.registerItem(gun_brimstone, gun_brimstone.getUnlocalizedName());
 		GameRegistry.registerItem(gun_zomg, gun_zomg.getUnlocalizedName());
 		GameRegistry.registerItem(gun_emp, gun_emp.getUnlocalizedName());
@@ -6019,6 +6034,7 @@ public class ModItems {
 		GameRegistry.registerItem(pudding, pudding.getUnlocalizedName());
 		GameRegistry.registerItem(pancake, pancake.getUnlocalizedName());
 		GameRegistry.registerItem(nugget, nugget.getUnlocalizedName());
+		GameRegistry.registerItem(peas, peas.getUnlocalizedName());
 		GameRegistry.registerItem(med_ipecac, med_ipecac.getUnlocalizedName());
 		GameRegistry.registerItem(med_ptsd, med_ptsd.getUnlocalizedName());
 		GameRegistry.registerItem(canteen_13, canteen_13.getUnlocalizedName());

src/main/java/com/hbm/items/armor/ArmorFSB.java

@@ -474,7 +474,7 @@ public class ArmorFSB extends ItemArmor {
 		if(this.armorType != 1)
 			return;
 		
-		if(!this.hasFSBArmor(entity))
+		if(!this.hasFSBArmor(entity) || !this.geigerSound)
 			return;
 		
 		if(world.getTotalWorldTime() % 5 == 0) {

src/main/java/com/hbm/items/armor/ItemModPads.java

@@ -26,7 +26,7 @@ public class ItemModPads extends ItemArmorMod {
 			list.add(EnumChatFormatting.RED + "-" + Math.round((1F - damageMod) * 100) + "% fall damage");
 		
 		if(this == ModItems.pads_static)
-			list.add(EnumChatFormatting.DARK_PURPLE + "Passively charges electric armmor when walking");
+			list.add(EnumChatFormatting.DARK_PURPLE + "Passively charges electric armor when walking");
 		
 		list.add("");
 		super.addInformation(itemstack, player, list, bool);

src/main/java/com/hbm/items/food/ItemLemon.java

@@ -208,6 +208,10 @@ public class ItemLemon extends ItemFood {
 			list.add("Performant explosive for many applications.");
 			list.add("Edible");
 		}
+
+		if(this == ModItems.peas) {
+			list.add("He accepts your offering.");
+		}
 	}
 
 

src/main/java/com/hbm/items/special/ItemDemonCore.java

@@ -0,0 +1,36 @@
+package com.hbm.items.special;
+
+import java.util.List;
+
+import com.hbm.items.ModItems;
+import com.hbm.util.I18nUtil;
+
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+public class ItemDemonCore extends ItemRadioactive {
+
+	public ItemDemonCore() {
+		super(5.0F);
+	}
+
+	@Override
+	public boolean onEntityItemUpdate(EntityItem entityItem) {
+		
+		if(entityItem != null && !entityItem.worldObj.isRemote && entityItem.onGround) {
+			entityItem.setEntityItemStack(new ItemStack(ModItems.demon_core_closed));
+			entityItem.worldObj.spawnEntityInWorld(new EntityItem(entityItem.worldObj, entityItem.posX, entityItem.posY, entityItem.posZ, new ItemStack(ModItems.screwdriver)));
+			return true;
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
+		super.addInformation(itemstack, player, list, bool);
+		list.add(EnumChatFormatting.RED + "[" + I18nUtil.resolveKey("trait.drop") + "]");
+	}
+}

src/main/java/com/hbm/main/ClientProxy.java

@@ -316,6 +316,7 @@ public class ClientProxy extends ServerProxy {
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_vortex, new ItemRenderWeaponVortex());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_thompson, new ItemRenderWeaponThompson());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_bolter, new ItemRenderWeaponBolter());
+		MinecraftForgeClient.registerItemRenderer(ModItems.gun_bolter_digamma, new ItemRenderWeaponBolter());
 		//multitool
 		MinecraftForgeClient.registerItemRenderer(ModItems.multitool_dig, new ItemRenderMultitool());
 		MinecraftForgeClient.registerItemRenderer(ModItems.multitool_silk, new ItemRenderMultitool());

src/main/java/com/hbm/main/ResourceManager.java

@@ -540,6 +540,7 @@ public class ResourceManager {
 	public static final ResourceLocation vortex_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/vortex.png");
 	public static final ResourceLocation thompson_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/thompson.png");
 	public static final ResourceLocation bolter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/bolter.png");
+	public static final ResourceLocation bolter_digamma_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/bolter_digamma.png");
 
 	public static final ResourceLocation grenade_mk2 = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_mk2.png");
 	public static final ResourceLocation grenade_aschrab_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_aschrab.png");

src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponBolter.java

@@ -2,6 +2,7 @@ package com.hbm.render.item.weapon;
 
 import org.lwjgl.opengl.GL11;
 
+import com.hbm.items.ModItems;
 import com.hbm.items.weapon.ItemGunBase;
 import com.hbm.main.ResourceManager;
 import com.hbm.render.anim.HbmAnimations;
@@ -43,7 +44,10 @@ public class ItemRenderWeaponBolter implements IItemRenderer {
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 
-		Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.bolter_tex);
+		if(item.getItem() == ModItems.gun_bolter)
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.bolter_tex);
+		if(item.getItem() == ModItems.gun_bolter_digamma)
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.bolter_digamma_tex);
 		
 		switch(type) {