Merge branch 'HbmMods:master' into master

changelog

@@ -19,4 +19,7 @@
 * Fixed compatibility with EndlessIDs, biome changes should no longer crash the game
 * Fixed GL state leak caused by fluid tanks, causing some tile entities to be rendered without face culling
 * Fixed a bug where using too many PWR heatsinks would cause an overflow, making the heat capacity negative
-* Fixed landmines generating into the floor on superflat worlds
+* Fixed landmines generating into the floor on superflat worlds
+* All NTM type explosions are no longer affected by difficulty setting, preventing them from dealing damage in peaceful mode
+  * There are a few instances of vanilla explosions still being used, those will be phased out in the future
+* Fixed tutorial presentations triggering when hitting F1 not just in the inventory but also when looking at the block in question

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

@@ -39,10 +39,12 @@ public class WeaponRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_henry, 1), new Object[] { "BRP", "BMS", 'B', STEEL.lightBarrel(), 'R', GUNMETAL.lightReceiver(), 'M', GUNMETAL.mechanism(), 'S', WOOD.stock(), 'P', GUNMETAL.plate() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_greasegun, 1), new Object[] { "BRS", "SMG", 'B', STEEL.lightBarrel(), 'R', STEEL.lightReceiver(), 'S', STEEL.bolt(), 'M', GUNMETAL.mechanism(), 'G', STEEL.grip() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_maresleg, 1), new Object[] { "BRM", "BGS", 'B', STEEL.lightBarrel(), 'R', STEEL.lightReceiver(), 'M', GUNMETAL.mechanism(), 'G', STEEL.bolt(), 'S', WOOD.stock() });
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_flaregun, 1), new Object[] { "BRM", "  G", 'B', STEEL.heavyBarrel(), 'R', STEEL.lightReceiver(), 'M', GUNMETAL.mechanism(), 'B', STEEL.grip() });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_flaregun, 1), new Object[] { "BRM", "  G", 'B', STEEL.heavyBarrel(), 'R', STEEL.lightReceiver(), 'M', GUNMETAL.mechanism(), 'G', STEEL.grip() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_heavy_revolver, 1), new Object[] { "BRM", "  G", 'B', DURA.lightBarrel(), 'R', DURA.lightReceiver(), 'M', GUNMETAL.mechanism(), 'G', WOOD.grip() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_carbine, 1), new Object[] { "BRM", "G S", 'B', DURA.lightBarrel(), 'R', DURA.lightReceiver(), 'M', GUNMETAL.mechanism(), 'G', WOOD.grip(), 'S', WOOD.stock() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_am180, 1), new Object[] { "BBR", "GMS", 'B', DURA.lightBarrel(), 'R', DURA.lightReceiver(), 'M', GUNMETAL.mechanism(), 'G', WOOD.grip(), 'S', WOOD.stock() });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_liberator, 1), new Object[] { "BB ", "BBM", "G G", 'B', DURA.lightBarrel(), 'M', GUNMETAL.mechanism(), 'G', WOOD.grip() });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_congolake, 1), new Object[] { "BM ", "BRS", "G  ", 'B', DURA.heavyBarrel(), 'M', GUNMETAL.mechanism(), 'R', DURA.lightReceiver(), 'S', WOOD.stock(), 'G', WOOD.grip() });
 		
 		//SEDNA Ammo
 		CraftingManager.addRecipeAuto(DictFrame.fromOne(ModItems.ammo_standard, EnumAmmo.STONE, 6), new Object[] { "C", "P", "G", 'C', KEY_COBBLESTONE, 'P', Items.paper, 'G', Items.gunpowder });
@@ -98,7 +100,6 @@ public class WeaponRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_karl, 1), new Object[] { "SSW", " MW", 'S', STEEL.shell(), 'W', ALLOY.plate(), 'M', ModItems.mechanism_launcher_2 });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_quadro, 1), new Object[] { "SSS", "SSS", "CM ", 'S', STEEL.pipe(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'M', ModItems.mechanism_launcher_2 });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_hk69, 1), new Object[] { "SSI", " MB", 'S', STEEL.shell(), 'I', IRON.ingot(), 'M', ModItems.mechanism_launcher_1, 'B', STEEL.bolt() });
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_congolake, 1), new Object[] { "HHR", "WLW", 'H', AL.shell(), 'R', ModItems.mechanism_rifle_1, 'W', KEY_LOG, 'L', ModItems.mechanism_launcher_1 });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_stinger, 1), new Object[] { "SSW", "CMW", 'S', STEEL.plate(), 'W', TI.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'M', ModItems.mechanism_launcher_2 });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver, 1), new Object[] { "SSM", " RW", 'S', STEEL.plate(), 'W', KEY_PLANKS, 'R', AL.wireFine(), 'M', ModItems.mechanism_revolver_1 });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver_saturnite, 1), new Object[] { "SSM", " RW", 'S', BIGMT.plate(), 'W', KEY_PLANKS, 'R', W.wireFine(), 'M', ModItems.mechanism_revolver_2 });

src/main/java/com/hbm/entity/projectile/EntityBulletBaseMK4.java

@@ -110,6 +110,8 @@ public class EntityBulletBaseMK4 extends EntityThrowableInterp {
 		}
 		
 		if(!worldObj.isRemote && this.ticksExisted > config.expires) this.setDead();
+		
+		if(this.config.onUpdate != null) this.config.onUpdate.accept(this);
 	}
 	
 	@Override
