Merge branch 'HbmMods:master' into New_master

src/main/java/com/hbm/items/weapon/ItemGunPip.java

@@ -62,33 +62,34 @@ public class ItemGunPip extends ItemGunBase {
 	@SideOnly(Side.CLIENT)
 	public BusAnimation getAnimation(ItemStack stack, AnimType type) {
 		
-		 if(type == AnimType.EQUIP) {
+		if(type == AnimType.EQUIP) {
 				return new BusAnimation()
 						.addBus("ROTATE", new BusAnimationSequence()
 								.addKeyframe(new BusAnimationKeyframe(-360, 0, 0, 350))
 								);
-		 }
+		}
 		
-		 if(type == AnimType.CYCLE) {
+		if(type == AnimType.CYCLE) {
 			lastShot = System.currentTimeMillis();
+			int s = 1;
 			return new BusAnimation()
 				.addBus("RECOIL", new BusAnimationSequence()
-						.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 50))
-						.addKeyframe(new BusAnimationKeyframe(0, 0, -3, 50))
-						.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 250))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 50 * s))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, -3, 50 * s))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 250 * s))
 						)
 				.addBus("HAMMER", new BusAnimationSequence()
-						.addKeyframe(new BusAnimationKeyframe(0, 0, 1, 50))
-						.addKeyframe(new BusAnimationKeyframe(0, 0, 1, 300))
-						.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 200))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 1, 50 * s))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 1, 300 * s))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 200 * s))
 						)
 				.addBus("DRUM", new BusAnimationSequence()
-						.addKeyframe(new BusAnimationKeyframe(0, 0, 1, 50))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 1, 50 * s))
 						);
 		 }
 		
-		 if(type == AnimType.RELOAD) {
-			 int s = 1;
+		if(type == AnimType.RELOAD) {
+			int s = 1;
 				return new BusAnimation()
 						.addBus("RELAOD_TILT", new BusAnimationSequence()
 								.addKeyframe(new BusAnimationKeyframe(-15, 0, 0, 100 * s))
@@ -130,8 +131,8 @@ public class ItemGunPip extends ItemGunBase {
 								.addKeyframe(new BusAnimationKeyframe(1, 0, 0, 950 * s))
 								.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 1 * s))
 								);
-		 }
+		}
 		
-		 return null;
+		return null;
 	}
 }

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

@@ -241,7 +241,7 @@ public class ModEventHandlerClient {
 				Minecraft.getMinecraft().renderEngine.bindTexture(Gui.icons);
 			}*/
 			
-			List<String> text = new ArrayList();
+			/*List<String> text = new ArrayList();
 			MovingObjectPosition pos = Library.rayTrace(player, 500, 1, false, true, false);
 			
 			for(int i = 0; i < 2; i++) if(pos != null && pos.typeOfHit == pos.typeOfHit.BLOCK) {
@@ -309,7 +309,7 @@ public class ModEventHandlerClient {
 				} while(distanceToCover != 0);
 				
 				ILookOverlay.printGeneric(event, "DEBUG", 0xffff00, 0x4040000, text);
-			}
+			}*/
 		}
 		
 		/// HANLDE ANIMATION BUSES ///

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

@@ -74,7 +74,7 @@ public class ItemRenderWeaponLilMac implements IItemRenderer {
 			GL11.glDisable(GL11.GL_TEXTURE_2D);
 			GL11.glAlphaFunc(GL11.GL_GREATER, 0F);
 			GL11.glTranslated(-10, 2.25, 0);
-			GL11.glTranslated(-recoil[2] * 3, -recoil[2] * 2, 0);
+			GL11.glTranslated(-recoil[2] * 3.5, -recoil[2] * 1.375, 0);
 			
 			if(ItemGunPip.smokeNodes.size() > 1 && equipSpin[0] == 0) {
 
@@ -103,7 +103,9 @@ public class ItemRenderWeaponLilMac implements IItemRenderer {
 					tess.setColorRGBA_F(1F, 1F, 1F, (float) past[3]);
 					tess.addVertex(past[0], past[1], past[2]);
 				}
+				GL11.glDepthMask(false);
 				tess.draw();
+				GL11.glDepthMask(true);
 			}
 			
 			GL11.glEnable(GL11.GL_TEXTURE_2D);
@@ -132,6 +134,7 @@ public class ItemRenderWeaponLilMac implements IItemRenderer {
 			double[] cylinderFlip = HbmAnimations.getRelevantTransformation("RELOAD_CYLINDER");
 			GL11.glPushMatrix(); /// DRUM PUSH ///
 			GL11.glRotated(cylinderFlip[0], 1, 0, 0);
+			ResourceManager.lilmac.renderPart("Pivot");
 			GL11.glTranslated(0, 1.75, 0);
 			GL11.glRotated(HbmAnimations.getRelevantTransformation("DRUM")[2] * -60, 1, 0, 0);
 			GL11.glTranslated(0, -1.75, 0);
@@ -191,9 +194,7 @@ public class ItemRenderWeaponLilMac implements IItemRenderer {
 				tess.addVertexWithUV(lengthOffset, -height, -length + offset, 1, 0);
 				tess.addVertexWithUV(lengthOffset, height, -length + offset, 0 ,0);
 				
-				GL11.glDepthMask(true);
 				tess.draw();
-				GL11.glDepthMask(false);
 				GL11.glPopMatrix();
 				GL11.glDisable(GL11.GL_BLEND);
 			}
@@ -223,6 +224,8 @@ public class ItemRenderWeaponLilMac implements IItemRenderer {
 		case INVENTORY:
 
 			GL11.glEnable(GL11.GL_LIGHTING);
+			GL11.glAlphaFunc(GL11.GL_GREATER, 0F);
+			GL11.glEnable(GL11.GL_ALPHA_TEST);
 			
 			double s = 0.8D;
 			GL11.glTranslated(8, 8, 0);