mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
copypaste hell
fixed tick issues in eventHandler, added packets to orchestra + third person rendering for every gun with built-in muzzle/laser flashes, and softened playAnimation so skeleguns use orchestra/muzzle flashes. akimbos show both firing, probably won't be changed
This commit is contained in:
parent
712ae952df
commit
82293e46cd
@ -274,9 +274,10 @@ public class ItemGunBaseNT extends Item implements IKeybindReceiver, IItemHUD, I
|
|||||||
public static void playAnimation(EntityPlayer player, ItemStack stack, GunAnimation type, int index) {
|
public static void playAnimation(EntityPlayer player, ItemStack stack, GunAnimation type, int index) {
|
||||||
if(player instanceof EntityPlayerMP) {
|
if(player instanceof EntityPlayerMP) {
|
||||||
PacketDispatcher.wrapper.sendTo(new HbmAnimationPacket(type.ordinal(), 0, index), (EntityPlayerMP) player);
|
PacketDispatcher.wrapper.sendTo(new HbmAnimationPacket(type.ordinal(), 0, index), (EntityPlayerMP) player);
|
||||||
setLastAnim(stack, index, type);
|
|
||||||
setAnimTimer(stack, index, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setLastAnim(stack, index, type);
|
||||||
|
setAnimTimer(stack, index, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -60,6 +60,7 @@ public class Orchestras {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F);
|
if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
@ -83,6 +84,7 @@ public class Orchestras {
|
|||||||
if(timer == 55) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 1F);
|
if(timer == 55) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 1F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 21) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.6F);
|
if(timer == 21) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.6F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
@ -110,6 +112,7 @@ public class Orchestras {
|
|||||||
if(timer == 44) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F);
|
if(timer == 44) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.9F);
|
if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.9F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
@ -138,6 +141,7 @@ public class Orchestras {
|
|||||||
if(timer == 44) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F);
|
if(timer == 44) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.9F);
|
if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.9F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
@ -179,6 +183,7 @@ public class Orchestras {
|
|||||||
if(timer == 44) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 1F);
|
if(timer == 44) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 1F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 14) {
|
if(timer == 14) {
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.5, -0.125, aiming ? -0.125 : -0.375D, 0, 0.12, -0.12, 0.01, -7.5F + (float)entity.getRNG().nextGaussian() * 5F, (float)entity.getRNG().nextGaussian() * 1.5F, casing.getName(), true, 60, 0.5D, 20);
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.5, -0.125, aiming ? -0.125 : -0.375D, 0, 0.12, -0.12, 0.01, -7.5F + (float)entity.getRNG().nextGaussian() * 5F, (float)entity.getRNG().nextGaussian() * 1.5F, casing.getName(), true, 60, 0.5D, 20);
|
||||||
@ -251,6 +256,7 @@ public class Orchestras {
|
|||||||
if(timer == 29) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F);
|
if(timer == 29) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 14) {
|
if(timer == 14) {
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, -0.125, aiming ? -0.125 : -0.375D, 0, 0.18, -0.12, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 5F, (float)entity.getRNG().nextGaussian() * 2.5F, casing.getName(), true, 60, 0.5D, 20);
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, -0.125, aiming ? -0.125 : -0.375D, 0, 0.18, -0.12, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 5F, (float)entity.getRNG().nextGaussian() * 2.5F, casing.getName(), true, 60, 0.5D, 20);
|
||||||
@ -286,6 +292,7 @@ public class Orchestras {
|
|||||||
if(timer == 29) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F);
|
if(timer == 29) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 14) {
|
if(timer == 14) {
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, -0.125, aiming ? -0.125 : -0.375D, 0, -0.08, 0, 0.01, -15F + (float)entity.getRNG().nextGaussian() * 5F, (float)entity.getRNG().nextGaussian() * 2.5F, casing.getName(), true, 60, 0.5D, 20);
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, -0.125, aiming ? -0.125 : -0.375D, 0, -0.08, 0, 0.01, -15F + (float)entity.getRNG().nextGaussian() * 5F, (float)entity.getRNG().nextGaussian() * 2.5F, casing.getName(), true, 60, 0.5D, 20);
|
||||||
@ -306,6 +313,7 @@ public class Orchestras {
|
|||||||
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 14) {
|
if(timer == 14) {
|
||||||
int offset = ctx.configIndex == 0 ? -1 : 1;
|
int offset = ctx.configIndex == 0 ? -1 : 1;
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
@ -371,6 +379,7 @@ public class Orchestras {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F);
|
if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
@ -391,6 +400,7 @@ public class Orchestras {
|
|||||||
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 1) {
|
if(timer == 1) {
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, 0.21, -0.06, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 2.5F, 2.5F + (float)entity.getRNG().nextGaussian() * 2F, casing.getName(), true, 60, 0.5D, 20);
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, 0.21, -0.06, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 2.5F, 2.5F + (float)entity.getRNG().nextGaussian() * 2F, casing.getName(), true, 60, 0.5D, 20);
|
||||||
@ -427,6 +437,7 @@ public class Orchestras {
|
|||||||
if(ClientConfig.GUN_ANIMS_LEGACY.get()) {
|
if(ClientConfig.GUN_ANIMS_LEGACY.get()) {
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
if(timer == 0) {
|
if(timer == 0) {
|
||||||
|
PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.4375, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, -0.06, 0, 0.01, (float)entity.getRNG().nextGaussian() * 10F, (float)entity.getRNG().nextGaussian() * 10F, casing.getName());
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.4375, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, -0.06, 0, 0.01, (float)entity.getRNG().nextGaussian() * 10F, (float)entity.getRNG().nextGaussian() * 10F, casing.getName());
|
||||||
}
|
}
|
||||||
@ -451,6 +462,7 @@ public class Orchestras {
|
|||||||
} else {
|
} else {
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
if(timer == 0) {
|
if(timer == 0) {
|
||||||
|
PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.4375, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, -0.06, 0, 0.01, (float)entity.getRNG().nextGaussian() * 10F, (float)entity.getRNG().nextGaussian() * 10F, casing.getName());
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.4375, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, -0.06, 0, 0.01, (float)entity.getRNG().nextGaussian() * 10F, (float)entity.getRNG().nextGaussian() * 10F, casing.getName());
|
||||||
}
|
}
|
||||||
@ -482,6 +494,9 @@ public class Orchestras {
|
|||||||
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
||||||
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
||||||
|
|
||||||
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
|
}
|
||||||
if(type == GunAnimation.RELOAD) {
|
if(type == GunAnimation.RELOAD) {
|
||||||
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F);
|
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F);
|
||||||
if(timer == 4) {
|
if(timer == 4) {
|
||||||
@ -527,6 +542,7 @@ public class Orchestras {
|
|||||||
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 15) {
|
if(timer == 15) {
|
||||||
IMagazine mag = ctx.config.getReceivers(stack)[0].getMagazine(stack);
|
IMagazine mag = ctx.config.getReceivers(stack)[0].getMagazine(stack);
|
||||||
SpentCasing casing = mag.getCasing(stack, ctx.inventory);
|
SpentCasing casing = mag.getCasing(stack, ctx.inventory);
|
||||||
@ -606,6 +622,7 @@ public class Orchestras {
|
|||||||
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 1) {
|
if(timer == 1) {
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.375, aiming ? 0 : -0.0625, aiming ? 0 : -0.25D, 0, 0.18, -0.12, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 5F, 10F + entity.getRNG().nextFloat() * 10F, casing.getName());
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.375, aiming ? 0 : -0.0625, aiming ? 0 : -0.25D, 0, 0.18, -0.12, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 5F, 10F + entity.getRNG().nextFloat() * 10F, casing.getName());
|
||||||
@ -639,6 +656,7 @@ public class Orchestras {
|
|||||||
if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1.25F);
|
if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1.25F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 1) {
|
if(timer == 1) {
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.375, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, 0.18, -0.12, 0.01, -2.5F + (float)entity.getRNG().nextGaussian() * 5F, 10F + (float)entity.getRNG().nextFloat() * 15F, casing.getName());
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.375, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, 0.18, -0.12, 0.01, -2.5F + (float)entity.getRNG().nextGaussian() * 5F, 10F + (float)entity.getRNG().nextFloat() * 15F, casing.getName());
|
||||||
@ -670,6 +688,7 @@ public class Orchestras {
|
|||||||
if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1.25F);
|
if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1.25F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 1) {
|
if(timer == 1) {
|
||||||
int mult = ctx.configIndex == 0 ? -1 : 1;
|
int mult = ctx.configIndex == 0 ? -1 : 1;
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
@ -700,6 +719,7 @@ public class Orchestras {
|
|||||||
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
||||||
|
|
||||||
if(type == GunAnimation.CYCLE || type == GunAnimation.ALT_CYCLE) {
|
if(type == GunAnimation.CYCLE || type == GunAnimation.ALT_CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunCock", 1F, 1F);
|
if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunCock", 1F, 1F);
|
||||||
if(timer == 10) {
|
if(timer == 10) {
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); //turns out there's a reason why stovepipes look like that
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); //turns out there's a reason why stovepipes look like that
|
||||||
@ -737,7 +757,9 @@ public class Orchestras {
|
|||||||
if(entity.worldObj.isRemote) return;
|
if(entity.worldObj.isRemote) return;
|
||||||
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
||||||
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
||||||
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
|
}
|
||||||
if(type == GunAnimation.RELOAD) {
|
if(type == GunAnimation.RELOAD) {
|
||||||
if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F);
|
if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F);
|
||||||
}
|
}
|
||||||
@ -804,8 +826,11 @@ public class Orchestras {
|
|||||||
//stop sound due to timeout
|
//stop sound due to timeout
|
||||||
if(runningAudio != null && runningAudio.isPlaying()) runningAudio.stopSound();
|
if(runningAudio != null && runningAudio.isPlaying()) runningAudio.stopSound();
|
||||||
}
|
}
|
||||||
|
return; //TODO check if this fucks anything
|
||||||
|
}
|
||||||
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(type == GunAnimation.RELOAD) {
|
if(type == GunAnimation.RELOAD) {
|
||||||
if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F);
|
if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F);
|
||||||
}
|
}
|
||||||
@ -857,6 +882,7 @@ public class Orchestras {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F);
|
if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F);
|
||||||
if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F);
|
if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F);
|
||||||
if(timer == 12) {
|
if(timer == 12) {
|
||||||
@ -907,6 +933,7 @@ public class Orchestras {
|
|||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
if(timer == 0) {
|
if(timer == 0) {
|
||||||
|
PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.375, aiming ? 0 : -0.125, aiming ? 0 : -0.3125D, 0, 0.06, -0.18, 0.01, (float)entity.getRNG().nextGaussian() * 20F, 12.5F + (float)entity.getRNG().nextGaussian() * 7.5F, casing.getName());
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.375, aiming ? 0 : -0.125, aiming ? 0 : -0.3125D, 0, 0.06, -0.18, 0.01, (float)entity.getRNG().nextGaussian() * 20F, 12.5F + (float)entity.getRNG().nextGaussian() * 7.5F, casing.getName());
|
||||||
}
|
}
|
||||||
@ -920,6 +947,7 @@ public class Orchestras {
|
|||||||
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.fire.shredderCycle", 0.25F, 1.5F);
|
if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.fire.shredderCycle", 0.25F, 1.5F);
|
||||||
}
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
@ -944,8 +972,11 @@ public class Orchestras {
|
|||||||
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
boolean aiming = ItemGunBaseNT.getIsAiming(stack);
|
||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
if(timer == 0 && ctx.config.getReceivers(stack)[0].getMagazine(stack).getType(stack, null) == XFactory12ga.g12_equestrian_bj) {
|
if(timer == 0) {
|
||||||
ItemGunBaseNT.setTimer(stack, 0, 20);
|
PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
|
if(ctx.config.getReceivers(stack)[0].getMagazine(stack).getType(stack, null) == XFactory12ga.g12_equestrian_bj) {
|
||||||
|
ItemGunBaseNT.setTimer(stack, 0, 20);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(timer == 2) {
|
if(timer == 2) {
|
||||||
@ -991,6 +1022,9 @@ public class Orchestras {
|
|||||||
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
||||||
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
||||||
|
|
||||||
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
|
}
|
||||||
if(type == GunAnimation.RELOAD) {
|
if(type == GunAnimation.RELOAD) {
|
||||||
if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F);
|
if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F);
|
||||||
}
|
}
|
||||||
@ -1005,6 +1039,7 @@ public class Orchestras {
|
|||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
if(timer == 0) {
|
if(timer == 0) {
|
||||||
|
PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
int rounds = XWeaponModManager.hasUpgrade(stack, ctx.configIndex, XWeaponModManager.ID_MINIGUN_SPEED) ? 3 : 1;
|
int rounds = XWeaponModManager.hasUpgrade(stack, ctx.configIndex, XWeaponModManager.ID_MINIGUN_SPEED) ? 3 : 1;
|
||||||
for(int i = 0; i < rounds; i++) {
|
for(int i = 0; i < rounds; i++) {
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
@ -1033,6 +1068,7 @@ public class Orchestras {
|
|||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
if(timer == 0) {
|
if(timer == 0) {
|
||||||
|
PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
int index = ctx.configIndex == 0 ? -1 : 1;
|
int index = ctx.configIndex == 0 ? -1 : 1;
|
||||||
int rounds = XWeaponModManager.hasUpgrade(stack, ctx.configIndex, XWeaponModManager.ID_MINIGUN_SPEED) ? 3 : 1;
|
int rounds = XWeaponModManager.hasUpgrade(stack, ctx.configIndex, XWeaponModManager.ID_MINIGUN_SPEED) ? 3 : 1;
|
||||||
for(int i = 0; i < rounds; i++) {
|
for(int i = 0; i < rounds; i++) {
|
||||||
@ -1060,6 +1096,9 @@ public class Orchestras {
|
|||||||
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
||||||
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
||||||
|
|
||||||
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1.25F);
|
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1.25F);
|
||||||
}
|
}
|
||||||
@ -1099,6 +1138,9 @@ public class Orchestras {
|
|||||||
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
||||||
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
||||||
|
|
||||||
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1.5F);
|
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1.5F);
|
||||||
}
|
}
|
||||||
@ -1127,6 +1169,7 @@ public class Orchestras {
|
|||||||
if(ClientConfig.GUN_ANIMS_LEGACY.get()) {
|
if(ClientConfig.GUN_ANIMS_LEGACY.get()) {
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
if(timer == 0) {
|
if(timer == 0) {
|
||||||
|
PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, aiming ? 0.125 : 0.125, aiming ? -0.125 : -0.25, aiming ? -0.125 : -0.25D, 0, 0.18, -0.12, 0.01, (float)entity.getRNG().nextGaussian() * 5F, 7.5F + entity.getRNG().nextFloat() * 5F, casing.getName());
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, aiming ? 0.125 : 0.125, aiming ? -0.125 : -0.25, aiming ? -0.125 : -0.25D, 0, 0.18, -0.12, 0.01, (float)entity.getRNG().nextGaussian() * 5F, 7.5F + entity.getRNG().nextFloat() * 5F, casing.getName());
|
||||||
}
|
}
|
||||||
@ -1153,6 +1196,7 @@ public class Orchestras {
|
|||||||
} else {
|
} else {
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
if(timer == 0) {
|
if(timer == 0) {
|
||||||
|
PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, aiming ? 0.125 : 0.25, aiming ? -0.125 : -0.25, aiming ? -0.125 : -0.25D, 0, 0.18, -0.12, 0.01, (float)entity.getRNG().nextGaussian() * 5F, 7.5F + entity.getRNG().nextFloat() * 5F, casing.getName());
|
if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, aiming ? 0.125 : 0.25, aiming ? -0.125 : -0.25, aiming ? -0.125 : -0.25D, 0, 0.18, -0.12, 0.01, (float)entity.getRNG().nextGaussian() * 5F, 7.5F + entity.getRNG().nextFloat() * 5F, casing.getName());
|
||||||
}
|
}
|
||||||
@ -1274,6 +1318,9 @@ public class Orchestras {
|
|||||||
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
||||||
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
||||||
|
|
||||||
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1.5F);
|
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1.5F);
|
||||||
}
|
}
|
||||||
@ -1304,6 +1351,9 @@ public class Orchestras {
|
|||||||
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
||||||
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
||||||
|
|
||||||
|
if(type == GunAnimation.CYCLE && stack.getItem() == ModItems.gun_n_i_4_n_i) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
|
}
|
||||||
if(type == GunAnimation.RELOAD) {
|
if(type == GunAnimation.RELOAD) {
|
||||||
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.coilgunReload", 1F, 1F);
|
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.coilgunReload", 1F, 1F);
|
||||||
}
|
}
|
||||||
@ -1315,6 +1365,9 @@ public class Orchestras {
|
|||||||
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
GunAnimation type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
|
||||||
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
|
||||||
|
|
||||||
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F);
|
if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F);
|
||||||
}
|
}
|
||||||
@ -1417,7 +1470,9 @@ public class Orchestras {
|
|||||||
if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F);
|
if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F);
|
||||||
if(timer == 19) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.8F);
|
if(timer == 19) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.8F);
|
||||||
}
|
}
|
||||||
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
|
}
|
||||||
if(type == GunAnimation.CYCLE_DRY) {
|
if(type == GunAnimation.CYCLE_DRY) {
|
||||||
if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F);
|
if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F);
|
||||||
}
|
}
|
||||||
@ -1437,6 +1492,7 @@ public class Orchestras {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 1) {
|
if(timer == 1) {
|
||||||
int cba = (stack.getItem() == ModItems.gun_aberrator_eott && ctx.configIndex == 0) ? -1 : 1;
|
int cba = (stack.getItem() == ModItems.gun_aberrator_eott && ctx.configIndex == 0) ? -1 : 1;
|
||||||
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
|
||||||
@ -1463,6 +1519,7 @@ public class Orchestras {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(type == GunAnimation.CYCLE) {
|
if(type == GunAnimation.CYCLE) {
|
||||||
|
if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100));
|
||||||
if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F);
|
if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F);
|
||||||
if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F);
|
if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F);
|
||||||
if(timer == 12) {
|
if(timer == 12) {
|
||||||
|
|||||||
@ -926,6 +926,14 @@ public class ModEventHandlerClient {
|
|||||||
if(ArmorUtil.isWearingEmptyMask(mc.thePlayer)) {
|
if(ArmorUtil.isWearingEmptyMask(mc.thePlayer)) {
|
||||||
MainRegistry.proxy.displayTooltip(EnumChatFormatting.RED + "Your mask has no filter!", MainRegistry.proxy.ID_FILTER);
|
MainRegistry.proxy.displayTooltip(EnumChatFormatting.RED + "Your mask has no filter!", MainRegistry.proxy.ID_FILTER);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//prune other entities' muzzle flashes
|
||||||
|
if(mc.theWorld.getTotalWorldTime() % 30 == 0) {
|
||||||
|
Iterator itr = ItemRenderWeaponBase.flashMap.keySet().iterator();
|
||||||
|
long millis = System.currentTimeMillis();
|
||||||
|
//dead entities may have later insertion order than actively firing ones, so we be safe
|
||||||
|
ItemRenderWeaponBase.flashMap.values().removeIf(entry -> millis - entry.longValue() >= 100);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Keyboard.isKeyDown(HbmKeybinds.qmaw.getKeyCode()) && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && Minecraft.getMinecraft().currentScreen != null) {
|
if(Keyboard.isKeyDown(HbmKeybinds.qmaw.getKeyCode()) && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && Minecraft.getMinecraft().currentScreen != null) {
|
||||||
@ -1425,14 +1433,6 @@ public class ModEventHandlerClient {
|
|||||||
|
|
||||||
if(event.phase == event.phase.END) {
|
if(event.phase == event.phase.END) {
|
||||||
ItemCustomLore.updateSystem();
|
ItemCustomLore.updateSystem();
|
||||||
|
|
||||||
//prune other entities' muzzle flashes
|
|
||||||
long millis = System.currentTimeMillis();
|
|
||||||
if(event.world.getTotalWorldTime() % 30 == 0) {
|
|
||||||
Iterator itr = ItemRenderWeaponBase.flashMap.keySet().iterator();
|
|
||||||
//dead entities may have later insertion order than actively firing ones, so we be safe
|
|
||||||
ItemRenderWeaponBase.flashMap.values().removeIf(entry -> entry.longValue() - millis >= 100);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -279,10 +279,10 @@ public class ModEventHandlerRenderer {
|
|||||||
if(renderWeapon.isLeftHanded()) {
|
if(renderWeapon.isLeftHanded()) {
|
||||||
GL11.glTranslatef(0.1875F, 0F, 0.0F);
|
GL11.glTranslatef(0.1875F, 0F, 0.0F);
|
||||||
renderWeapon.setupThirdPerson(held);
|
renderWeapon.setupThirdPerson(held);
|
||||||
renderWeapon.renderEquippedAkimbo(held);
|
renderWeapon.renderEquippedAkimbo(held, player);
|
||||||
} else {
|
} else {
|
||||||
renderWeapon.setupThirdPersonAkimbo(held);
|
renderWeapon.setupThirdPersonAkimbo(held);
|
||||||
renderWeapon.renderEquippedAkimbo(held);
|
renderWeapon.renderEquippedAkimbo(held, player);
|
||||||
}
|
}
|
||||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
|
|||||||
@ -16,27 +16,27 @@ import net.minecraft.item.ItemStack;
|
|||||||
public class MuzzleFlashPacket implements IMessage {
|
public class MuzzleFlashPacket implements IMessage {
|
||||||
|
|
||||||
private int entityID;
|
private int entityID;
|
||||||
private int gunIndex; //e.g. akimbo
|
//private int gunIndex; //e.g. akimbo
|
||||||
|
|
||||||
public MuzzleFlashPacket() { }
|
public MuzzleFlashPacket() { }
|
||||||
|
|
||||||
public MuzzleFlashPacket(EntityLivingBase entity) { this(entity, 0); }
|
//public MuzzleFlashPacket(EntityLivingBase entity) { this(entity, 0); }
|
||||||
|
|
||||||
public MuzzleFlashPacket(EntityLivingBase entity, int index) {
|
public MuzzleFlashPacket(EntityLivingBase entity) {
|
||||||
this.entityID = entity.getEntityId();
|
this.entityID = entity.getEntityId();
|
||||||
this.gunIndex = index;
|
//this.gunIndex = index;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void toBytes(ByteBuf buf) {
|
public void toBytes(ByteBuf buf) {
|
||||||
buf.writeInt(entityID);
|
buf.writeInt(entityID);
|
||||||
buf.writeInt(gunIndex);
|
//buf.writeInt(gunIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void fromBytes(ByteBuf buf) {
|
public void fromBytes(ByteBuf buf) {
|
||||||
this.entityID = buf.readInt();
|
this.entityID = buf.readInt();
|
||||||
this.gunIndex = buf.readInt();
|
//this.gunIndex = buf.readInt();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Handler implements IMessageHandler<MuzzleFlashPacket, IMessage> {
|
public static class Handler implements IMessageHandler<MuzzleFlashPacket, IMessage> {
|
||||||
@ -45,7 +45,7 @@ public class MuzzleFlashPacket implements IMessage {
|
|||||||
@Override
|
@Override
|
||||||
public IMessage onMessage(MuzzleFlashPacket m, MessageContext ctx) {
|
public IMessage onMessage(MuzzleFlashPacket m, MessageContext ctx) {
|
||||||
EntityLivingBase entity = (EntityLivingBase) Minecraft.getMinecraft().theWorld.getEntityByID(m.entityID);
|
EntityLivingBase entity = (EntityLivingBase) Minecraft.getMinecraft().theWorld.getEntityByID(m.entityID);
|
||||||
if(entity == null) return null;
|
if(entity == null || entity == Minecraft.getMinecraft().thePlayer) return null; //packets are sent to the player who fired
|
||||||
ItemStack stack = entity.getHeldItem();
|
ItemStack stack = entity.getHeldItem();
|
||||||
if(stack == null) return null;
|
if(stack == null) return null;
|
||||||
|
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.render.anim.HbmAnimations;
|
|||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
@ -208,6 +209,34 @@ public class ItemRenderAberrator extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.aberrator.renderPart("Slide");
|
ResourceManager.aberrator.renderPart("Slide");
|
||||||
ResourceManager.aberrator.renderPart("Sight");
|
ResourceManager.aberrator.renderPart("Sight");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 2, 4);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.75, 0.75, 0.75);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 2, -1.5);
|
||||||
|
GL11.glScaled(0.5, 0.5, 0.5);
|
||||||
|
this.renderFireball(shot);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFireball(long lastShot) {
|
public static void renderFireball(long lastShot) {
|
||||||
@ -218,6 +247,7 @@ public class ItemRenderAberrator extends ItemRenderWeaponBase {
|
|||||||
if(System.currentTimeMillis() - lastShot < flash) {
|
if(System.currentTimeMillis() - lastShot < flash) {
|
||||||
GL11.glEnable(GL11.GL_BLEND);
|
GL11.glEnable(GL11.GL_BLEND);
|
||||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
||||||
|
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
|
|
||||||
double fire = (System.currentTimeMillis() - lastShot) / (double) flash;
|
double fire = (System.currentTimeMillis() - lastShot) / (double) flash;
|
||||||
@ -244,6 +274,7 @@ public class ItemRenderAberrator extends ItemRenderWeaponBase {
|
|||||||
tess.draw();
|
tess.draw();
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
GL11.glDisable(GL11.GL_BLEND);
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
|
GL11.glEnable(GL11.GL_CULL_FACE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderAm180 extends ItemRenderWeaponBase {
|
public class ItemRenderAm180 extends ItemRenderWeaponBase {
|
||||||
@ -159,6 +160,30 @@ public class ItemRenderAm180 extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.am180.renderPart("Mag");
|
ResourceManager.am180.renderPart("Mag");
|
||||||
ResourceManager.am180.renderPart("MagPlate");
|
ResourceManager.am180.renderPart("MagPlate");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
boolean silenced = this.hasSilencer(stack);
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1.875, silenced ? 16.75 : 12);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
double flashScale = silenced ? 0.5 : 0.75;
|
||||||
|
GL11.glScaled(flashScale, flashScale, flashScale);
|
||||||
|
this.renderMuzzleFlash(shot, silenced ? 75 : 50, silenced ? 5 : 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasSilencer(ItemStack stack) {
|
public boolean hasSilencer(ItemStack stack) {
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
@ -194,7 +195,9 @@ public class ItemRenderAmat extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.amat.renderPart("BipodRight");
|
ResourceManager.amat.renderPart("BipodRight");
|
||||||
ResourceManager.amat.renderPart("BipodHingeRight");
|
ResourceManager.amat.renderPart("BipodHingeRight");
|
||||||
if(isScoped(stack)) ResourceManager.amat.renderPart("Scope");
|
if(isScoped(stack)) ResourceManager.amat.renderPart("Scope");
|
||||||
if(isSilenced(stack)) {
|
|
||||||
|
boolean silenced = isSilenced(stack);
|
||||||
|
if(silenced) {
|
||||||
GL11.glTranslated(0, 0.625, -4.3125);
|
GL11.glTranslated(0, 0.625, -4.3125);
|
||||||
GL11.glScaled(1.25, 1.25, 1.25);
|
GL11.glScaled(1.25, 1.25, 1.25);
|
||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.g3_attachments);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.g3_attachments);
|
||||||
@ -203,6 +206,25 @@ public class ItemRenderAmat extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.amat.renderPart("MuzzleBrake");
|
ResourceManager.amat.renderPart("MuzzleBrake");
|
||||||
}
|
}
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED && !silenced) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0.5, 11);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glScaled(0.75, 0.75, 0.75);
|
||||||
|
this.renderGapFlash(shot);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isScoped(ItemStack stack) {
|
public boolean isScoped(ItemStack stack) {
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
@ -142,5 +143,23 @@ public class ItemRenderAtlas extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||||
ResourceManager.bio_revolver.renderAll();
|
ResourceManager.bio_revolver.renderAll();
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1.5, 9.25);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderCarbine extends ItemRenderWeaponBase {
|
public class ItemRenderCarbine extends ItemRenderWeaponBase {
|
||||||
@ -147,6 +148,28 @@ public class ItemRenderCarbine extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.carbine.renderPart("Bayonet");
|
ResourceManager.carbine.renderPart("Bayonet");
|
||||||
}
|
}
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1, 8);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.5, 0.5, 0.5);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasBayonet(ItemStack stack) {
|
public boolean hasBayonet(ItemStack stack) {
|
||||||
|
|||||||
@ -13,6 +13,7 @@ import com.hbm.render.anim.AnimationEnums.GunAnimation;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderCongoLake extends ItemRenderWeaponBase {
|
public class ItemRenderCongoLake extends ItemRenderWeaponBase {
|
||||||
@ -175,5 +176,27 @@ public class ItemRenderCongoLake extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.congolake_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.congolake_tex);
|
||||||
ResourceManager.congolake.renderAll();
|
ResourceManager.congolake.renderAll();
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1.75, 4.25);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.5, 0.5, 0.5);
|
||||||
|
this.renderMuzzleFlash(shot, 150, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderDANI extends ItemRenderWeaponBase {
|
public class ItemRenderDANI extends ItemRenderWeaponBase {
|
||||||
@ -173,15 +174,48 @@ public class ItemRenderDANI extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.dani_lunar_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.dani_lunar_tex);
|
||||||
ResourceManager.bio_revolver.renderAll();
|
ResourceManager.bio_revolver.renderAll();
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
//Stopgap: at the moment, the flashMap is gun agnostic and does not care about index.
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1]; //Entity is second obj. passed
|
||||||
|
long shot;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[1];
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1.5, 9.25);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderEquippedAkimbo(ItemStack stack) {
|
public void renderEquippedAkimbo(ItemStack stack, EntityLivingBase ent) {
|
||||||
|
|
||||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.dani_celestial_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.dani_celestial_tex);
|
||||||
ResourceManager.bio_revolver.renderAll();
|
ResourceManager.bio_revolver.renderAll();
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
//EntityPlayer is first & only object passed
|
||||||
|
long shot;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1.5, 9.25);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderDebug extends ItemRenderWeaponBase {
|
public class ItemRenderDebug extends ItemRenderWeaponBase {
|
||||||
@ -136,5 +137,24 @@ public class ItemRenderDebug extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.lilmac.renderPart("Pivot");
|
ResourceManager.lilmac.renderPart("Pivot");
|
||||||
ResourceManager.lilmac.renderPart("Hammer");
|
ResourceManager.lilmac.renderPart("Hammer");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0.125, 2.5, 0);
|
||||||
|
this.renderGapFlash(shot);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
@ -170,6 +171,28 @@ public class ItemRenderDoubleBarrel extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.double_barrel.renderPart("Lever");
|
ResourceManager.double_barrel.renderPart("Lever");
|
||||||
ResourceManager.double_barrel.renderPart("Shells");
|
ResourceManager.double_barrel.renderPart("Shells");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0, 8);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(2, 2, 2);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isSawedOff(ItemStack stack) {
|
public boolean isSawedOff(ItemStack stack) {
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.render.anim.HbmAnimations;
|
|||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderEOTT extends ItemRenderWeaponBase {
|
public class ItemRenderEOTT extends ItemRenderWeaponBase {
|
||||||
@ -219,10 +220,36 @@ public class ItemRenderEOTT extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.aberrator.renderPart("Slide");
|
ResourceManager.aberrator.renderPart("Slide");
|
||||||
ResourceManager.aberrator.renderPart("Sight");
|
ResourceManager.aberrator.renderPart("Sight");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[1];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 2, 4);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.75, 0.75, 0.75);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 2, -1.5);
|
||||||
|
GL11.glScaled(0.5, 0.5, 0.5);
|
||||||
|
this.renderFireball(shot);
|
||||||
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderEquippedAkimbo(ItemStack stack) {
|
public void renderEquippedAkimbo(ItemStack stack, EntityLivingBase ent) {
|
||||||
|
|
||||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.eott_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.eott_tex);
|
||||||
@ -232,6 +259,31 @@ public class ItemRenderEOTT extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.aberrator.renderPart("Slide");
|
ResourceManager.aberrator.renderPart("Slide");
|
||||||
ResourceManager.aberrator.renderPart("Sight");
|
ResourceManager.aberrator.renderPart("Sight");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 2, 4);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.75, 0.75, 0.75);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 2, -1.5);
|
||||||
|
GL11.glScaled(0.5, 0.5, 0.5);
|
||||||
|
this.renderFireball(shot);
|
||||||
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -292,6 +344,7 @@ public class ItemRenderEOTT extends ItemRenderWeaponBase {
|
|||||||
if(System.currentTimeMillis() - lastShot < flash) {
|
if(System.currentTimeMillis() - lastShot < flash) {
|
||||||
GL11.glEnable(GL11.GL_BLEND);
|
GL11.glEnable(GL11.GL_BLEND);
|
||||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
||||||
|
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
|
|
||||||
double fire = (System.currentTimeMillis() - lastShot) / (double) flash;
|
double fire = (System.currentTimeMillis() - lastShot) / (double) flash;
|
||||||
@ -318,6 +371,7 @@ public class ItemRenderEOTT extends ItemRenderWeaponBase {
|
|||||||
tess.draw();
|
tess.draw();
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
GL11.glDisable(GL11.GL_BLEND);
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
|
GL11.glEnable(GL11.GL_CULL_FACE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderGreasegun extends ItemRenderWeaponBase {
|
public class ItemRenderGreasegun extends ItemRenderWeaponBase {
|
||||||
@ -152,14 +153,24 @@ public class ItemRenderGreasegun extends ItemRenderWeaponBase {
|
|||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
if(type == ItemRenderType.EQUIPPED) {
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
GL11.glTranslated(0, 0, 8);
|
GL11.glTranslated(0, 0, 8);
|
||||||
GL11.glRotated(90, 0, 1, 0);
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
GL11.glRotated(90 * gun.shotRand, 1, 0, 0);
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
GL11.glScaled(0.5, 0.5, 0.5);
|
GL11.glScaled(0.5, 0.5, 0.5);
|
||||||
this.renderMuzzleFlash(gun.lastShot[0], 75, 7.5);
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderHangman extends ItemRenderWeaponBase {
|
public class ItemRenderHangman extends ItemRenderWeaponBase {
|
||||||
@ -141,5 +142,27 @@ public class ItemRenderHangman extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.hangman_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.hangman_tex);
|
||||||
ResourceManager.hangman.renderAll();
|
ResourceManager.hangman.renderAll();
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0, 29);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(2, 2, 2);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
@ -173,6 +174,23 @@ public class ItemRenderHeavyRevolver extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.lilmac.renderPart("Scope");
|
ResourceManager.lilmac.renderPart("Scope");
|
||||||
}
|
}
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0.125, 2.5, 0);
|
||||||
|
this.renderGapFlash(shot);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isScoped(ItemStack stack) {
|
public boolean isScoped(ItemStack stack) {
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
@ -167,5 +168,26 @@ public class ItemRenderHenry extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||||
ResourceManager.henry.renderAll();
|
ResourceManager.henry.renderAll();
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1, 8);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderLAG extends ItemRenderWeaponBase {
|
public class ItemRenderLAG extends ItemRenderWeaponBase {
|
||||||
@ -145,5 +146,25 @@ public class ItemRenderLAG extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.mike_hawk.renderPart("Slide");
|
ResourceManager.mike_hawk.renderPart("Slide");
|
||||||
ResourceManager.mike_hawk.renderPart("Hammer");
|
ResourceManager.mike_hawk.renderPart("Hammer");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(-10.25, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
@ -131,6 +132,26 @@ public class ItemRenderLaserPistol extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.laser_pistol.renderPart("Latch");
|
ResourceManager.laser_pistol.renderPart("Latch");
|
||||||
if(hasCapacitors(stack)) ResourceManager.laser_pistol.renderPart("Capacitors");
|
if(hasCapacitors(stack)) ResourceManager.laser_pistol.renderPart("Capacitors");
|
||||||
if(hasTape(stack)) ResourceManager.laser_pistol.renderPart("Tape");
|
if(hasTape(stack)) ResourceManager.laser_pistol.renderPart("Tape");
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 2, 4.75);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
renderLaserFlash(shot, 150, 1.5D, hasEmerald(stack) ? 0x008000 : 0xff0000);
|
||||||
|
GL11.glTranslated(0, 0, -0.25);
|
||||||
|
renderLaserFlash(shot, 150, 0.75D, hasEmerald(stack) ? 0x80ff00 : 0xff8000);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderLasrifle extends ItemRenderWeaponBase {
|
public class ItemRenderLasrifle extends ItemRenderWeaponBase {
|
||||||
@ -134,6 +135,26 @@ public class ItemRenderLasrifle extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.lasrifle_mods_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.lasrifle_mods_tex);
|
||||||
if(hasShotgun(stack)) ResourceManager.lasrifle_mods.renderPart("BarrelShotgun");
|
if(hasShotgun(stack)) ResourceManager.lasrifle_mods.renderPart("BarrelShotgun");
|
||||||
if(hasCapacitor(stack)) ResourceManager.lasrifle_mods.renderPart("UnderBarrel");
|
if(hasCapacitor(stack)) ResourceManager.lasrifle_mods.renderPart("UnderBarrel");
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1.5, 12);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
renderLaserFlash(shot, 150, 1.5D, 0xff0000);
|
||||||
|
GL11.glTranslated(0, 0, -0.25);
|
||||||
|
renderLaserFlash(shot, 150, 0.75D, 0xff8000);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderLiberator extends ItemRenderWeaponBase {
|
public class ItemRenderLiberator extends ItemRenderWeaponBase {
|
||||||
@ -157,5 +158,27 @@ public class ItemRenderLiberator extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.liberator_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.liberator_tex);
|
||||||
ResourceManager.liberator.renderAll();
|
ResourceManager.liberator.renderAll();
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0.5, 8);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(1.5, 1.5, 1.5);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderM2 extends ItemRenderWeaponBase {
|
public class ItemRenderM2 extends ItemRenderWeaponBase {
|
||||||
@ -105,10 +106,34 @@ public class ItemRenderM2 extends ItemRenderWeaponBase {
|
|||||||
public void renderOther(ItemStack stack, ItemRenderType type, Object... data) {
|
public void renderOther(ItemStack stack, ItemRenderType type, Object... data) {
|
||||||
GL11.glEnable(GL11.GL_LIGHTING);
|
GL11.glEnable(GL11.GL_LIGHTING);
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
GL11.glRotated(180, 0, 1, 0);
|
GL11.glRotated(180, 0, 1, 0);
|
||||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||||
Minecraft.getMinecraft().getTextureManager().bindTexture(ResourceManager.m2_tex);
|
Minecraft.getMinecraft().getTextureManager().bindTexture(ResourceManager.m2_tex);
|
||||||
ResourceManager.m2.renderAll();
|
ResourceManager.m2.renderAll();
|
||||||
|
GL11.glPopMatrix();
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1.625, 5);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.5, 0.5, 0.5);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import com.hbm.render.anim.HbmAnimations;
|
|||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.GLAllocation;
|
import net.minecraft.client.renderer.GLAllocation;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderMAS36 extends ItemRenderWeaponBase {
|
public class ItemRenderMAS36 extends ItemRenderWeaponBase {
|
||||||
@ -190,6 +191,28 @@ public class ItemRenderMAS36 extends ItemRenderWeaponBase {
|
|||||||
if(type != ItemRenderType.EQUIPPED) GL11.glTranslated(0, -1, -6);
|
if(type != ItemRenderType.EQUIPPED) GL11.glTranslated(0, -1, -6);
|
||||||
if(hasBayonet(stack)) ResourceManager.mas36.renderPart("Bayonet");
|
if(hasBayonet(stack)) ResourceManager.mas36.renderPart("Bayonet");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1, 8);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.5, 0.5, 0.5);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 10);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isScoped(ItemStack stack) {
|
public boolean isScoped(ItemStack stack) {
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
@ -163,11 +164,33 @@ public class ItemRenderMaresleg extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||||
ResourceManager.maresleg.renderPart("Gun");
|
ResourceManager.maresleg.renderPart("Gun");
|
||||||
ResourceManager.maresleg.renderPart("Lever");
|
ResourceManager.maresleg.renderPart("Lever");
|
||||||
if(!getShort(stack)) {
|
boolean shortened = getShort(stack);
|
||||||
|
if(!shortened) {
|
||||||
ResourceManager.maresleg.renderPart("Stock");
|
ResourceManager.maresleg.renderPart("Stock");
|
||||||
ResourceManager.maresleg.renderPart("Barrel");
|
ResourceManager.maresleg.renderPart("Barrel");
|
||||||
}
|
}
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1, shortened ? 3.75 : 8);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getShort(ItemStack stack) {
|
public boolean getShort(ItemStack stack) {
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderMareslegAkimbo extends ItemRenderWeaponBase {
|
public class ItemRenderMareslegAkimbo extends ItemRenderWeaponBase {
|
||||||
@ -203,6 +204,53 @@ public class ItemRenderMareslegAkimbo extends ItemRenderWeaponBase {
|
|||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void renderEquipped(ItemStack stack, Object... data) {
|
||||||
|
renderOther(stack, ItemRenderType.EQUIPPED);
|
||||||
|
//grumble grumble
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[1];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1, 3.75);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void renderEquippedAkimbo(ItemStack stack, EntityLivingBase ent) {
|
||||||
|
renderOther(stack, ItemRenderType.EQUIPPED);
|
||||||
|
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1, 3.75);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderOther(ItemStack stack, ItemRenderType type, Object... data) {
|
public void renderOther(ItemStack stack, ItemRenderType type, Object... data) {
|
||||||
|
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
@ -129,5 +130,34 @@ public class ItemRenderMinigun extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.minigun.renderPart("Grip");
|
ResourceManager.minigun.renderPart("Grip");
|
||||||
ResourceManager.minigun.renderPart("Barrels");
|
ResourceManager.minigun.renderPart("Barrels");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0, 12);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
|
||||||
|
if(stack.getItem() == ModItems.gun_minigun_lacunae) {
|
||||||
|
renderLaserFlash(shot, 50, 1D, 0xff00ff);
|
||||||
|
GL11.glTranslated(0, 0, -0.25);
|
||||||
|
renderLaserFlash(shot, 50, 0.5D, 0xff0080);
|
||||||
|
} else {
|
||||||
|
GL11.glRotated(shotRand * 90, 1, 0, 0);
|
||||||
|
GL11.glScaled(1.5, 1.5, 1.5);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 5);
|
||||||
|
}
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderMinigunDual extends ItemRenderWeaponBase {
|
public class ItemRenderMinigunDual extends ItemRenderWeaponBase {
|
||||||
@ -119,16 +120,57 @@ public class ItemRenderMinigunDual extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.minigun.renderPart("Gun");
|
ResourceManager.minigun.renderPart("Gun");
|
||||||
ResourceManager.minigun.renderPart("Barrels");
|
ResourceManager.minigun.renderPart("Barrels");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[1];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0, 12);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
|
||||||
|
GL11.glRotated(shotRand * 90, 1, 0, 0);
|
||||||
|
GL11.glScaled(1.5, 1.5, 1.5);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderEquippedAkimbo(ItemStack stack) {
|
public void renderEquippedAkimbo(ItemStack stack, EntityLivingBase ent) {
|
||||||
|
|
||||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.minigun_dual_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.minigun_dual_tex);
|
||||||
ResourceManager.minigun.renderPart("GunDual");
|
ResourceManager.minigun.renderPart("GunDual");
|
||||||
ResourceManager.minigun.renderPart("Barrels");
|
ResourceManager.minigun.renderPart("Barrels");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0, 12);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
|
||||||
|
GL11.glRotated(shotRand * 90, 1, 0, 0);
|
||||||
|
GL11.glScaled(1.5, 1.5, 1.5);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import com.hbm.render.anim.HbmAnimations;
|
|||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.renderer.OpenGlHelper;
|
import net.minecraft.client.renderer.OpenGlHelper;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.MathHelper;
|
import net.minecraft.util.MathHelper;
|
||||||
@ -153,5 +154,26 @@ public class ItemRenderMissileLauncher extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.missile_launcher.renderPart("Front");
|
ResourceManager.missile_launcher.renderPart("Front");
|
||||||
if(gun.getConfig(stack, 0).getReceivers(stack)[0].getMagazine(stack).getAmount(stack, null) > 0) ResourceManager.missile_launcher.renderPart("Missile");
|
if(gun.getConfig(stack, 0).getReceivers(stack)[0].getMagazine(stack).getAmount(stack, null) > 0) ResourceManager.missile_launcher.renderPart("Missile");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1, 6.75);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(shotRand * 90, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.75, 0.75, 0.75);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,6 +10,7 @@ import com.hbm.render.tileentity.RenderArcFurnace;
|
|||||||
import com.hbm.util.ColorUtil;
|
import com.hbm.util.ColorUtil;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderNI4NI extends ItemRenderWeaponBase {
|
public class ItemRenderNI4NI extends ItemRenderWeaponBase {
|
||||||
@ -185,5 +186,27 @@ public class ItemRenderNI4NI extends ItemRenderWeaponBase {
|
|||||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||||
RenderArcFurnace.fullbright(false);
|
RenderArcFurnace.fullbright(false);
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0.75, 4);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.125, 0.125, 0.125);
|
||||||
|
this.renderLaserFlash(shot, 75, 7.5, 0xFFFFFF);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderPanzerschreck extends ItemRenderWeaponBase {
|
public class ItemRenderPanzerschreck extends ItemRenderWeaponBase {
|
||||||
@ -107,6 +108,28 @@ public class ItemRenderPanzerschreck extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.panzerschreck.renderPart("Tube");
|
ResourceManager.panzerschreck.renderPart("Tube");
|
||||||
if(hasShield(stack)) ResourceManager.panzerschreck.renderPart("Shield");
|
if(hasShield(stack)) ResourceManager.panzerschreck.renderPart("Shield");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0, 6.5);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.75, 0.75, 0.75);
|
||||||
|
this.renderMuzzleFlash(shot, 150, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasShield(ItemStack stack) {
|
public boolean hasShield(ItemStack stack) {
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderPepperbox extends ItemRenderWeaponBase {
|
public class ItemRenderPepperbox extends ItemRenderWeaponBase {
|
||||||
@ -138,5 +139,29 @@ public class ItemRenderPepperbox extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.pepperbox.renderPart("Hammer");
|
ResourceManager.pepperbox.renderPart("Hammer");
|
||||||
ResourceManager.pepperbox.renderPart("Trigger");
|
ResourceManager.pepperbox.renderPart("Trigger");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0.5, 7);
|
||||||
|
GL11.glScaled(0.5, 0.5, 0.5);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot);
|
||||||
|
GL11.glRotated(45, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import com.hbm.render.anim.HbmAnimations;
|
|||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.renderer.OpenGlHelper;
|
import net.minecraft.client.renderer.OpenGlHelper;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.MathHelper;
|
import net.minecraft.util.MathHelper;
|
||||||
@ -145,5 +146,27 @@ public class ItemRenderQuadro extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.quadro_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.quadro_tex);
|
||||||
ResourceManager.quadro.renderPart("Launcher");
|
ResourceManager.quadro.renderPart("Launcher");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix(); //TODO: adjust in third person, flash is too far forward/ large
|
||||||
|
GL11.glTranslated(0, 0.75, 2);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.75, 0.75, 0.75);
|
||||||
|
this.renderMuzzleFlash(shot, 150, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import com.hbm.particle.SpentCasing;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderSPAS12 extends ItemRenderWeaponBase {
|
public class ItemRenderSPAS12 extends ItemRenderWeaponBase {
|
||||||
@ -140,5 +141,26 @@ public class ItemRenderSPAS12 extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.spas_12.renderPart("MainBody");
|
ResourceManager.spas_12.renderPart("MainBody");
|
||||||
ResourceManager.spas_12.renderPart("PumpGrip");
|
ResourceManager.spas_12.renderPart("PumpGrip");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1.5, -11);
|
||||||
|
GL11.glRotated(-90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderSTG77 extends ItemRenderWeaponBase {
|
public class ItemRenderSTG77 extends ItemRenderWeaponBase {
|
||||||
@ -184,5 +185,27 @@ public class ItemRenderSTG77 extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.stg77.renderPart("Handle");
|
ResourceManager.stg77.renderPart("Handle");
|
||||||
ResourceManager.stg77.renderPart("Breech");
|
ResourceManager.stg77.renderPart("Breech");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0, 7.5);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glScaled(0.25, 0.25, 0.25);
|
||||||
|
GL11.glRotated(-5 + shotRand * 10, 1, 0, 0);
|
||||||
|
this.renderGapFlash(shot);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,6 +10,7 @@ import com.hbm.util.BobMathUtil;
|
|||||||
import com.hbm.util.Vec3NT;
|
import com.hbm.util.Vec3NT;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
@ -234,6 +235,27 @@ public class ItemRenderSexy extends ItemRenderWeaponBase {
|
|||||||
renderShell(p * 17, p * -20, -90, true);
|
renderShell(p * 17, p * -20, -90, true);
|
||||||
|
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0, 8);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 150, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderShell(double x0, double x1, double y0, double y1, double rot0, double rot1, boolean shell, double interp) {
|
public static void renderShell(double x0, double x1, double y0, double y1, double rot0, double rot1, boolean shell, double interp) {
|
||||||
|
|||||||
@ -12,6 +12,7 @@ import com.hbm.render.anim.HbmAnimations;
|
|||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.renderer.OpenGlHelper;
|
import net.minecraft.client.renderer.OpenGlHelper;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.MathHelper;
|
import net.minecraft.util.MathHelper;
|
||||||
@ -174,5 +175,27 @@ public class ItemRenderShredder extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||||
ResourceManager.shredder.renderAll();
|
ResourceManager.shredder.renderAll();
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 1, 7.5);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(shotRand * 90, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.75, 0.75, 0.75);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import com.hbm.render.anim.HbmAnimations;
|
|||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.renderer.OpenGlHelper;
|
import net.minecraft.client.renderer.OpenGlHelper;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderStinger extends ItemRenderWeaponBase {
|
public class ItemRenderStinger extends ItemRenderWeaponBase {
|
||||||
@ -135,5 +136,27 @@ public class ItemRenderStinger extends ItemRenderWeaponBase {
|
|||||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.stinger_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.stinger_tex);
|
||||||
ResourceManager.stinger.renderAll();
|
ResourceManager.stinger.renderAll();
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 3.5, -10.3795);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
GL11.glScaled(0.75, 0.75, 0.75);
|
||||||
|
this.renderMuzzleFlash(shot, 150, 10);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderUzi extends ItemRenderWeaponBase {
|
public class ItemRenderUzi extends ItemRenderWeaponBase {
|
||||||
@ -174,6 +175,27 @@ public class ItemRenderUzi extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.uzi.renderPart("Magazine");
|
ResourceManager.uzi.renderPart("Magazine");
|
||||||
if(silenced) ResourceManager.uzi.renderPart("Silencer");
|
if(silenced) ResourceManager.uzi.renderPart("Silencer");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(type == ItemRenderType.EQUIPPED && !silenced) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1];
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0.75, 8.5);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasSilencer(ItemStack stack, int cfg) {
|
public boolean hasSilencer(ItemStack stack, int cfg) {
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.hbm.main.ResourceManager;
|
|||||||
import com.hbm.render.anim.HbmAnimations;
|
import com.hbm.render.anim.HbmAnimations;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemRenderUziAkimbo extends ItemRenderWeaponBase {
|
public class ItemRenderUziAkimbo extends ItemRenderWeaponBase {
|
||||||
@ -162,12 +163,34 @@ public class ItemRenderUziAkimbo extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.uzi.renderPart("StockFront");
|
ResourceManager.uzi.renderPart("StockFront");
|
||||||
ResourceManager.uzi.renderPart("Slide");
|
ResourceManager.uzi.renderPart("Slide");
|
||||||
ResourceManager.uzi.renderPart("Magazine");
|
ResourceManager.uzi.renderPart("Magazine");
|
||||||
if(hasSilencer(stack, 1)) ResourceManager.uzi.renderPart("Silencer");
|
boolean silenced = hasSilencer(stack, 1);
|
||||||
|
if(silenced) ResourceManager.uzi.renderPart("Silencer");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(!silenced) {
|
||||||
|
EntityLivingBase ent = (EntityLivingBase) data[1]; //Entity is second obj. passed
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[1];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0.75, 8.5);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderEquippedAkimbo(ItemStack stack) {
|
public void renderEquippedAkimbo(ItemStack stack, EntityLivingBase ent) {
|
||||||
|
|
||||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||||
Minecraft.getMinecraft().renderEngine.bindTexture(isSaturnite(stack, 0) ? ResourceManager.uzi_saturnite_tex : ResourceManager.uzi_tex);
|
Minecraft.getMinecraft().renderEngine.bindTexture(isSaturnite(stack, 0) ? ResourceManager.uzi_saturnite_tex : ResourceManager.uzi_tex);
|
||||||
@ -176,8 +199,29 @@ public class ItemRenderUziAkimbo extends ItemRenderWeaponBase {
|
|||||||
ResourceManager.uzi.renderPart("StockFront");
|
ResourceManager.uzi.renderPart("StockFront");
|
||||||
ResourceManager.uzi.renderPart("Slide");
|
ResourceManager.uzi.renderPart("Slide");
|
||||||
ResourceManager.uzi.renderPart("Magazine");
|
ResourceManager.uzi.renderPart("Magazine");
|
||||||
if(hasSilencer(stack, 0)) ResourceManager.uzi.renderPart("Silencer");
|
boolean silenced = hasSilencer(stack, 0);
|
||||||
|
if(silenced) ResourceManager.uzi.renderPart("Silencer");
|
||||||
GL11.glShadeModel(GL11.GL_FLAT);
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
|
||||||
|
if(!silenced) {
|
||||||
|
long shot;
|
||||||
|
double shotRand = 0;
|
||||||
|
if(ent == Minecraft.getMinecraft().thePlayer) {
|
||||||
|
ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
|
||||||
|
shot = gun.lastShot[0];
|
||||||
|
shotRand = gun.shotRand;
|
||||||
|
} else {
|
||||||
|
shot = ItemRenderWeaponBase.flashMap.getOrDefault(ent, (long) -1);
|
||||||
|
if(shot < 0) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(0, 0.75, 8.5);
|
||||||
|
GL11.glRotated(90, 0, 1, 0);
|
||||||
|
GL11.glRotated(90 * shotRand, 1, 0, 0);
|
||||||
|
this.renderMuzzleFlash(shot, 75, 7.5);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -65,7 +65,7 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer {
|
|||||||
}
|
}
|
||||||
//entitylivingbase is second Object passed
|
//entitylivingbase is second Object passed
|
||||||
public void renderEquipped(ItemStack stack, Object... data) { renderOther(stack, ItemRenderType.EQUIPPED, data); }
|
public void renderEquipped(ItemStack stack, Object... data) { renderOther(stack, ItemRenderType.EQUIPPED, data); }
|
||||||
public void renderEquippedAkimbo(ItemStack stack) { renderOther(stack, ItemRenderType.EQUIPPED); }
|
public void renderEquippedAkimbo(ItemStack stack, EntityLivingBase entity) { renderOther(stack, ItemRenderType.EQUIPPED); }
|
||||||
public void renderInv(ItemStack stack) { renderOther(stack, ItemRenderType.INVENTORY); }
|
public void renderInv(ItemStack stack) { renderOther(stack, ItemRenderType.INVENTORY); }
|
||||||
public void renderEntity(ItemStack stack) { renderOther(stack, ItemRenderType.ENTITY); }
|
public void renderEntity(ItemStack stack) { renderOther(stack, ItemRenderType.ENTITY); }
|
||||||
|
|
||||||
@ -399,6 +399,7 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer {
|
|||||||
if(System.currentTimeMillis() - lastShot < flash) {
|
if(System.currentTimeMillis() - lastShot < flash) {
|
||||||
GL11.glEnable(GL11.GL_BLEND);
|
GL11.glEnable(GL11.GL_BLEND);
|
||||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
||||||
|
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
|
|
||||||
double fire = (System.currentTimeMillis() - lastShot) / (double) flash;
|
double fire = (System.currentTimeMillis() - lastShot) / (double) flash;
|
||||||
@ -437,6 +438,7 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer {
|
|||||||
tess.draw();
|
tess.draw();
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
GL11.glDisable(GL11.GL_BLEND);
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
|
GL11.glEnable(GL11.GL_CULL_FACE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -447,6 +449,7 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer {
|
|||||||
GL11.glEnable(GL11.GL_BLEND);
|
GL11.glEnable(GL11.GL_BLEND);
|
||||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
||||||
GL11.glDepthMask(false);
|
GL11.glDepthMask(false);
|
||||||
|
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
|
|
||||||
double fire = (System.currentTimeMillis() - lastShot) / (double) flash;
|
double fire = (System.currentTimeMillis() - lastShot) / (double) flash;
|
||||||
@ -469,6 +472,7 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer {
|
|||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
GL11.glDepthMask(true);
|
GL11.glDepthMask(true);
|
||||||
GL11.glDisable(GL11.GL_BLEND);
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
|
GL11.glEnable(GL11.GL_CULL_FACE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user