@@ -124,6 +126,10 @@ public class EntityBulletBaseMK4 extends EntityThrowableInterp {
 	protected void onImpact(MovingObjectPosition mop) {
 		if(!worldObj.isRemote) {
 			
+			if(this.config.onImpact != null) this.config.onImpact.accept(this, mop);
+			
+			if(this.isDead) return;
+			
 			if(mop.typeOfHit == mop.typeOfHit.BLOCK) {
 
 				ForgeDirection dir = ForgeDirection.getOrientation(mop.sideHit);

src/main/java/com/hbm/explosion/ExplosionNT.java

@@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.EntityDamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.ChunkPosition;
@@ -156,7 +157,7 @@ public class ExplosionNT extends Explosion {
 						currentZ /= d9;
 						double d10 = (double) this.worldObj.getBlockDensity(vec3, entity.boundingBox);
 						double d11 = (1.0D - d4) * d10;
-						entity.attackEntityFrom(DamageSource.setExplosionSource(this), (float) ((int) ((d11 * d11 + d11) / 2.0D * 8.0D * (double) this.explosionSize + 1.0D)));
+						entity.attackEntityFrom(setExplosionSource(this), (float) ((int) ((d11 * d11 + d11) / 2.0D * 8.0D * (double) this.explosionSize + 1.0D)));
 						double d8 = EnchantmentProtection.func_92092_a(entity, d11);
 						entity.motionX += currentX * d8;
 						entity.motionY += currentY * d8;
@@ -173,6 +174,12 @@ public class ExplosionNT extends Explosion {
 		}
 	}
 
+	public static DamageSource setExplosionSource(Explosion explosion) {
+		return explosion != null && explosion.getExplosivePlacedBy() != null ?
+				(new EntityDamageSource("explosion.player", explosion.getExplosivePlacedBy())).setExplosion() :
+					(new DamageSource("explosion")).setExplosion();
+	}
+
 	public void doExplosionB(boolean p_77279_1_) {
 
 		if(!has(ExAttrib.NOSOUND))

src/main/java/com/hbm/explosion/vanillant/standard/EntityProcessorCross.java

@@ -13,7 +13,9 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.EntityDamageSource;
 import net.minecraft.util.Vec3;
+import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.event.ForgeEventFactory;
@@ -86,8 +88,8 @@ public class EntityProcessorCross implements IEntityProcessor {
 					}
 					
 					double knockback = (1.0D - distanceScaled) * density;
-					
-					entity.attackEntityFrom(DamageSource.setExplosionSource(explosion.compat), (float) ((int) ((knockback * knockback + knockback) / 2.0D * 8.0D * size + 1.0D)));
+
+					entity.attackEntityFrom(setExplosionSource(explosion.compat), calculateDamage(distanceScaled, density, knockback, size));
 					double enchKnockback = EnchantmentProtection.func_92092_a(entity, knockback);
 					
 					entity.motionX += deltaX * enchKnockback;
@@ -108,6 +110,16 @@ public class EntityProcessorCross implements IEntityProcessor {
 		return affectedPlayers;
 	}
 	
+	public float calculateDamage(double distanceScaled, double density, double knockback, float size) {
+		return (float) ((int) ((knockback * knockback + knockback) / 2.0D * 8.0D * size + 1.0D));
+	}
+
+	public static DamageSource setExplosionSource(Explosion explosion) {
+		return explosion != null && explosion.getExplosivePlacedBy() != null ?
+				(new EntityDamageSource("explosion.player", explosion.getExplosivePlacedBy())).setExplosion() :
+					(new DamageSource("explosion")).setExplosion();
+	}
+	
 	public EntityProcessorCross withRangeMod(float mod) {
 		range = new IEntityRangeMutator() {
 			@Override

src/main/java/com/hbm/explosion/vanillant/standard/EntityProcessorCrossSmooth.java

@@ -0,0 +1,15 @@
+package com.hbm.explosion.vanillant.standard;
+
+public class EntityProcessorCrossSmooth extends EntityProcessorCross {
+
+	protected float fixedDamage;
+	
+	public EntityProcessorCrossSmooth(double nodeDist, float fixedDamage) {
+		super(nodeDist);
+		this.fixedDamage = fixedDamage;
+	}
+	
+	public float calculateDamage(double distanceScaled, double density, double knockback, float size) {
+		return (float) (fixedDamage * (1 - distanceScaled));
+	}
+}

src/main/java/com/hbm/explosion/vanillant/standard/EntityProcessorStandard.java

@@ -13,7 +13,9 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.EntityDamageSource;
 import net.minecraft.util.Vec3;
+import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 import net.minecraftforge.event.ForgeEventFactory;
 
@@ -67,7 +69,7 @@ public class EntityProcessorStandard implements IEntityProcessor {
 					double density = world.getBlockDensity(vec3, entity.boundingBox);
 					double knockback = (1.0D - distanceScaled) * density;
 					
-					entity.attackEntityFrom(DamageSource.setExplosionSource(explosion.compat), (float) ((int) ((knockback * knockback + knockback) / 2.0D * 8.0D * size + 1.0D)));
+					entity.attackEntityFrom(setExplosionSource(explosion.compat), calculateDamage(distanceScaled, density, knockback, size));
 					double enchKnockback = EnchantmentProtection.func_92092_a(entity, knockback);
 					
 					entity.motionX += deltaX * enchKnockback;
@@ -88,6 +90,16 @@ public class EntityProcessorStandard implements IEntityProcessor {
 		return affectedPlayers;
 	}
 	
+	public float calculateDamage(double distanceScaled, double density, double knockback, float size) {
+		return (float) ((int) ((knockback * knockback + knockback) / 2.0D * 8.0D * size + 1.0D));
+	}
+
+	public static DamageSource setExplosionSource(Explosion explosion) {
+		return explosion != null && explosion.getExplosivePlacedBy() != null ?
+				(new EntityDamageSource("explosion.player", explosion.getExplosivePlacedBy())).setExplosion() :
+					(new DamageSource("explosion")).setExplosion();
+	}
+	
 	public EntityProcessorStandard withRangeMod(float mod) {
 		range = new IEntityRangeMutator() {
 			@Override

src/main/java/com/hbm/items/weapon/sedna/BulletConfig.java

@@ -3,6 +3,7 @@ package com.hbm.items.weapon.sedna;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
 import com.hbm.entity.projectile.EntityBulletBaseMK4;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
@@ -15,6 +16,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.Item;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EntityDamageSourceIndirect;
+import net.minecraft.util.MovingObjectPosition;
 
 public class BulletConfig {
 	
@@ -45,6 +47,9 @@ public class BulletConfig {
 	public int maxRicochetCount = 2;
 	/** Whether damage dealt to an entity is subtracted from the projectile's damage on penetration */
 	public boolean damageFalloffByPen = true;
+
+	public Consumer<EntityBulletBaseMK4> onUpdate;
+	public BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> onImpact;
 	
 	public double gravity = 0;
 	public int expires = 30;
@@ -88,6 +93,9 @@ public class BulletConfig {
 	public BulletConfig setCasing(SpentCasing casing) {									this.casing = casing; return this; }
 	public BulletConfig setRenderer(BiConsumer<EntityBulletBaseMK4, Float> renderer) {	this.renderer = renderer; return this; }
 	
+	public BulletConfig setOnUpdate(Consumer<EntityBulletBaseMK4> lambda) {							this.onUpdate = lambda; return this; }
+	public BulletConfig setOnImpact(BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> lambda) {	this.onImpact = lambda; return this; }
+	
 	public DamageSource getDamage(EntityBulletBaseMK4 bullet, EntityLivingBase shooter, boolean bypass) {
 		
 		DamageSource dmg;

src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java

@@ -9,21 +9,10 @@ import static com.hbm.items.weapon.sedna.factory.XFactory44.*;
 import static com.hbm.items.weapon.sedna.factory.XFactory762mm.*;
 import static com.hbm.items.weapon.sedna.factory.XFactory9mm.*;
 
-import java.util.function.BiConsumer;
-
-import org.lwjgl.opengl.GL11;
-
-import com.hbm.entity.projectile.EntityBulletBaseMK4;
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.sedna.ItemGunBaseNT;
-import com.hbm.lib.RefStrings;
 import com.hbm.render.item.weapon.sedna.*;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ActiveRenderInfo;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.MinecraftForgeClient;
 
 public class GunFactoryClient {
@@ -44,36 +33,37 @@ public class GunFactoryClient {
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_liberator, new ItemRenderLiberator());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_congolake, new ItemRenderCongoLake());
 		//PROJECTILES
-		ammo_debug.setRenderer(RENDER_STANDARD_BULLET);
-		ammo_debug_buckshot.setRenderer(RENDER_STANDARD_BULLET);
-		m357_sp.setRenderer(RENDER_STANDARD_BULLET);
-		m357_fmj.setRenderer(RENDER_STANDARD_BULLET);
-		m357_jhp.setRenderer(RENDER_STANDARD_BULLET);
-		m357_ap.setRenderer(RENDER_AP_BULLET);
-		m357_express.setRenderer(RENDER_EXPRESS_BULLET);
-		m44_sp.setRenderer(RENDER_STANDARD_BULLET);
-		m44_fmj.setRenderer(RENDER_STANDARD_BULLET);
-		m44_jhp.setRenderer(RENDER_STANDARD_BULLET);
-		m44_ap.setRenderer(RENDER_AP_BULLET);
-		m44_express.setRenderer(RENDER_EXPRESS_BULLET);
-		p9_sp.setRenderer(RENDER_STANDARD_BULLET);
-		p9_fmj.setRenderer(RENDER_STANDARD_BULLET);
-		p9_jhp.setRenderer(RENDER_STANDARD_BULLET);
-		p9_ap.setRenderer(RENDER_AP_BULLET);
-		g12_bp.setRenderer(RENDER_STANDARD_BULLET);
-		g12_bp_magnum.setRenderer(RENDER_STANDARD_BULLET);
-		g12_bp_slug.setRenderer(RENDER_STANDARD_BULLET);
-		g12.setRenderer(RENDER_STANDARD_BULLET);
-		g40_flare.setRenderer(RENDER_FLARE);
-		r762_sp.setRenderer(RENDER_STANDARD_BULLET);
-		r762_fmj.setRenderer(RENDER_STANDARD_BULLET);
-		r762_jhp.setRenderer(RENDER_STANDARD_BULLET);
-		r762_ap.setRenderer(RENDER_AP_BULLET);
-		r762_du.setRenderer(RENDER_DU_BULLET);
-		p22_sp.setRenderer(RENDER_STANDARD_BULLET);
-		p22_fmj.setRenderer(RENDER_STANDARD_BULLET);
-		p22_jhp.setRenderer(RENDER_STANDARD_BULLET);
-		p22_ap.setRenderer(RENDER_AP_BULLET);
+		ammo_debug.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		ammo_debug_buckshot.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		m357_sp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		m357_fmj.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		m357_jhp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		m357_ap.setRenderer(LegoClient.RENDER_AP_BULLET);
+		m357_express.setRenderer(LegoClient.RENDER_EXPRESS_BULLET);
+		m44_sp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		m44_fmj.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		m44_jhp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		m44_ap.setRenderer(LegoClient.RENDER_AP_BULLET);
+		m44_express.setRenderer(LegoClient.RENDER_EXPRESS_BULLET);
+		p9_sp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		p9_fmj.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		p9_jhp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		p9_ap.setRenderer(LegoClient.RENDER_AP_BULLET);
+		g12_bp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		g12_bp_magnum.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		g12_bp_slug.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		g12.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		r762_sp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		r762_fmj.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		r762_jhp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		r762_ap.setRenderer(LegoClient.RENDER_AP_BULLET);
+		r762_du.setRenderer(LegoClient.RENDER_DU_BULLET);
+		p22_sp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		p22_fmj.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		p22_jhp.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
+		p22_ap.setRenderer(LegoClient.RENDER_AP_BULLET);
+		g40_flare.setRenderer(LegoClient.RENDER_FLARE);
+		g40.setRenderer(LegoClient.RENDER_GRENADE);
 		//HUDS
 		((ItemGunBaseNT) ModItems.gun_debug)			.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
 		((ItemGunBaseNT) ModItems.gun_pepperbox)		.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
@@ -90,130 +80,4 @@ public class GunFactoryClient {
 		((ItemGunBaseNT) ModItems.gun_light_revolver_dani).getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY_MIRROR, LegoClient.HUD_COMPONENT_AMMO_MIRROR);
 		((ItemGunBaseNT) ModItems.gun_light_revolver_dani).getConfig(null, 1).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
 	}
-	
-	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_STANDARD_BULLET = (bullet, interp) -> {
-		double length = bullet.prevVelocity + (bullet.velocity - bullet.prevVelocity) * interp;
-		if(length <= 0) return;
-		renderBulletStandard(Tessellator.instance, 0xFFBF00, 0xFFFFFF, length, false);
-	};
-	
-	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_AP_BULLET = (bullet, interp) -> {
-		double length = bullet.prevVelocity + (bullet.velocity - bullet.prevVelocity) * interp;
-		if(length <= 0) return;
-		renderBulletStandard(Tessellator.instance, 0xFF6A00, 0xFFE28D, length, false);
-	};
-	
-	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_EXPRESS_BULLET = (bullet, interp) -> {
-		double length = bullet.prevVelocity + (bullet.velocity - bullet.prevVelocity) * interp;
-		if(length <= 0) return;
-		renderBulletStandard(Tessellator.instance, 0x9E082E, 0xFF8A79, length, false);
-	};
-	
-	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_DU_BULLET = (bullet, interp) -> {
-		double length = bullet.prevVelocity + (bullet.velocity - bullet.prevVelocity) * interp;
-		if(length <= 0) return;
-		renderBulletStandard(Tessellator.instance, 0x5CCD41, 0xE9FF8D, length, false);
-	};
-	
-	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_TRACER_BULLET = (bullet, interp) -> {
-		double length = bullet.prevVelocity + (bullet.velocity - bullet.prevVelocity) * interp;
-		if(length <= 0) return;
-		renderBulletStandard(Tessellator.instance, 0x9E082E, 0xFF8A79, length, true);
-	};
-	
-	public static void renderBulletStandard(Tessellator tess, int dark, int light, double length, boolean fullbright) { renderBulletStandard(tess, dark, light, length, 0.03125D, 0.03125D * 0.25D, fullbright); }
-	
-	public static void renderBulletStandard(Tessellator tess, int dark, int light, double length, double widthF, double widthB, boolean fullbright) {
-		
-		GL11.glDisable(GL11.GL_TEXTURE_2D);
-		GL11.glDisable(GL11.GL_CULL_FACE);
-		GL11.glDisable(GL11.GL_LIGHTING);
-		GL11.glShadeModel(GL11.GL_SMOOTH);
-		GL11.glColor4f(1F, 1F, 1F, 1F);
-		
-		tess.startDrawingQuads();
-		if(fullbright) tess.setBrightness(240);
-		tess.setNormal(0F, 1F, 0F);
-		tess.setColorOpaque_I(dark);
-		tess.addVertex(length, widthB, -widthB); tess.addVertex(length, widthB, widthB);
-		tess.setColorOpaque_I(light);
-		tess.addVertex(0, widthF, widthF); tess.addVertex(0, widthF, -widthF);
-		tess.setColorOpaque_I(dark);
-		tess.addVertex(length, -widthB, -widthB); tess.addVertex(length, -widthB, widthB);
-		tess.setColorOpaque_I(light);
-		tess.addVertex(0, -widthF, widthF); tess.addVertex(0, -widthF, -widthF);
-		tess.setColorOpaque_I(dark);
-		tess.addVertex(length, -widthB, widthB); tess.addVertex(length, widthB, widthB);
-		tess.setColorOpaque_I(light);
-		tess.addVertex(0, widthF, widthF); tess.addVertex(0, -widthF, widthF);
-		tess.setColorOpaque_I(dark);
-		tess.addVertex(length, -widthB, -widthB); tess.addVertex(length, widthB, -widthB);
-		tess.setColorOpaque_I(light);
-		tess.addVertex(0, widthF, -widthF); tess.addVertex(0, -widthF, -widthF);
-		tess.setColorOpaque_I(dark);
-		tess.addVertex(length, widthB, widthB); tess.addVertex(length, widthB, -widthB);
-		tess.addVertex(length, -widthB, -widthB); tess.addVertex(length, -widthB, widthB);
-		tess.setColorOpaque_I(light);
-		tess.addVertex(0, widthF, widthF); tess.addVertex(0, widthF, -widthF);
-		tess.addVertex(0, -widthF, -widthF); tess.addVertex(0, -widthF, widthF);
-		tess.draw();
-		
-		GL11.glShadeModel(GL11.GL_FLAT);
-		GL11.glEnable(GL11.GL_LIGHTING);
-		GL11.glEnable(GL11.GL_CULL_FACE);
-		GL11.glEnable(GL11.GL_TEXTURE_2D);
-	}
-
-	private static final ResourceLocation flare = new ResourceLocation(RefStrings.MODID + ":textures/particle/flare.png");
-	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_FLARE = (bullet, interp) -> {
-		
-		if(bullet.ticksExisted < 2) return;
-
-		GL11.glPushMatrix();
-		GL11.glEnable(GL11.GL_BLEND);
-		GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
-		GL11.glAlphaFunc(GL11.GL_GREATER, 0);
-		GL11.glDisable(GL11.GL_ALPHA_TEST);
-		GL11.glDepthMask(false);
-		RenderHelper.disableStandardItemLighting();
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(flare);
-
-		Tessellator tess = Tessellator.instance;
-		tess.startDrawingQuads();
-
-		float f1 = ActiveRenderInfo.rotationX;
-		float f2 = ActiveRenderInfo.rotationZ;
-		float f3 = ActiveRenderInfo.rotationYZ;
-		float f4 = ActiveRenderInfo.rotationXY;
-		float f5 = ActiveRenderInfo.rotationXZ;
-
-		double posX = 0;
-		double posY = 0;
-		double posZ = 0;
-		double scale = Math.min(5, (bullet.ticksExisted + interp - 2) * 0.5) * (0.8 + bullet.worldObj.rand.nextDouble() * 0.4);
-
-		tess.setColorRGBA_F(1F, 0.5F, 0.5F, 0.5F);
-		tess.addVertexWithUV((double) (posX - f1 * scale - f3 * scale), (double) (posY - f5 * scale), (double) (posZ - f2 * scale - f4 * scale), 1, 1);
-		tess.addVertexWithUV((double) (posX - f1 * scale + f3 * scale), (double) (posY + f5 * scale), (double) (posZ - f2 * scale + f4 * scale), 1, 0);
-		tess.addVertexWithUV((double) (posX + f1 * scale + f3 * scale), (double) (posY + f5 * scale), (double) (posZ + f2 * scale + f4 * scale), 0, 0);
-		tess.addVertexWithUV((double) (posX + f1 * scale - f3 * scale), (double) (posY - f5 * scale), (double) (posZ + f2 * scale - f4 * scale), 0, 1);
-
-		scale *= 0.5D;
-		
-		tess.setColorRGBA_F(1F, 1F, 1F, 0.75F);
-		tess.addVertexWithUV((double) (posX - f1 * scale - f3 * scale), (double) (posY - f5 * scale), (double) (posZ - f2 * scale - f4 * scale), 1, 1);
-		tess.addVertexWithUV((double) (posX - f1 * scale + f3 * scale), (double) (posY + f5 * scale), (double) (posZ - f2 * scale + f4 * scale), 1, 0);
-		tess.addVertexWithUV((double) (posX + f1 * scale + f3 * scale), (double) (posY + f5 * scale), (double) (posZ + f2 * scale + f4 * scale), 0, 0);
-		tess.addVertexWithUV((double) (posX + f1 * scale - f3 * scale), (double) (posY - f5 * scale), (double) (posZ + f2 * scale - f4 * scale), 0, 1);
-
-		tess.draw();
-
-		GL11.glDepthMask(true);
-		GL11.glEnable(GL11.GL_ALPHA_TEST);
-		RenderHelper.enableStandardItemLighting();
-		GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
-		GL11.glDisable(GL11.GL_BLEND);
-		GL11.glPopMatrix();
-	};
 }

src/main/java/com/hbm/items/weapon/sedna/factory/Lego.java

@@ -6,6 +6,10 @@ import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 
 import com.hbm.entity.projectile.EntityBulletBaseMK4;
+import com.hbm.explosion.vanillant.ExplosionVNT;
+import com.hbm.explosion.vanillant.standard.EntityProcessorCrossSmooth;
+import com.hbm.explosion.vanillant.standard.ExplosionEffectStandard;
+import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard;
 import com.hbm.items.weapon.sedna.BulletConfig;
 import com.hbm.items.weapon.sedna.GunConfig;
 import com.hbm.items.weapon.sedna.ItemGunBaseNT;
@@ -20,6 +24,7 @@ import com.hbm.render.anim.HbmAnimations.AnimType;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 
 /**
@@ -187,6 +192,14 @@ public class Lego {
 		return 1F - (percent - 0.75F) * 2F;
 	}
 	
+	public static void standardExplode(EntityBulletBaseMK4 bullet, MovingObjectPosition mop, float range) {
+		ExplosionVNT vnt = new ExplosionVNT(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, range);
+		vnt.setEntityProcessor(new EntityProcessorCrossSmooth(1, bullet.damage));
+		vnt.setPlayerProcessor(new PlayerProcessorStandard());
+		vnt.setSFX(new ExplosionEffectStandard());
+		vnt.explode();
+	}
+	
 	/** anims for the DEBUG revolver, mostly a copy of the li'lpip but with some fixes regarding the cylinder movement */
 	@SuppressWarnings("incomplete-switch") public static BiFunction<ItemStack, AnimType, BusAnimation> LAMBDA_DEBUG_ANIMS = (stack, type) -> {
 		switch(type) {

src/main/java/com/hbm/items/weapon/sedna/factory/LegoClient.java

@@ -1,7 +1,20 @@
 package com.hbm.items.weapon.sedna.factory;
 
+import java.util.function.BiConsumer;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.entity.projectile.EntityBulletBaseMK4;
 import com.hbm.items.weapon.sedna.hud.HUDComponentAmmoCounter;
 import com.hbm.items.weapon.sedna.hud.HUDComponentDurabilityBar;
+import com.hbm.lib.RefStrings;
+import com.hbm.main.ResourceManager;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.ActiveRenderInfo;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.ResourceLocation;
 
 public class LegoClient {
 
@@ -9,4 +22,141 @@ public class LegoClient {
 	public static HUDComponentDurabilityBar HUD_COMPONENT_DURABILITY_MIRROR = new HUDComponentDurabilityBar(true);
 	public static HUDComponentAmmoCounter HUD_COMPONENT_AMMO = new HUDComponentAmmoCounter(0);
 	public static HUDComponentAmmoCounter HUD_COMPONENT_AMMO_MIRROR = new HUDComponentAmmoCounter(0, true);
+	
+	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_STANDARD_BULLET = (bullet, interp) -> {
+		double length = bullet.prevVelocity + (bullet.velocity - bullet.prevVelocity) * interp;
+		if(length <= 0) return;
+		renderBulletStandard(Tessellator.instance, 0xFFBF00, 0xFFFFFF, length, false);
+	};
+	
+	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_AP_BULLET = (bullet, interp) -> {
+		double length = bullet.prevVelocity + (bullet.velocity - bullet.prevVelocity) * interp;
+		if(length <= 0) return;
+		renderBulletStandard(Tessellator.instance, 0xFF6A00, 0xFFE28D, length, false);
+	};
+	
+	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_EXPRESS_BULLET = (bullet, interp) -> {
+		double length = bullet.prevVelocity + (bullet.velocity - bullet.prevVelocity) * interp;
+		if(length <= 0) return;
+		renderBulletStandard(Tessellator.instance, 0x9E082E, 0xFF8A79, length, false);
+	};
+	
+	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_DU_BULLET = (bullet, interp) -> {
+		double length = bullet.prevVelocity + (bullet.velocity - bullet.prevVelocity) * interp;
+		if(length <= 0) return;
+		renderBulletStandard(Tessellator.instance, 0x5CCD41, 0xE9FF8D, length, false);
+	};
+	
+	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_TRACER_BULLET = (bullet, interp) -> {
+		double length = bullet.prevVelocity + (bullet.velocity - bullet.prevVelocity) * interp;
+		if(length <= 0) return;
+		renderBulletStandard(Tessellator.instance, 0x9E082E, 0xFF8A79, length, true);
+	};
+	
+	public static void renderBulletStandard(Tessellator tess, int dark, int light, double length, boolean fullbright) { renderBulletStandard(tess, dark, light, length, 0.03125D, 0.03125D * 0.25D, fullbright); }
+	
+	public static void renderBulletStandard(Tessellator tess, int dark, int light, double length, double widthF, double widthB, boolean fullbright) {
+		
+		GL11.glDisable(GL11.GL_TEXTURE_2D);
+		GL11.glDisable(GL11.GL_CULL_FACE);
+		GL11.glDisable(GL11.GL_LIGHTING);
+		GL11.glShadeModel(GL11.GL_SMOOTH);
+		GL11.glColor4f(1F, 1F, 1F, 1F);
+		
+		tess.startDrawingQuads();
+		if(fullbright) tess.setBrightness(240);
+		tess.setNormal(0F, 1F, 0F);
+		tess.setColorOpaque_I(dark);
+		tess.addVertex(length, widthB, -widthB); tess.addVertex(length, widthB, widthB);
+		tess.setColorOpaque_I(light);
+		tess.addVertex(0, widthF, widthF); tess.addVertex(0, widthF, -widthF);
+		tess.setColorOpaque_I(dark);
+		tess.addVertex(length, -widthB, -widthB); tess.addVertex(length, -widthB, widthB);
+		tess.setColorOpaque_I(light);
+		tess.addVertex(0, -widthF, widthF); tess.addVertex(0, -widthF, -widthF);
+		tess.setColorOpaque_I(dark);
+		tess.addVertex(length, -widthB, widthB); tess.addVertex(length, widthB, widthB);
+		tess.setColorOpaque_I(light);
+		tess.addVertex(0, widthF, widthF); tess.addVertex(0, -widthF, widthF);
+		tess.setColorOpaque_I(dark);
+		tess.addVertex(length, -widthB, -widthB); tess.addVertex(length, widthB, -widthB);
+		tess.setColorOpaque_I(light);
+		tess.addVertex(0, widthF, -widthF); tess.addVertex(0, -widthF, -widthF);
+		tess.setColorOpaque_I(dark);
+		tess.addVertex(length, widthB, widthB); tess.addVertex(length, widthB, -widthB);
+		tess.addVertex(length, -widthB, -widthB); tess.addVertex(length, -widthB, widthB);
+		tess.setColorOpaque_I(light);
+		tess.addVertex(0, widthF, widthF); tess.addVertex(0, widthF, -widthF);
+		tess.addVertex(0, -widthF, -widthF); tess.addVertex(0, -widthF, widthF);
+		tess.draw();
+		
+		GL11.glShadeModel(GL11.GL_FLAT);
+		GL11.glEnable(GL11.GL_LIGHTING);
+		GL11.glEnable(GL11.GL_CULL_FACE);
+		GL11.glEnable(GL11.GL_TEXTURE_2D);
+	}
+
+	private static final ResourceLocation flare = new ResourceLocation(RefStrings.MODID + ":textures/particle/flare.png");
+	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_FLARE = (bullet, interp) -> {
+		
+		if(bullet.ticksExisted < 2) return;
+
+		GL11.glPushMatrix();
+		GL11.glEnable(GL11.GL_BLEND);
+		GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
+		GL11.glAlphaFunc(GL11.GL_GREATER, 0);
+		GL11.glDisable(GL11.GL_ALPHA_TEST);
+		GL11.glDepthMask(false);
+		RenderHelper.disableStandardItemLighting();
+
+		Minecraft.getMinecraft().getTextureManager().bindTexture(flare);
+
+		Tessellator tess = Tessellator.instance;
+		tess.startDrawingQuads();
+
+		float f1 = ActiveRenderInfo.rotationX;
+		float f2 = ActiveRenderInfo.rotationZ;
+		float f3 = ActiveRenderInfo.rotationYZ;
+		float f4 = ActiveRenderInfo.rotationXY;
+		float f5 = ActiveRenderInfo.rotationXZ;
+
+		double posX = 0;
+		double posY = 0;
+		double posZ = 0;
+		double scale = Math.min(5, (bullet.ticksExisted + interp - 2) * 0.5) * (0.8 + bullet.worldObj.rand.nextDouble() * 0.4);
+
+		tess.setColorRGBA_F(1F, 0.5F, 0.5F, 0.5F);
+		tess.addVertexWithUV((double) (posX - f1 * scale - f3 * scale), (double) (posY - f5 * scale), (double) (posZ - f2 * scale - f4 * scale), 1, 1);
+		tess.addVertexWithUV((double) (posX - f1 * scale + f3 * scale), (double) (posY + f5 * scale), (double) (posZ - f2 * scale + f4 * scale), 1, 0);
+		tess.addVertexWithUV((double) (posX + f1 * scale + f3 * scale), (double) (posY + f5 * scale), (double) (posZ + f2 * scale + f4 * scale), 0, 0);
+		tess.addVertexWithUV((double) (posX + f1 * scale - f3 * scale), (double) (posY - f5 * scale), (double) (posZ + f2 * scale - f4 * scale), 0, 1);
+
+		scale *= 0.5D;
+		
+		tess.setColorRGBA_F(1F, 1F, 1F, 0.75F);
+		tess.addVertexWithUV((double) (posX - f1 * scale - f3 * scale), (double) (posY - f5 * scale), (double) (posZ - f2 * scale - f4 * scale), 1, 1);
+		tess.addVertexWithUV((double) (posX - f1 * scale + f3 * scale), (double) (posY + f5 * scale), (double) (posZ - f2 * scale + f4 * scale), 1, 0);
+		tess.addVertexWithUV((double) (posX + f1 * scale + f3 * scale), (double) (posY + f5 * scale), (double) (posZ + f2 * scale + f4 * scale), 0, 0);
+		tess.addVertexWithUV((double) (posX + f1 * scale - f3 * scale), (double) (posY - f5 * scale), (double) (posZ + f2 * scale - f4 * scale), 0, 1);
+
+		tess.draw();
+
+		GL11.glDepthMask(true);
+		GL11.glEnable(GL11.GL_ALPHA_TEST);
+		RenderHelper.enableStandardItemLighting();
+		GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
+		GL11.glDisable(GL11.GL_BLEND);
+		GL11.glPopMatrix();
+	};
+	
+	public static BiConsumer<EntityBulletBaseMK4, Float> RENDER_GRENADE = (bullet, interp) -> {
+
+		GL11.glScalef(0.25F, 0.25F, 0.25F);
+		GL11.glRotated(90, 0, 0, 1);
+		
+		GL11.glShadeModel(GL11.GL_SMOOTH);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(ResourceManager.grenade_tex);
+		ResourceManager.projectiles.renderPart("Grenade");
+		GL11.glShadeModel(GL11.GL_FLAT);
+	};
 }

src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java

@@ -101,6 +101,33 @@ public class Orchestras {
 		}
 	};
 	
+	public static BiConsumer<ItemStack, LambdaContext> ORCHESTRA_DANI = (stack, ctx) -> {
+		EntityPlayer player = ctx.player;
+		AnimType type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
+		int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
+
+		if(type == AnimType.RELOAD) {
+			if(timer == 2) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.magSmallRemove", 1F, 1F);
+			if(timer == 36) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.magSmallInsert", 1F, 1F);
+			if(timer == 44) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.revolverClose", 1F, 1F);
+		}
+		if(type == AnimType.CYCLE) {
+			if(timer == 9) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.revolverCock", 1F, 0.9F);
+		}
+		if(type == AnimType.CYCLE_DRY) {
+			if(timer == 2) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.dryFireClick", 1F, 1F);
+			if(timer == 9) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.revolverCock", 1F, 0.9F);
+		}
+		if(type == AnimType.INSPECT) {
+			if(timer == 2) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.magSmallRemove", 1F, 1F);
+			if(timer == 24) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.revolverClose", 1F, 1F);
+		}
+		if(type == AnimType.JAMMED) {
+			if(timer == 12) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.magSmallRemove", 1F, 1F);
+			if(timer == 34) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.revolverClose", 1F, 1F);
+		}
+	};
+	
 	public static BiConsumer<ItemStack, LambdaContext> ORCHESTRA_HENRY = (stack, ctx) -> {
 		EntityPlayer player = ctx.player;
 		AnimType type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);

src/main/java/com/hbm/items/weapon/sedna/factory/XFactory357.java

@@ -45,24 +45,24 @@ public class XFactory357 {
 				).setUnlocalizedName("gun_light_revolver").setTextureName(RefStrings.MODID + ":gun_darter");
 		
 		ModItems.gun_light_revolver_dani = new ItemGunBaseNT(
-				new GunConfig().dura(30_000).draw(4).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
+				new GunConfig().dura(30_000).draw(20).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
 				.rec(new Receiver(0)
-						.dmg(10F).delay(16).reload(55).jam(45).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F)
+						.dmg(10F).delay(11).reload(55).jam(45).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F)
 						.mag(new MagazineFullReload(0, 6).addConfigs(m357_sp, m357_fmj, m357_jhp, m357_ap, m357_express))
 						.offset(0.75, -0.0625, 0.3125D)
 						.canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_STANDARD_FIRE).recoil(Lego.LAMBDA_STANDARD_RECOIL))
 				.pp(Lego.LAMBDA_STANDARD_CLICK_PRIMARY).pr(Lego.LAMBDA_STANDARD_RELOAD)
 				.decider(GunStateDecider.LAMBDA_STANDARD_DECIDER)
-				.anim(LAMBDA_ATLAS_ANIMS).orchestra(Orchestras.ORCHESTRA_ATLAS),
-				new GunConfig().dura(30_000).draw(4).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
+				.anim(LAMBDA_DANI_ANIMS).orchestra(Orchestras.ORCHESTRA_DANI),
+				new GunConfig().dura(30_000).draw(20).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
 				.rec(new Receiver(0)
-						.dmg(10F).delay(16).reload(55).jam(45).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F)
+						.dmg(10F).delay(11).reload(55).jam(45).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F)
 						.mag(new MagazineFullReload(1, 6).addConfigs(m357_sp, m357_fmj, m357_jhp, m357_ap, m357_express))
 						.offset(0.75, -0.0625, -0.3125D)
 						.canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_STANDARD_FIRE).recoil(Lego.LAMBDA_STANDARD_RECOIL))
 				.ps(Lego.LAMBDA_STANDARD_CLICK_PRIMARY).pr(Lego.LAMBDA_STANDARD_RELOAD)
 				.decider(GunStateDecider.LAMBDA_STANDARD_DECIDER)
-				.anim(LAMBDA_ATLAS_ANIMS).orchestra(Orchestras.ORCHESTRA_ATLAS)
+				.anim(LAMBDA_DANI_ANIMS).orchestra(Orchestras.ORCHESTRA_DANI)
 				).setUnlocalizedName("gun_light_revolver_dani").setTextureName(RefStrings.MODID + ":gun_darter");
 	}
 
@@ -97,4 +97,19 @@ public class XFactory357 {
 		
 		return null;
 	};
+
+	@SuppressWarnings("incomplete-switch") public static BiFunction<ItemStack, AnimType, BusAnimation> LAMBDA_DANI_ANIMS = (stack, type) -> {
+		switch(type) {
+		case EQUIP: return new BusAnimation().addBus("EQUIP", new BusAnimationSequence().addPos(360 * 3, 0, 0, 1000, IType.SIN_DOWN));
+		case CYCLE: return new BusAnimation()
+				.addBus("RECOIL", new BusAnimationSequence().addPos(0, 0, 0, 50).addPos(0, 0, -3, 50).addPos(0, 0, 0, 250))
+				.addBus("HAMMER", new BusAnimationSequence().addPos(0, 0, 1, 50).addPos(0, 0, 1, 300).addPos(0, 0, 0, 200))
+				.addBus("DRUM", new BusAnimationSequence().addPos(0, 0, 0, 350).addPos(0, 0, 1, 200));
+		case CYCLE_DRY: return new BusAnimation()
+				.addBus("HAMMER", new BusAnimationSequence().addPos(0, 0, 1, 50).addPos(0, 0, 1, 200).addPos(0, 0, 0, 200))
+				.addBus("DRUM", new BusAnimationSequence().addPos(0, 0, 0, 350).addPos(0, 0, 1, 200));
+		}
+		
+		return LAMBDA_ATLAS_ANIMS.apply(stack, type);
+	};
 }

src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java

@@ -3,6 +3,7 @@ package com.hbm.items.weapon.sedna.factory;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 
+import com.hbm.entity.projectile.EntityBulletBaseMK4;
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.sedna.BulletConfig;
 import com.hbm.items.weapon.sedna.Crosshair;
@@ -22,21 +23,26 @@ import com.hbm.render.anim.BusAnimationKeyframe.IType;
 import com.hbm.render.anim.HbmAnimations.AnimType;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition;
 
 public class XFactory40mm {
 
 	public static BulletConfig g40_flare;
 	public static BulletConfig g40;
 	
+	public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_STANDARD_EXPLODE = (bullet, mop) -> {
+		Lego.standardExplode(bullet, mop, 5F); bullet.setDead();
+	};
+	
 	public static void init() {
 		
-		g40_flare = new BulletConfig().setItem(EnumAmmo.G40_FLARE).setVel(2F).setGrav(0.035D).setRenderRotations(false).setCasing(new SpentCasing(CasingType.STRAIGHT).setColor(0x9E1616).setScale(2F).register("G40Flare"));
-		g40 = new BulletConfig().setItem(EnumAmmo.G40).setVel(2F).setGrav(0.035D).setCasing(new SpentCasing(CasingType.STRAIGHT).setColor(SpentCasing.COLOR_CASE_40MM).setScale(2, 2F, 1.5F).register("G40"));
+		g40_flare = new BulletConfig().setItem(EnumAmmo.G40_FLARE).setLife(100).setVel(2F).setGrav(0.035D).setRenderRotations(false).setCasing(new SpentCasing(CasingType.STRAIGHT).setColor(0x9E1616).setScale(2F).register("G40Flare"));
+		g40 = new BulletConfig().setItem(EnumAmmo.G40).setLife(200).setOnImpact(LAMBDA_STANDARD_EXPLODE).setVel(2F).setGrav(0.035D).setCasing(new SpentCasing(CasingType.STRAIGHT).setColor(SpentCasing.COLOR_CASE_40MM).setScale(2, 2F, 1.5F).register("G40"));
 
 		ModItems.gun_flaregun = new ItemGunBaseNT(new GunConfig()
 				.dura(100).draw(7).inspect(39).crosshair(Crosshair.L_CIRCUMFLEX).smoke(LAMBDA_SMOKE)
 				.rec(new Receiver(0)
-						.dmg(12F).delay(20).reload(28).jam(33).sound("hbm:weapon.hkShoot", 1.0F, 1.0F)
+						.dmg(15F).delay(20).reload(28).jam(33).sound("hbm:weapon.hkShoot", 1.0F, 1.0F)
 						.mag(new MagazineSingleReload(0, 1).addConfigs(g40_flare))
 						.offset(0.75, -0.0625, -0.1875D)
 						.canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_STANDARD_FIRE).recoil(Lego.LAMBDA_STANDARD_RECOIL))
@@ -47,8 +53,8 @@ public class XFactory40mm {
 		ModItems.gun_congolake = new ItemGunBaseNT(new GunConfig()
 				.dura(400).draw(7).inspect(39).reloadSequential(true).crosshair(Crosshair.L_CIRCUMFLEX).smoke(LAMBDA_SMOKE)
 				.rec(new Receiver(0)
-						.dmg(12F).delay(24).reload(16, 16, 16, 0).jam(0).sound("hbm:weapon.glShoot", 1.0F, 1.0F)
-						.mag(new MagazineSingleReload(0, 4).addConfigs(g40_flare))
+						.dmg(30F).delay(24).reload(16, 16, 16, 0).jam(0).sound("hbm:weapon.glShoot", 1.0F, 1.0F)
+						.mag(new MagazineSingleReload(0, 4).addConfigs(g40, g40_flare))
 						.offset(0.75, -0.0625, -0.1875D)
 						.canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_STANDARD_FIRE).recoil(Lego.LAMBDA_STANDARD_RECOIL))
 				.setupStandardConfiguration()

src/main/java/com/hbm/main/ModEventHandlerClient.java

@@ -909,7 +909,7 @@ public class ModEventHandlerClient {
 			}
 		}
 		
-		if(Keyboard.isKeyDown(Keyboard.KEY_F1)) {
+		if(Keyboard.isKeyDown(Keyboard.KEY_F1) && Minecraft.getMinecraft().currentScreen != null) {
 			
 			ComparableStack comp = canneryTimestamp > System.currentTimeMillis() - 100 ? lastCannery : null;
 			

src/main/java/com/hbm/main/ModEventHandlerRenderer.java

@@ -1,6 +1,7 @@
 package com.hbm.main;
 
 import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
 import org.lwjgl.opengl.GLContext;
 
 import com.hbm.blocks.ICustomBlockHighlight;
@@ -8,6 +9,7 @@ import com.hbm.config.RadiationConfig;
 import com.hbm.handler.pollution.PollutionHandler.PollutionType;
 import com.hbm.items.armor.IArmorDisableModel;
 import com.hbm.items.armor.IArmorDisableModel.EnumPlayerPart;
+import com.hbm.items.weapon.sedna.ItemGunBaseNT;
 import com.hbm.packet.PermaSyncHandler;
 import com.hbm.render.item.weapon.sedna.ItemRenderWeaponBase;
 import com.hbm.render.model.ModelMan;
@@ -19,6 +21,8 @@ import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.entity.RenderManager;
@@ -56,6 +60,7 @@ public class ModEventHandlerRenderer {
 
 		EntityPlayer player = event.entityPlayer;
 		RenderPlayer renderer = event.renderer;
+		ItemStack held = player.getHeldItem();
 
 		boolean isManly = PermaSyncHandler.boykissers.contains(player.getEntityId());
 
@@ -71,6 +76,18 @@ public class ModEventHandlerRenderer {
 			}
 		}
 
+		if(held != null) {
+			IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(held, IItemRenderer.ItemRenderType.EQUIPPED);
+			if(customRenderer instanceof ItemRenderWeaponBase) {
+				ItemRenderWeaponBase renderGun = (ItemRenderWeaponBase) customRenderer;
+				if(renderGun.isAkimbo()) {
+					partsHidden[EnumPlayerPart.LEFT_ARM.ordinal()] = true;
+					ModelRenderer box = getBoxFromType(renderer, EnumPlayerPart.LEFT_ARM);
+					box.isHidden = true;
+				}
+			}
+		}
+
 		if(isManly) {
 			return;
 		}
@@ -98,8 +115,33 @@ public class ModEventHandlerRenderer {
 
 		EntityPlayer player = event.entityPlayer;
 		RenderPlayer renderer = event.renderer;
+		
+		boolean akimbo = false;
+
+		ItemStack held = player.getHeldItem();
+		
+		if(held != null) {
+			IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(held, IItemRenderer.ItemRenderType.EQUIPPED);
+			if(customRenderer instanceof ItemRenderWeaponBase) {
+				ItemRenderWeaponBase renderGun = (ItemRenderWeaponBase) customRenderer;
+				if(renderGun.isAkimbo()) {
+					akimbo = true;
+				}
+			}
+		}
 
 		boolean isManly = PermaSyncHandler.boykissers.contains(player.getEntityId());
+		
+		if(akimbo) {
+			ModelBiped biped = renderer.modelBipedMain;
+			biped.bipedLeftArm.rotateAngleY = 0.1F + biped.bipedHead.rotateAngleY;
+			if(!isManly) {
+				AbstractClientPlayer acp = (AbstractClientPlayer) player;
+				Minecraft.getMinecraft().getTextureManager().bindTexture(acp.getLocationSkin());
+				biped.bipedLeftArm.isHidden = false;
+				biped.bipedLeftArm.render(0.0625F);
+			}
+		}
 
 		if(isManly) {
 			if(manlyModel == null)
@@ -115,6 +157,7 @@ public class ModEventHandlerRenderer {
 			if(f6 > 1.0F) {
 				f6 = 1.0F;
 			}
+			
 			manlyModel.render(event.entityPlayer, f7, f6, yawWrapped, yaw, pitch, 0.0625F, renderer);
 		}
 	}
@@ -131,6 +174,58 @@ public class ModEventHandlerRenderer {
 			}
 		}
 	}
+	
+	@SubscribeEvent
+	public void onRenderHeldGun(RenderPlayerEvent.Pre event) {
+
+		EntityPlayer player = event.entityPlayer;
+		RenderPlayer renderer = event.renderer;
+		
+		if(player.getHeldItem() != null && player.getHeldItem().getItem() instanceof ItemGunBaseNT) {
+			renderer.modelBipedMain.aimedBow = true;
+			renderer.modelArmor.aimedBow = true;
+			renderer.modelArmorChestplate.aimedBow = true;
+		}
+	}
+
+	@SubscribeEvent
+	public void onRenderAkimbo(RenderPlayerEvent.Specials.Pre event) {
+
+		EntityPlayer player = event.entityPlayer;
+		RenderPlayer renderer = event.renderer;
+		ItemStack held = player.getHeldItem();
+		if(held == null) return;
+
+		IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(held, IItemRenderer.ItemRenderType.EQUIPPED);
+		
+		if(customRenderer instanceof ItemRenderWeaponBase) {
+			ItemRenderWeaponBase renderWeapon = (ItemRenderWeaponBase) customRenderer;
+			if(renderWeapon.isAkimbo()) {
+				GL11.glPushMatrix();
+				renderer.modelBipedMain.bipedLeftArm.isHidden = false;
+				renderer.modelBipedMain.bipedLeftArm.postRender(0.0625F);
+				//vanilla bullshit
+				GL11.glTranslatef(-0.0625F, 0.4375F, 0.0625F);
+				float scale = 0.375F;
+				GL11.glTranslatef(0.25F, 0.1875F, -0.1875F);
+				GL11.glScalef(scale, scale, scale);
+				GL11.glRotatef(60.0F, 0.0F, 0.0F, 1.0F);
+				GL11.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F);
+				GL11.glRotatef(20.0F, 0.0F, 0.0F, 1.0F);
+				// forge bullshit
+				GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+				GL11.glTranslatef(0.0F, -0.3F, 0.0F);
+				GL11.glScalef(1.5F, 1.5F, 1.5F);
+				GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F);
+				GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F);
+				GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F);
+				renderWeapon.setupThirdPersonAkimbo(held);
+				renderWeapon.renderEquippedAkimbo(held);
+				GL11.glDisable(GL12.GL_RESCALE_NORMAL);
+				GL11.glPopMatrix();
+			}
+		}
+	}
 
 	@SubscribeEvent
 	public void onRenderHeldItem(RenderPlayerEvent.Specials.Pre event) {
@@ -139,9 +234,7 @@ public class ModEventHandlerRenderer {
 		//RenderPlayer renderer = event.renderer;
 
 		boolean isManly = PermaSyncHandler.boykissers.contains(player.getEntityId());
-
-		if(!isManly)
-			return;
+		if(!isManly) return;
 
 		if(manlyModel == null)
 			manlyModel = new ModelMan();
@@ -169,8 +262,8 @@ public class ModEventHandlerRenderer {
 			enumaction = held.getItemUseAction();
 		}
 
-		net.minecraftforge.client.IItemRenderer customRenderer = net.minecraftforge.client.MinecraftForgeClient.getItemRenderer(held, net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED);
-		boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED, held, net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D));
+		IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(held, IItemRenderer.ItemRenderType.EQUIPPED);
+		boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(IItemRenderer.ItemRenderType.EQUIPPED, held, IItemRenderer.ItemRendererHelper.BLOCK_3D));
 
 		if(is3D || held.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(held.getItem()).getRenderType())) {
 			f2 = 0.5F;

src/main/java/com/hbm/render/entity/projectile/RenderBullet.java

@@ -178,21 +178,6 @@ public class RenderBullet extends Render {
 		GL11.glScalef(0.25F, 0.25F, 0.25F);
 		GL11.glRotated(90, 0, 0, 1);
 		GL11.glRotated(90, 0, 1, 0);
-		
-		switch(type) {
-		case 0:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenade.png")); break;
-		case 1:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenadeHE.png")); break;
-		case 2:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenadeIncendiary.png")); break;
-		case 3:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenadeToxic.png")); break;
-		case 4:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenadeSleek.png")); break;
-		case 5:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenadeTraining.png")); break;
-		}
 
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		bindTexture(ResourceManager.grenade_tex);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderAm180.java

@@ -15,7 +15,7 @@ public class ItemRenderAm180 extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.5F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 0.875);
 		
 		float offset = 0.8F;
@@ -109,7 +109,7 @@ public class ItemRenderAm180 extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		double scale = 1D;
 		GL11.glScaled(scale, scale, scale);
@@ -118,7 +118,7 @@ public class ItemRenderAm180 extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 0.75D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderAtlas.java

@@ -15,7 +15,7 @@ public class ItemRenderAtlas extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.25F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 0.875);
 		
 		float offset = 0.8F;
@@ -96,14 +96,14 @@ public class ItemRenderAtlas extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		GL11.glTranslated(0, 1, 3);
 
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 1.125D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderCarbine.java

@@ -15,7 +15,7 @@ public class ItemRenderCarbine extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.5F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 0.875);
 		
 		float offset = 0.8F;
@@ -84,7 +84,7 @@ public class ItemRenderCarbine extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		double scale = 1.375D;
 		GL11.glScaled(scale, scale, scale);
@@ -93,7 +93,7 @@ public class ItemRenderCarbine extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 1.375D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderCongoLake.java

@@ -5,9 +5,11 @@ import java.awt.Color;
 import org.lwjgl.opengl.GL11;
 
 import com.hbm.items.weapon.sedna.ItemGunBaseNT;
+import com.hbm.items.weapon.sedna.mags.IMagazine;
 import com.hbm.main.ResourceManager;
 import com.hbm.particle.SpentCasing;
 import com.hbm.render.anim.HbmAnimations;
+import com.hbm.render.anim.HbmAnimations.AnimType;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
@@ -18,7 +20,7 @@ public class ItemRenderCongoLake extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.25F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 0.875);
 		
 		float offset = 0.8F;
@@ -80,22 +82,26 @@ public class ItemRenderCongoLake extends ItemRenderWeaponBase {
 
 		GL11.glPushMatrix();
 		{
-			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.casings_tex);
-
-			HbmAnimations.applyRelevantTransformation("Shell");
-
-			SpentCasing casing = gun.getConfig(stack, 0).getReceivers(stack)[0].getMagazine(stack).getCasing(stack);
-			int[] colors = casing != null ? casing.getColors() : new int[] { SpentCasing.COLOR_CASE_40MM };
-
-			Color shellColor = new Color(colors[0]);
-			GL11.glColor3f(shellColor.getRed() / 255F, shellColor.getGreen() / 255F, shellColor.getBlue() / 255F);
-			ResourceManager.congolake.renderPart("Shell");
-			
-			Color shellForeColor = new Color(colors.length > 1 ? colors[1] : colors[0]);
-			GL11.glColor3f(shellForeColor.getRed() / 255F, shellForeColor.getGreen() / 255F, shellForeColor.getBlue() / 255F);
-			ResourceManager.congolake.renderPart("ShellFore");
-
-			GL11.glColor3f(1F, 1F, 1F);
+			IMagazine mag = gun.getConfig(stack, 0).getReceivers(stack)[0].getMagazine(stack);
+			if(gun.getLastAnim(stack, 0) != AnimType.INSPECT || mag.getAmount(stack) > 0) { //omit when inspecting and no shell is loaded
+				
+				Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.casings_tex);
+	
+				HbmAnimations.applyRelevantTransformation("Shell");
+	
+				SpentCasing casing = mag.getCasing(stack);
+				int[] colors = casing != null ? casing.getColors() : new int[] { SpentCasing.COLOR_CASE_40MM };
+	
+				Color shellColor = new Color(colors[0]);
+				GL11.glColor3f(shellColor.getRed() / 255F, shellColor.getGreen() / 255F, shellColor.getBlue() / 255F);
+				ResourceManager.congolake.renderPart("Shell");
+				
+				Color shellForeColor = new Color(colors.length > 1 ? colors[1] : colors[0]);
+				GL11.glColor3f(shellForeColor.getRed() / 255F, shellForeColor.getGreen() / 255F, shellForeColor.getBlue() / 255F);
+				ResourceManager.congolake.renderPart("ShellFore");
+	
+				GL11.glColor3f(1F, 1F, 1F);
+			}
 		}
 		GL11.glPopMatrix();
 
