diff --git a/assets/hbm/textures/items/designator_range_alt.png b/assets/hbm/textures/items/designator_range_alt.png new file mode 100644 index 000000000..99dfc2daf Binary files /dev/null and b/assets/hbm/textures/items/designator_range_alt.png differ diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 183f0ad0b..249c542b0 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -1341,7 +1341,7 @@ public class ModItems { pellet_advanced = new WatzFuel(216000, 1000, 1.1F, 0, 0.995F, 0.99F).setUnlocalizedName("pellet_advanced").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":pellet_advanced").setMaxStackSize(1); designator = new ItemDesingator().setUnlocalizedName("designator").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":designator"); - designator_range = new ItemDesingatorRange().setUnlocalizedName("designator_range").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":designator_range"); + designator_range = new ItemDesingatorRange().setUnlocalizedName("designator_range").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":designator_range_alt"); missile_generic = new Item().setUnlocalizedName("missile_generic").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_generic"); missile_anti_ballistic = new Item().setUnlocalizedName("missile_anti_ballistic").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_anti_ballistic"); missile_incendiary = new Item().setUnlocalizedName("missile_incendiary").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_incendiary"); diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index c1fa00175..c11fe0fc5 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -385,13 +385,27 @@ public class Library { } public static MovingObjectPosition rayTrace(EntityPlayer player, double d, float f) { - Vec3 vec3 = player.getPosition(f); + Vec3 vec3 = getPosition(f, player); vec3.yCoord += player.eyeHeight; Vec3 vec31 = player.getLook(f); Vec3 vec32 = vec3.addVector(vec31.xCoord * d, vec31.yCoord * d, vec31.zCoord * d); return player.worldObj.func_147447_a(vec3, vec32, false, false, true); } + public static Vec3 getPosition(float par1, EntityPlayer player) { + if (par1 == 1.0F) + { + return Vec3.createVectorHelper(player.posX, player.posY + (player.getEyeHeight() - player.getDefaultEyeHeight()), player.posZ); + } + else + { + double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double)par1; + double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double)par1 + (player.getEyeHeight() - player.getDefaultEyeHeight()); + double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double)par1; + return Vec3.createVectorHelper(d0, d1, d2); + } + } + public static List getBlockPosInPath(EntityPlayer player, int x, int y, int z, int length, Vec3 vec0) { List list = new ArrayList(); diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 5ea3280b0..6d4c6622f 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.24 Beta (V-Tennessine-Lyra), change before release"; + public static final String VERSION = "1.0.24 Beta (V-Bromine-Luna), change before release"; public static final String CLIENTSIDE = "com.hbm.main.ClientProxy"; public static final String SERVERSIDE = "com.hbm.main.ServerProxy"; }