From b6ff9627af83d2920567811dae416435597b29b3 Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 4 Jan 2024 19:43:58 +0100 Subject: [PATCH] and now for some textures --- .../java/com/hbm/items/weapon/ItemGunPip.java | 29 +++++++++--------- .../com/hbm/main/ModEventHandlerClient.java | 4 +-- .../item/weapon/ItemRenderWeaponLilMac.java | 9 ++++-- .../hbm/textures/models/weapons/lilmac.png | Bin 2997 -> 4529 bytes .../textures/models/weapons/lilmac_scope.png | Bin 934 -> 849 bytes 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/hbm/items/weapon/ItemGunPip.java b/src/main/java/com/hbm/items/weapon/ItemGunPip.java index 1a4179dd9..04af2530d 100644 --- a/src/main/java/com/hbm/items/weapon/ItemGunPip.java +++ b/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; } } diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 16be815d9..72e07c9b8 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -241,7 +241,7 @@ public class ModEventHandlerClient { Minecraft.getMinecraft().renderEngine.bindTexture(Gui.icons); }*/ - List text = new ArrayList(); + /*List 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 /// diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponLilMac.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponLilMac.java index 7d79a4476..7ab0e8af3 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponLilMac.java +++ b/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); diff --git a/src/main/resources/assets/hbm/textures/models/weapons/lilmac.png b/src/main/resources/assets/hbm/textures/models/weapons/lilmac.png index 4002d578752dd2b363d90763c0698cdfc88e782c..8490d4f2a4968d5c6d1398aa4ad62c77c54f776b 100644 GIT binary patch delta 4520 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 delta 2976 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 S{+V9H00f?{elF{r5}E+3QM5V$