@@ -124,14 +130,16 @@ public class ItemRenderCongoLake extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
-		GL11.glTranslated(0, 1, 3);
+		GL11.glTranslated(0, -2.5, 4);
+		double scale = 2.5D;
+		GL11.glScaled(scale, scale, scale);
 
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 2.5D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderDANI.java

@@ -10,12 +10,14 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 
 public class ItemRenderDANI extends ItemRenderWeaponBase {
+	
+	@Override public boolean isAkimbo() { return true; }
 
 	@Override
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.25F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 0.875);
 	}
 
@@ -48,9 +50,9 @@ public class ItemRenderDANI extends ItemRenderWeaponBase {
 			GL11.glTranslated(recoil[0], recoil[1], recoil[2]);
 			GL11.glRotated(recoil[2] * 10, 1, 0, 0);
 	
-			GL11.glTranslated(0, 0, -7);
+			GL11.glTranslated(0, -2, -2);
 			GL11.glRotated(equip[0], -1, 0, 0);
-			GL11.glTranslated(0, 0, 7);
+			GL11.glTranslated(0, 2, 2);
 			
 			GL11.glPushMatrix();
 			GL11.glTranslated(0, 1.5, 9.25);
@@ -106,19 +108,27 @@ public class ItemRenderDANI extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		GL11.glTranslated(0, 1, 3);
-
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupThirdPersonAkimbo(ItemStack stack) {
+		super.setupThirdPersonAkimbo(stack);
+		GL11.glTranslated(0, 1, 3);
+	}
+
+	@Override
+	public void setupInv(ItemStack stack) {
 		GL11.glScaled(1, 1, -1);
 		GL11.glTranslated(8, 6, 0);
-		
 		double scale = 1.125D;
 		GL11.glScaled(scale, scale, scale);
+	}
+
+	@Override
+	public void renderInv(ItemStack stack) {
 		
 		GL11.glEnable(GL11.GL_LIGHTING);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
@@ -149,5 +159,29 @@ public class ItemRenderDANI extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	public void renderOther(ItemStack stack, ItemRenderType type) { }
+	public void renderEquipped(ItemStack stack) {
+
+		GL11.glShadeModel(GL11.GL_SMOOTH);
+		Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.dani_lunar_tex);
+		ResourceManager.bio_revolver.renderAll();
+		GL11.glShadeModel(GL11.GL_FLAT);
+	}
+
+	@Override
+	public void renderEquippedAkimbo(ItemStack stack) {
+
+		GL11.glShadeModel(GL11.GL_SMOOTH);
+		Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.dani_celestial_tex);
+		ResourceManager.bio_revolver.renderAll();
+		GL11.glShadeModel(GL11.GL_FLAT);
+	}
+
+	@Override
+	public void renderOther(ItemStack stack, ItemRenderType type) {
+
+		GL11.glShadeModel(GL11.GL_SMOOTH);
+		Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.dani_celestial_tex);
+		ResourceManager.bio_revolver.renderAll();
+		GL11.glShadeModel(GL11.GL_FLAT);
+	}
 }

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderDebug.java

