diff --git a/assets/hbm/models/vault_cog.obj b/assets/hbm/models/vault_cog.obj index 37da38a62..6332a2c08 100644 --- a/assets/hbm/models/vault_cog.obj +++ b/assets/hbm/models/vault_cog.obj @@ -695,9 +695,9 @@ vt 0.509393 0.380860 vt 0.516561 0.372317 vt 0.506904 0.377893 vt 0.498585 0.363484 -vt 0.540437 0.802583 -vt 0.540437 0.806300 -vt 0.527820 0.806300 +vt 0.537361 0.801968 +vt 0.537361 0.805685 +vt 0.524744 0.805685 vt 0.581146 0.318140 vt 0.571587 0.310119 vt 0.535398 0.310119 @@ -714,42 +714,42 @@ vt 0.547184 0.376963 vt 0.525794 0.364585 vt 0.519555 0.353779 vt 0.587454 0.329066 -vt 0.500191 0.829484 -vt 0.570257 0.841909 -vt 0.565001 0.866982 -vt 0.561782 0.865124 -vt 0.568090 0.854198 -vt 0.526549 0.802808 -vt 0.516095 0.810568 -vt 0.513706 0.807721 -vt 0.506430 0.818678 -vt 0.573918 0.841264 -vt 0.568066 0.829484 -vt 0.496530 0.828839 -vt 0.498000 0.841909 -vt 0.496948 0.856056 -vt 0.500167 0.854198 -vt 0.506475 0.865124 -vt 0.554613 0.875992 -vt 0.552223 0.873145 -vt 0.571285 0.827626 -vt 0.561827 0.818678 -vt 0.527890 0.881177 -vt 0.527890 0.877460 -vt 0.540368 0.877460 -vt 0.526618 0.880952 -vt 0.514763 0.876637 -vt 0.516034 0.873145 -vt 0.504086 0.867971 -vt 0.554552 0.807721 -vt 0.564216 0.815830 -vt 0.541639 0.880952 -vt 0.494340 0.842555 -vt 0.571751 0.854843 -vt 0.553434 0.807075 -vt 0.552163 0.810568 -vt 0.496972 0.827626 -vt 0.503211 0.816819 +vt 0.497115 0.828869 +vt 0.567181 0.841294 +vt 0.561925 0.866367 +vt 0.558706 0.864509 +vt 0.565014 0.853582 +vt 0.523473 0.802192 +vt 0.513019 0.809953 +vt 0.510630 0.807106 +vt 0.503354 0.818063 +vt 0.570842 0.840648 +vt 0.564990 0.828869 +vt 0.493454 0.828224 +vt 0.494924 0.841294 +vt 0.493872 0.855441 +vt 0.497091 0.853582 +vt 0.503399 0.864509 +vt 0.551537 0.875377 +vt 0.549147 0.872529 +vt 0.568209 0.827011 +vt 0.558751 0.818063 +vt 0.524814 0.880561 +vt 0.524814 0.876844 +vt 0.537292 0.876844 +vt 0.523542 0.880337 +vt 0.511687 0.876022 +vt 0.512958 0.872529 +vt 0.501010 0.867356 +vt 0.551476 0.807106 +vt 0.561140 0.815215 +vt 0.538563 0.880337 +vt 0.491264 0.841939 +vt 0.568675 0.854228 +vt 0.550358 0.806460 +vt 0.549087 0.809953 +vt 0.493896 0.827011 +vt 0.500135 0.816204 vt 0.190212 0.910610 vt 0.190212 0.958966 vt 0.178432 0.958966 @@ -936,21 +936,21 @@ vt 0.581351 0.393609 vt 0.609756 0.323022 vt 0.541268 0.399299 vt 0.522280 0.391673 -vt 0.527820 0.802583 -vt 0.571309 0.856056 -vt 0.514824 0.807075 -vt 0.504041 0.815830 -vt 0.571727 0.828839 -vt 0.494340 0.841264 -vt 0.503256 0.866982 -vt 0.564171 0.867971 -vt 0.565046 0.816819 -vt 0.540368 0.881177 -vt 0.513645 0.875992 -vt 0.553495 0.876637 -vt 0.496506 0.854843 -vt 0.573918 0.842555 -vt 0.541708 0.802808 +vt 0.524744 0.801968 +vt 0.568233 0.855441 +vt 0.511748 0.806460 +vt 0.500965 0.815215 +vt 0.568651 0.828224 +vt 0.491264 0.840648 +vt 0.500180 0.866367 +vt 0.561095 0.867356 +vt 0.561970 0.816204 +vt 0.537292 0.880561 +vt 0.510569 0.875377 +vt 0.550419 0.876022 +vt 0.493430 0.854228 +vt 0.570842 0.841939 +vt 0.538632 0.802192 vt 0.866725 0.300185 vt 0.444588 0.908180 vt 0.276824 0.887323 diff --git a/assets/hbm/textures/models/vault_cog.png b/assets/hbm/textures/models/vault_cog.png index 9b4e38b56..9d91af094 100644 Binary files a/assets/hbm/textures/models/vault_cog.png and b/assets/hbm/textures/models/vault_cog.png differ diff --git a/assets/hbm/textures/models/vault_frame.png b/assets/hbm/textures/models/vault_frame.png index 6d6b47782..6f08b9520 100644 Binary files a/assets/hbm/textures/models/vault_frame.png and b/assets/hbm/textures/models/vault_frame.png differ diff --git a/com/hbm/render/tileentity/RenderVaultDoor.java b/com/hbm/render/tileentity/RenderVaultDoor.java index eec2b1c62..e5cb1ed28 100644 --- a/com/hbm/render/tileentity/RenderVaultDoor.java +++ b/com/hbm/render/tileentity/RenderVaultDoor.java @@ -29,8 +29,9 @@ public class RenderVaultDoor extends TileEntitySpecialRenderer { GL11.glTranslated(0.0D, -2.5D, 0.0D); - - double[] timer = getAnimationFromSysTime(MainRegistry.time); + + double[] timer = getAnimationFromSysTime(System.currentTimeMillis() - MainRegistry.time); + //double[] timer = getAnimationFromSysTime(MainRegistry.time + 12500 - System.currentTimeMillis()); GL11.glTranslated(-timer[0], 0, timer[1]); @@ -48,26 +49,30 @@ public class RenderVaultDoor extends TileEntitySpecialRenderer { private static double[] getAnimationFromSysTime(long time) { double pullOutDuration = 5000D; - double slideDuration = 5000D; + double slideDuration = 1500D; double diameter = 4.5D; double circumference = diameter * Math.PI; - double x = (System.currentTimeMillis() - time) / pullOutDuration; - + double x = (time) / pullOutDuration; + if(x > 1) x = 1; + if(x < 0) + x = 0; - double z = (System.currentTimeMillis() - time - pullOutDuration) / slideDuration; + double z = (time - pullOutDuration) / slideDuration; - if(System.currentTimeMillis() - time < pullOutDuration) + if(time < pullOutDuration) z = 0; if(z > 5) z = 5; + if(z < 0) + z = 0; double roll = z / circumference * 360; - return new double[] { x, z, roll }; + return new double[] { x + 0.0005D, z, roll }; } } diff --git a/com/hbm/tileentity/bomb/TileEntityLaunchPad.java b/com/hbm/tileentity/bomb/TileEntityLaunchPad.java index 3981e143d..2e180adf8 100644 --- a/com/hbm/tileentity/bomb/TileEntityLaunchPad.java +++ b/com/hbm/tileentity/bomb/TileEntityLaunchPad.java @@ -3,6 +3,7 @@ package com.hbm.tileentity.bomb; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; import com.hbm.lib.Library; +import com.hbm.main.MainRegistry; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEMissilePacket; diff --git a/com/hbm/tileentity/machine/TileEntityAMSBase.java b/com/hbm/tileentity/machine/TileEntityAMSBase.java index 5f4d724ab..3e2a33a25 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -458,6 +458,8 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS int radius = (int)(50 + (double)(tanks[2].getFill() + tanks[3].getFill()) / 16000D * 150); worldObj.spawnEntityInWorld(EntityNukeExplosionMK4.statFacExperimental(worldObj, radius, xCoord, yCoord, zCoord)); + + worldObj.setBlockToAir(xCoord, yCoord, zCoord); } } diff --git a/com/hbm/tileentity/machine/TileEntityVaultDoor.java b/com/hbm/tileentity/machine/TileEntityVaultDoor.java index 66258796d..08dd075f3 100644 --- a/com/hbm/tileentity/machine/TileEntityVaultDoor.java +++ b/com/hbm/tileentity/machine/TileEntityVaultDoor.java @@ -1,7 +1,22 @@ package com.hbm.tileentity.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; public class TileEntityVaultDoor extends TileEntity { + + @Override + public AxisAlignedBB getRenderBoundingBox() { + return TileEntity.INFINITE_EXTENT_AABB; + } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } }