diff --git a/changelog b/changelog index fcdcccd30..78b2395fc 100644 --- a/changelog +++ b/changelog @@ -18,6 +18,9 @@ * Cast plate foundry molds now have a triple variant * Zombies now have a chance to drop copper, aluminium and titanium ingots (1:200 each) * The burner press now has nine additional storage slots for things like stamps and reserve fuel +* Improved minigun muzzleflash + * The flash is now faster and larger + * Moved the origin up to be at the firing barrel instead of the center of the rotor ## Fixed * Fixed euphemium compound plate recipe not yielding four items as it should in the plasma forge diff --git a/src/main/java/com/hbm/items/weapon/grenade/ItemGrenadeUniversal.java b/src/main/java/com/hbm/items/weapon/grenade/ItemGrenadeUniversal.java index 3607196e3..975aae45d 100644 --- a/src/main/java/com/hbm/items/weapon/grenade/ItemGrenadeUniversal.java +++ b/src/main/java/com/hbm/items/weapon/grenade/ItemGrenadeUniversal.java @@ -21,6 +21,7 @@ import com.hbm.render.anim.BusAnimationKeyframe.IType; import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationSequence; import com.hbm.util.EnumUtil; +import com.hbm.util.i18n.I18nUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -32,6 +33,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; public class ItemGrenadeUniversal extends Item implements IEquipReceiver, IAnimatedItem { @@ -177,11 +179,11 @@ public class ItemGrenadeUniversal extends Item implements IEquipReceiver, IAnima @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { - list.add("item.grenade_universal.shell." + this.getShell(stack).name().toLowerCase(Locale.US)); - list.add("item.grenade_universal.filling." + this.getFilling(stack).name().toLowerCase(Locale.US)); - list.add("item.grenade_universal.fuze." + this.getFuze(stack).name().toLowerCase(Locale.US)); + list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey(ModItems.grenade_shell.getUnlocalizedName() + "." + this.getShell(stack).name().toLowerCase(Locale.US) + ".name")); + list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey(ModItems.grenade_filling.getUnlocalizedName() + "." + this.getFilling(stack).name().toLowerCase(Locale.US) + ".name")); + list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey(ModItems.grenade_fuze.getUnlocalizedName() + "." + this.getFuze(stack).name().toLowerCase(Locale.US) + ".name")); EnumGrenadeExtra extra = this.getExtra(stack); - if(extra != null) list.add("item.grenade_universal.extra." + extra.name().toLowerCase(Locale.US)); + if(extra != null) list.add(EnumChatFormatting.RED + I18nUtil.resolveKey(ModItems.grenade_extra.getUnlocalizedName() + "." + extra.name().toLowerCase(Locale.US) + ".name")); } @Override diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigun.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigun.java index a0ea72cf6..300c26731 100644 --- a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigun.java +++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigun.java @@ -87,9 +87,10 @@ public class ItemRenderMinigun extends ItemRenderWeaponBase { GL11.glTranslated(0, 0, -0.25); renderLaserFlash(gun.lastShot[0], 50, 0.5D, 0xff0080); } else { + GL11.glTranslated(0, 0.5, 0); GL11.glRotated(gun.shotRand * 90, 1, 0, 0); GL11.glScaled(1.5, 1.5, 1.5); - this.renderMuzzleFlash(gun.lastShot[0], 75, 5); + this.renderMuzzleFlash(gun.lastShot[0], 50, 7.5); } GL11.glPopMatrix(); } @@ -153,9 +154,10 @@ public class ItemRenderMinigun extends ItemRenderWeaponBase { GL11.glTranslated(0, 0, -0.25); renderLaserFlash(shot, 50, 0.5D, 0xff0080); } else { + GL11.glTranslated(0, 0.5, 0); GL11.glRotated(shotRand * 90, 1, 0, 0); GL11.glScaled(1.5, 1.5, 1.5); - this.renderMuzzleFlash(shot, 75, 5); + this.renderMuzzleFlash(shot, 50, 7.55); } GL11.glPopMatrix(); } diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigunDual.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigunDual.java index 09f9fd37c..3ea39d0a3 100644 --- a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigunDual.java +++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigunDual.java @@ -73,7 +73,7 @@ public class ItemRenderMinigunDual extends ItemRenderWeaponBase { GL11.glRotated(gun.shotRand * 90, 1, 0, 0); GL11.glScaled(1.5, 1.5, 1.5); - this.renderMuzzleFlash(gun.lastShot[index], 75, 5); + this.renderMuzzleFlash(gun.lastShot[index], 50, 7.5); GL11.glPopMatrix(); GL11.glPopMatrix(); @@ -136,10 +136,11 @@ public class ItemRenderMinigunDual extends ItemRenderWeaponBase { GL11.glPushMatrix(); GL11.glTranslated(0, 0, 12.25); GL11.glRotated(90, 0, 1, 0); - + + GL11.glTranslated(0, 0.5, 0); GL11.glRotated(shotRand * 90, 1, 0, 0); GL11.glScaled(1.5, 1.5, 1.5); - this.renderMuzzleFlash(shot, 75, 5); + this.renderMuzzleFlash(shot, 50, 7.5); GL11.glPopMatrix(); } @@ -166,10 +167,11 @@ public class ItemRenderMinigunDual extends ItemRenderWeaponBase { GL11.glPushMatrix(); GL11.glTranslated(0, 0, 12.25); GL11.glRotated(90, 0, 1, 0); - + + GL11.glTranslated(0, 0.5, 0); GL11.glRotated(shotRand * 90, 1, 0, 0); GL11.glScaled(1.5, 1.5, 1.5); - this.renderMuzzleFlash(shot, 75, 5); + this.renderMuzzleFlash(shot, 50, 7.5); GL11.glPopMatrix(); }