@@ -15,7 +15,7 @@ public class ItemRenderDebug extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.25F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 1);
 		
 		float offset = 0.8F;
@@ -96,7 +96,7 @@ public class ItemRenderDebug extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		GL11.glScaled(0.75, 0.75, 0.75);
 		GL11.glTranslated(0, 1, 3);
@@ -104,7 +104,7 @@ public class ItemRenderDebug extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 1.25D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderFlaregun.java

@@ -15,7 +15,7 @@ public class ItemRenderFlaregun extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.25F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 0.875);
 		
 		float offset = 0.8F;
@@ -81,7 +81,7 @@ public class ItemRenderFlaregun extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		double scale = 0.5D;
 		GL11.glScaled(scale, scale, scale);
@@ -90,7 +90,7 @@ public class ItemRenderFlaregun extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 1D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderGreasegun.java

@@ -15,7 +15,7 @@ public class ItemRenderGreasegun extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.5F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 0.875);
 		
 		float offset = 0.8F;
@@ -112,14 +112,14 @@ public class ItemRenderGreasegun extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		GL11.glTranslated(0, 1, 3);
 
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 1.5D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderHeavyRevolver.java

@@ -15,7 +15,7 @@ public class ItemRenderHeavyRevolver extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.25F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 1);
 		
 		float offset = 0.8F;
@@ -98,7 +98,7 @@ public class ItemRenderHeavyRevolver extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		GL11.glScaled(0.75, 0.75, 0.75);
 		GL11.glTranslated(0, 1, 3);
@@ -106,7 +106,7 @@ public class ItemRenderHeavyRevolver extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 1.25D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderHenry.java

@@ -15,7 +15,7 @@ public class ItemRenderHenry extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.5F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 0.875);
 		
 		float offset = 0.8F;
@@ -121,7 +121,7 @@ public class ItemRenderHenry extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		double scale = 1.75D;
 		GL11.glScaled(scale, scale, scale);
@@ -130,7 +130,7 @@ public class ItemRenderHenry extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 1.5D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderLiberator.java

@@ -16,7 +16,7 @@ public class ItemRenderLiberator extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.25F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 0.875);
 		
 		float offset = 0.8F;
@@ -120,14 +120,14 @@ public class ItemRenderLiberator extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		GL11.glTranslated(0, 1, 3);
 
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 1.5D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMaresleg.java

@@ -15,7 +15,7 @@ public class ItemRenderMaresleg extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.5F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 0.875);
 		
 		float offset = 0.8F;
@@ -95,7 +95,7 @@ public class ItemRenderMaresleg extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		double scale = 1.75D;
 		GL11.glScaled(scale, scale, scale);
@@ -104,7 +104,7 @@ public class ItemRenderMaresleg extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 1.4375D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderPepperbox.java

@@ -15,7 +15,7 @@ public class ItemRenderPepperbox extends ItemRenderWeaponBase {
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.5F; }
 
 	@Override
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 1.5);
 		
 		float offset = 0.8F;
@@ -97,14 +97,14 @@ public class ItemRenderPepperbox extends ItemRenderWeaponBase {
 	}
 
 	@Override
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		super.setupThirdPerson(stack);
 		GL11.glTranslated(0, 1, 3);
 
 	}
 
 	@Override
-	protected void setupInv(ItemStack stack) {
+	public void setupInv(ItemStack stack) {
 		super.setupInv(stack);
 		double scale = 1.5D;
 		GL11.glScaled(scale, scale, scale);

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderWeaponBase.java

@@ -31,6 +31,8 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer {
 	public static final ResourceLocation flash_plume = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/lilmac_plume.png");
 	
 	public static float interp;
+	
+	public boolean isAkimbo() { return false; }
 
 	@Override
 	public boolean handleRenderType(ItemStack item, ItemRenderType type) {
@@ -48,13 +50,18 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer {
 		GL11.glPushMatrix();
 		switch(type) {
 		case EQUIPPED_FIRST_PERSON:	setupFirstPerson(item);	renderFirstPerson(item); break;
-		case EQUIPPED:				setupThirdPerson(item);	renderOther(item, type); break;
-		case INVENTORY:				setupInv(item);			renderOther(item, type); break;
-		case ENTITY:				setupEntity(item);		renderOther(item, type); break;
+		case EQUIPPED:				setupThirdPerson(item);	renderEquipped(item); break;
+		case INVENTORY:				setupInv(item);			renderInv(item); break;
+		case ENTITY:				setupEntity(item);		renderEntity(item); break;
 		}
 		GL11.glPopMatrix();
 	}
 
+	public void renderEquipped(ItemStack stack) { renderOther(stack, ItemRenderType.EQUIPPED); }
+	public void renderEquippedAkimbo(ItemStack stack) { renderOther(stack, ItemRenderType.EQUIPPED); }
+	public void renderInv(ItemStack stack) { renderOther(stack, ItemRenderType.INVENTORY); }
+	public void renderEntity(ItemStack stack) { renderOther(stack, ItemRenderType.ENTITY); }
+
 	public void setPerspectiveAndRender(ItemStack stack, float interp) {
 		
 		this.interp = interp;
@@ -187,7 +194,7 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer {
 		RenderHelper.disableStandardItemLighting();
 	}
 	
-	protected void setupFirstPerson(ItemStack stack) {
+	public void setupFirstPerson(ItemStack stack) {
 		GL11.glTranslated(0, 0, 1);
 		
 		if(Minecraft.getMinecraft().thePlayer.isSneaking()) {
@@ -200,7 +207,7 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer {
 		}
 	}
 	
-	protected void setupThirdPerson(ItemStack stack) {
+	public void setupThirdPerson(ItemStack stack) {
 		double scale = 0.125D;
 		GL11.glScaled(scale, scale, scale);
 		
@@ -212,20 +219,32 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer {
 
 	}
 	
-	protected void setupInv(ItemStack stack) {
+	public void setupThirdPersonAkimbo(ItemStack stack) {
+		double scale = 0.125D;
+		GL11.glScaled(scale, scale, scale);
+		
+		GL11.glRotatef(15.0F, 0.0F, 0.0F, 1.0F);
+		GL11.glRotatef(12.5F, 0.0F, 1.0F, 0.0F);
+		GL11.glRotatef(10.0F, 1.0F, 0.0F, 0.0F);
+		
+		GL11.glTranslated(5, 0, 0);
+
+	}
+	
+	public void setupInv(ItemStack stack) {
 		GL11.glScaled(1, 1, -1);
 		GL11.glTranslated(8, 8, 0);
 		GL11.glRotated(225, 0, 0, 1);
 		GL11.glRotated(90, 0, 1, 0);
 	}
 	
-	protected void setupEntity(ItemStack stack) {
+	public void setupEntity(ItemStack stack) {
 		double scale = 0.125D;
 		GL11.glScaled(scale, scale, scale);
 	}
 
 	public abstract void renderFirstPerson(ItemStack stack);
-	public abstract void renderOther(ItemStack stack, ItemRenderType type);
+	public void renderOther(ItemStack stack, ItemRenderType type) { }
 	
 	public static void standardAimingTransform(ItemStack stack, double sX, double sY, double sZ, double aX, double aY, double aZ) {
 		float aimingProgress = ItemGunBaseNT.prevAimingProgress + (ItemGunBaseNT.aimingProgress - ItemGunBaseNT.prevAimingProgress) * interp;

src/main/java/com/hbm/render/loader/ModelRendererObj.java

@@ -21,6 +21,8 @@ public class ModelRendererObj {
 	public float offsetX;
 	public float offsetY;
 	public float offsetZ;
+	
+	public boolean doRender = true;
 
 	String[] parts;
 	IModelCustom model;
@@ -97,11 +99,13 @@ public class ModelRendererObj {
 
 		GL11.glScalef(scale, scale, scale);
 
-		if(parts.length > 0)
-			for(String part : parts)
-				model.renderPart(part);
-		else
-			model.renderAll();
+		if(doRender) {
+			if(parts.length > 0)
+				for(String part : parts)
+					model.renderPart(part);
+			else
+				model.renderAll();
+		}
 
 		GL11.glPopMatrix();
 	}